Added fsmount command, made memroyfs work with threads

ChangeLog

@@ -63,4 +63,8 @@
     * Separated behaviour of setcontents and createfile
     * Added a getmmap to base
     * Added command line scripts fsls, fstree, fscat, fscp, fsmv
+    * Added command line scripts fsmkdir, fsmount
+    * Made automatically pick up keys if no other authentication is available
+    * Optimized listdir and listdirinfo in SFTPFS
+    * Made memoryfs work with threads
 

fs/base.py

@@ -149,9 +149,11 @@ class FS(object):
 
         :param thread_synconize: If True, a lock object will be created for the object, otherwise a dummy lock will be used.
         :type thread_synchronize: bool
+        
         """
         super(FS, self).__init__()
         self.closed = False
+        self.thread_synchronize = thread_synchronize
         if thread_synchronize:
             self._lock = threading.RLock()
         else:
@@ -188,9 +190,10 @@ class FS(object):
         return state
 
     def __setstate__(self,state):
-        for (k,v) in state.iteritems():
-            self.__dict__[k] = v
-        lock = state.get("_lock",None)
+        self.__dict__.update(state)
+        #for (k,v) in state.iteritems():
+        #    self.__dict__[k] = v
+        lock = state.get("_lock")
         if lock is not None:
             if lock:
                 self._lock = threading.RLock()

fs/commands/fsmount

+#!/usr/bin/env python
+import sys
+from fs.commands.fsmount import run
+sys.exit(run())
+
+

fs/commands/fsmount.py

+#!/usr/bin/env python
+
+from fs.opener import opener
+from fs.commands.runner import Command
+import sys
+import platform
+import os
+import os.path
+import time
+
+class FSMount(Command):
+    
+    usage = """fsmount [SYSTEM PATH] [FS]
+or fsmount -u [SYSTEM PATH]
+Mounts a file system on a system path"""
+
+    version = "1.0"
+    
+    def get_optparse(self):
+        optparse = super(FSMount, self).get_optparse()        
+        optparse.add_option('-f', '--foreground', dest='foreground', action="store_true", default=False,
+                            help="run the mount process in the foreground", metavar="FOREGROUND")
+        optparse.add_option('-u', '--unmount', dest='unmount', action="store_true", default=False,
+                            help="unmount path", metavar="UNMOUNT")
+        
+        return optparse
+    
+    
+    def do_run(self, options, args):
+        
+        if options.unmount:
+            try:                
+                mount_path = args[0]
+            except IndexError:
+                self.error('Mount path required\n')
+                return 1
+            from fs.expose import fuse
+            fuse.unmount(mount_path)
+            return
+             
+        try:                
+            mount_path = args[0]
+        except IndexError:
+            self.error('Mount path required\n')
+            return 1
+        try:
+            fs_url = args[1]
+        except IndexError:
+            self.error('FS required\n')
+            return 1                    
+             
+        if platform.system() == 'Windows':
+            pass
+        else:
+            fs, path = self.open_fs(fs_url, create=True)
+            if path:
+                if not fs.isdir(path):
+                    self.error('%s is not a directory on %s' % (fs_url. fs))
+                    return 1
+                fs = fs.opendir(path)
+                path = '/'
+            if not os.path.exists(mount_path):
+               os.makedirs(mount_path)
+            from fs.expose import fuse
+            if options.foreground:                            
+                fuse_process = fuse.mount(fs,
+                                          mount_path,
+                                          foreground=True)                                                    
+            else:                
+                mp = fuse.mount(fs,
+                                mount_path,
+                                foreground=False)
+                
+
+    
+def run():
+    return FSMount().run()
+    
+if __name__ == "__main__":
+    sys.exit(run())
+        
\ No newline at end of file

fs/expose/fuse/__init__.py

@@ -245,11 +245,14 @@ class FSOperations(Operations):
     @handle_fs_errors
     def readdir(self, path, fh=None):
         path = path.decode(NATIVE_ENCODING)
-        entries = []
+        entries = ['.', '..']
+        #print
+        #print self.fs
         for (nm,info) in self.fs.listdirinfo(path):
+            #print "*", repr(nm), info
             self._fill_stat_dict(pathjoin(path,nm),info)
-            entries.append((nm.encode(NATIVE_ENCODING),info,0))
-        entries = [".",".."] + entries
+            entries.append((nm.encode(NATIVE_ENCODING),info,0))  
+        #print      
         return entries
 
     @handle_fs_errors
@@ -472,7 +475,7 @@ def unmount(path):
             return
         if "not found" in stderr:
             return
-    raise OSError("filesystem could not be unmounted: %s (%s) " % (path,stderr,))
+    raise OSError("filesystem could not be unmounted: %s (%s) " % (path, str(stderr).rstrip(),))
 
 
 class MountProcess(subprocess.Popen):

fs/ftpfs.py

@@ -17,11 +17,9 @@ from fs.remote import RemoteFileBuffer
 from ftplib import FTP, error_perm, error_temp, error_proto, error_reply
 
 try:
-    from ftplib import _GLOBAL_DEFAULT_TIMEOUT
-    _FTPLIB_TIMEOUT = True
+    from ftplib import _GLOBAL_DEFAULT_TIMEOUT    
 except ImportError:
-    _GLOBAL_DEFAULT_TIMEOUT = None
-    _FTPLIB_TIMEOUT = False
+    _GLOBAL_DEFAULT_TIMEOUT = object()    
 
 import threading
 from time import sleep
@@ -934,7 +932,7 @@ class FTPFS(FS):
     def _open_ftp(self):
         try:
             ftp = FTP()
-            if _FTPLIB_TIMEOUT:
+            if self.timeout is not _GLOBAL_DEFAULT_TIMEOUT:
                 ftp.connect(self.host, self.port, self.timeout)
             else:
                 ftp.connect(self.host, self.port)

fs/opener.py

@@ -365,7 +365,7 @@ class TempOpener(Opener):
     @classmethod
     def get_fs(cls, registry, fs_name, fs_name_params, fs_path,  writeable, create):
         from fs.tempfs import TempFS        
-        return TempFS(identifier=fs_name_params, temp_dir=fs_path, create=create), None
+        return TempFS(identifier=fs_name_params, temp_dir=fs_path), None
     
 
 opener = OpenerRegistry([OSFSOpener,

fs/osfs/__init__.py

@@ -98,6 +98,7 @@ class OSFS(OSFSXAttrMixin, OSFSWatchMixin, FS):
 
         super(OSFS, self).__init__(thread_synchronize=thread_synchronize)
         self.encoding = encoding or sys.getfilesystemencoding()
+        self.dir_mode = dir_mode
         root_path = os.path.expanduser(os.path.expandvars(root_path))
         root_path = os.path.normpath(os.path.abspath(root_path))
         #  Enable long pathnames on win32
@@ -319,4 +320,23 @@ class OSFS(OSFSXAttrMixin, OSFSWatchMixin, FS):
     def getsize(self, path):
         return self._stat(path).st_size
 
+    @convert_os_errors
+    def opendir(self, path):
+        """A specialised opendir that returns another OSFS rather than a SubDir
+        
+        This is more optimal than a SubDir because no path delegation is required.
+        
+        """
+        if path in ('', '/'):
+            return self
+        path = normpath(path)
+        if not self.exists(path):
+            raise ResourceNotFoundError(path)
+        sub_path = pathjoin(self.root_path, path)
+        return OSFS(sub_path,
+                    thread_synchronize=self.thread_synchronize,
+                    encoding=self.encoding,
+                    create=False,
+                    dir_mode=self.dir_mode)
+
 

fs/rpcfs.py

@@ -38,7 +38,7 @@ def re_raise_faults(func):
             cls = _object_by_name(cls)
             # Re-raise using the remainder of the fault code as message
             if cls:                            
-                raise cls(msg=msg)
+                raise cls('', msg=msg)
             raise f
         except socket.error, e:
             raise RemoteConnectionError(str(e), details=e)

setup.py

@@ -12,7 +12,8 @@ COMMANDS = ['fscat',
             'fsrm',
             'fsserve',
             'fstree',
-            'fsmkdir']
+            'fsmkdir',
+            'fsmount']
 
 
 classifiers = [