refactor: constructor, not cache, now sets board's cache dir

Author: machow

pins/cache.py

@@ -90,15 +90,8 @@ def hash_name(self, path, same_name):
             if self.hash_prefix is not None:
                 # optionally make the name relative to a parent path
                 # using the hash of parent path as a prefix, to flatten a bit
-                suffix = Path(path).relative_to(Path(self.hash_prefix))
-                # TODO(compat): R pins uses xxh128 hash here, but fsspec uses sha256
-                prefix = hash_name(self.hash_prefix, False)
-
-                # TODO: hacky to automatically tack on protocol here
-                # but this is what R pins boards do. Could make a bool arg?
-                proto_name = protocol_to_string(self.fs.protocol)
-                full_prefix = "_".join([proto_name, prefix])
-                return str(full_prefix / suffix)
+                hash = Path(path).relative_to(Path(self.hash_prefix))
+                return hash
 
             return path
         else:
@@ -122,14 +115,8 @@ def hash_name(self, path, same_name):
                 raise NotImplementedError()
 
             # change pin path of form <user>/<content> to <user>+<content>
-            suffix = path.replace("/", "+", 1)
-            prefix = hash_name(self.hash_prefix, False)
-
-            # TODO: hacky to automatically tack on protocol here
-            # but this is what R pins boards do. Could make a bool arg?
-            proto_name = protocol_to_string(self.fs.protocol)
-            full_prefix = "_".join([proto_name, prefix])
-            return str(full_prefix / Path(suffix))
+            hash = path.replace("/", "+", 1)
+            return hash
 
         else:
             raise NotImplementedError()

pins/constructors.py

@@ -117,15 +117,23 @@ def board(
     # wrap fs in cache ----
 
     if cache is DEFAULT:
-        cache_dir = get_cache_dir()
+        base_cache_dir = get_cache_dir()
 
         # manually create a subdirectory for rsc server
         if protocol == "rsc":
+            # ensures each server_url is its own cache directory
             hash_prefix = storage_options["server_url"]
+            board_cache = prefix_cache(fs, hash_prefix)
+            cache_dir = os.path.join(base_cache_dir, board_cache)
+
             fs = PinsRscCache(
                 cache_storage=cache_dir, fs=fs, hash_prefix=hash_prefix, same_names=True
             )
         else:
+            # ensures each subdir path is its own cache directory
+            board_cache = prefix_cache(fs, path)
+            cache_dir = os.path.join(base_cache_dir, board_cache)
+
             fs = PinsCache(
                 cache_storage=cache_dir, fs=fs, hash_prefix=path, same_names=True
             )
@@ -138,10 +146,10 @@ def board(
 
     pickle_kwargs = {"allow_pickle_read": allow_pickle_read}
     # TODO: should use a registry or something
-    if protocol == "rsc" and board_factory is None:
-        board = BoardRsConnect(path, fs, versioned, **pickle_kwargs)
-    elif board_factory is not None:
+    if board_factory is not None:
         board = board_factory(path, fs, versioned, **pickle_kwargs)
+    elif protocol == "rsc":
+        board = BoardRsConnect(path, fs, versioned, **pickle_kwargs)
     else:
         board = BaseBoard(path, fs, versioned, **pickle_kwargs)
     return board