revert

Author: mxmlnkn

ratarmount/FuseMount.py

@@ -29,7 +29,6 @@
 from .cli import create_parser
 from .fuse import fuse
 from .WriteOverlay import WritableFolderMountSource
-from .MemoryMountSource import MemoryMountSource
 
 logger = logging.getLogger(__name__)
 
@@ -165,21 +164,16 @@ def __init__(self, pathToMount: Union[str, list[str]], mountPoint: str, **option
         options['writeIndex'] = True
 
         # Add write overlay as folder mount source to read from with highest priority.
-        memoryOverlay: Optional[MemoryOverlay] = None
         if 'writeOverlay' in options and isinstance(options['writeOverlay'], str) and options['writeOverlay']:
             if options['writeOverlay'] == ':temp:':
                 self._temporaryOverlayFolder = tempfile.TemporaryDirectory(prefix="ratarmount-write-overlay.")
                 self.overlayPath = self._temporaryOverlayFolder.name
                 logger.info("Created temporary overlay directory: %s", self.overlayPath)
-                pathToMount.append(self.overlayPath)
-            elif options['writeOverlay'] == ':memory:':
-                self.overlayPath = ''
-                memoryOverlay = MemoryOverlay()
             else:
                 self.overlayPath = os.path.realpath(options['writeOverlay'])
                 if not os.path.exists(self.overlayPath):
                     os.makedirs(self.overlayPath, exist_ok=True)
-                pathToMount.append(self.overlayPath)
+            pathToMount.append(self.overlayPath)
 
         # Take care that bind-mounting folders to itself works
         mountSources: list[tuple[str, MountSource]] = []
@@ -206,9 +200,6 @@ def __init__(self, pathToMount: Union[str, list[str]], mountPoint: str, **option
             if options.get('lazyMounting', False):
                 self._filter_index_locations_in_fuse_mount(options)
 
-        if memoryOverlay:
-            mountSources.append(memoryOverlay)
-
         # Open log file.
         openLog: Optional[Callable[[int], IO[bytes]]] = None
         if not logFilePath and self._enableControlInterface:
@@ -270,13 +261,13 @@ def _get_log(_buffering: int = 0) -> IO[bytes]:
         if join_threads is not None:
             join_threads()
 
-        if self.overlayPath is not None:
+        if self.overlayPath:
             ignoredPrefixes: list[str] = []
             if self._enableControlInterface:
                 ignoredPrefixes.append(self._controlLayerPrefix)
             self.writeOverlay = WritableFolderMountSource(
                 self.overlayPath, self.mountSource, ignoredPrefixes=ignoredPrefixes
-            ) if self.overlayPath else memoryOverlay
+            )
 
             self.chmod = self.writeOverlay.chmod
             self.chown = self.writeOverlay.chown

ratarmount/cli.py

@@ -252,9 +252,7 @@ def create_parser(useColor: Optional[bool] = True) -> argparse.ArgumentParser:
              'to that writable copy. Deleting files or folders will update the hidden metadata database inside '
              'the overlay folder. '
              'If ":temp:" is specified, a temporary directory will be created and used as the overlay. '
-             'This temporary directory will be automatically removed after unmounting. '
-             'If ":memory:" is specified, an in-memory overlay will be used. '
-             'This overlay will not persist after unmounting.')
+             'This temporary directory will be automatically removed after unmounting.')
 
     # Index Options