Use adaptor in _create_meta

Author: nathanjmcdougall

pins/boards.py

@@ -11,7 +11,7 @@
 
 from importlib_resources import files
 
-from ._adaptors import _create_adaptor
+from ._adaptors import _Adaptor, _create_adaptor
 from .cache import PinsCache
 from .config import get_allow_rsc_short_name
 from .drivers import default_title, load_data, load_file, save_data
@@ -22,6 +22,8 @@
 
 _log = logging.getLogger(__name__)
 
+_ = default_title  # Keep this import for backward compatibility
+
 
 class IFileSystem(Protocol):
     protocol: "str | list"
@@ -621,6 +623,8 @@ def prepare_pin_version(
         created: Optional[datetime] = None,
         object_name: Optional[str] = None,
     ):
+        x = _create_adaptor(x)
+
         meta = self._create_meta(
             pin_dir_path,
             x,
@@ -642,7 +646,7 @@ def prepare_pin_version(
     def _create_meta(
         self,
         pin_dir_path,
-        x,
+        x: _Adaptor,
         name: Optional[str] = None,
         type: Optional[str] = None,
         title: Optional[str] = None,
@@ -659,7 +663,7 @@ def _create_meta(
             raise NotImplementedError("Type argument is required.")
 
         if title is None:
-            title = default_title(x, name)
+            title = x.default_title(name)
 
         # create metadata from object on disk ---------------------------------
         # save all pin data to a temporary folder (including data.txt), so we
@@ -671,7 +675,7 @@ def _create_meta(
             p_obj = Path(pin_dir_path) / object_name
 
         # file is saved locally in order to hash, calc size
-        file_names = save_data(x, str(p_obj), type)
+        file_names = save_data(x._d, str(p_obj), type)
 
         meta = self.meta_factory.create(
             pin_dir_path,
@@ -1122,7 +1126,6 @@ def path_to_deploy_version(self, name: str, version: str):
     def user_name(self):
         return self.fs.api.get_user()["username"]
 
-    # TODO(NAMC) what about the functions that call this one?
     def prepare_pin_version(self, pin_dir_path, x, name: "str | None", *args, **kwargs):
         adaptor = _create_adaptor(x)
 
@@ -1133,9 +1136,7 @@ def prepare_pin_version(self, pin_dir_path, x, name: "str | None", *args, **kwar
 
         # TODO(compat): py pins always uses the short name, R pins uses w/e the
         # user passed, but guessing people want the long name?
-        meta = super()._create_meta(
-            pin_dir_path, adaptor, short_name, *args, **kwargs
-        )  # TODO(NAMC) ensure .create_meta can accept adaptor
+        meta = super()._create_meta(pin_dir_path, adaptor, short_name, *args, **kwargs)
         meta.name = name
 
         # copy in files needed by index.html ----------------------------------