modify all setcontents() signatures in order to accept a 'bypass_lock' arg

Author: giampaolo

fs/contrib/davfs/__init__.py

@@ -345,7 +345,8 @@ def new_close():
                 msg = str(e)
             raise RemoteConnectionError("",msg=msg,details=e)
 
-    def setcontents(self,path, data=b'', encoding=None, errors=None, chunk_size=1024 * 64):
+    def setcontents(self,path, data=b'', encoding=None, errors=None,
+                    chunk_size=1024 * 64, bypass_lock=False):
         if isinstance(data, six.text_type):
             data = data.encode(encoding=encoding, errors=errors)
         resp = self._request(path, "PUT", data)

fs/contrib/tahoelafs/__init__.py

@@ -24,19 +24,19 @@
 
 When any problem occurred, you can turn on internal debugging messages::
 
-    import logging    
+    import logging
     l = logging.getLogger()
     l.setLevel(logging.DEBUG)
     l.addHandler(logging.StreamHandler(sys.stdout))
 
     ... your Python code using TahoeLAFS ...
-    
+
 TODO:
 
    * unicode support
    * try network errors / bad happiness
    * exceptions
-   * tests    
+   * tests
    * sanitize all path types (., /)
    * support for extra large file uploads (poster module)
    * Possibility to block write until upload done (Tahoe mailing list)
@@ -46,13 +46,13 @@
    * docs & author
    * python3 support
    * remove creating blank files (depends on FileUploadManager)
-   
+
 TODO (Not TahoeLAFS specific tasks):
    * RemoteFileBuffer on the fly buffering support
    * RemoteFileBuffer unit tests
    * RemoteFileBuffer submit to trunk
    * Implement FileUploadManager + faking isfile/exists of just processing file
-   * pyfilesystem docs is outdated (rename, movedir, ...)  
+   * pyfilesystem docs is outdated (rename, movedir, ...)
 
 '''
 
@@ -71,7 +71,7 @@
 from fs.base import fnmatch, NoDefaultMeta
 
 from util import TahoeUtil
-from connection import Connection   
+from connection import Connection
 
 from six import b
 
@@ -90,8 +90,8 @@ def wrapper(self, *args, **kwds):
 def _fixpath(path):
     """Normalize the given path."""
     return abspath(normpath(path))
-    
-     
+
+
 
 class _TahoeLAFS(FS):
     """FS providing raw access to a Tahoe-LAFS Filesystem.
@@ -101,18 +101,18 @@ class _TahoeLAFS(FS):
     TahoeLAFS class instead, which has some internal caching to improve
     performance.
     """
-    
+
     _meta = { 'virtual' : False,
               'read_only' : False,
               'unicode_paths' : True,
               'case_insensitive_paths' : False,
               'network' : True
              }
-        
+
 
     def __init__(self, dircap, largefilesize=10*1024*1024, webapi='http://127.0.0.1:3456'):
         '''Creates instance of TahoeLAFS.
-            
+
             :param dircap: special hash allowing user to work with TahoeLAFS directory.
             :param largefilesize: - Create placeholder file for files larger than this treshold.
                 Uploading and processing of large files can last extremely long (many hours),
@@ -123,11 +123,11 @@ def __init__(self, dircap, largefilesize=10*1024*1024, webapi='http://127.0.0.1:
         self.largefilesize = largefilesize
         self.connection = Connection(webapi)
         self.tahoeutil = TahoeUtil(webapi)
-        super(_TahoeLAFS, self).__init__(thread_synchronize=_thread_synchronize_default)       
-        
+        super(_TahoeLAFS, self).__init__(thread_synchronize=_thread_synchronize_default)
+
     def __str__(self):
-        return "<TahoeLAFS: %s>" % self.dircap 
-    
+        return "<TahoeLAFS: %s>" % self.dircap
+
     @classmethod
     def createdircap(cls, webapi='http://127.0.0.1:3456'):
         return TahoeUtil(webapi).createdircap()
@@ -136,10 +136,10 @@ def getmeta(self,meta_name,default=NoDefaultMeta):
         if meta_name == "read_only":
             return self.dircap.startswith('URI:DIR2-RO')
         return super(_TahoeLAFS,self).getmeta(meta_name,default)
-    
+
     @_fix_path
     def open(self, path, mode='r', **kwargs):
-        self._log(INFO, 'Opening file %s in mode %s' % (path, mode))        
+        self._log(INFO, 'Opening file %s in mode %s' % (path, mode))
         newfile = False
         if not self.exists(path):
             if 'w' in mode or 'a' in mode:
@@ -152,7 +152,7 @@ def open(self, path, mode='r', **kwargs):
             raise errors.ResourceInvalidError(path)
         elif 'w' in mode:
             newfile = True
-        
+
         if newfile:
             self._log(DEBUG, 'Creating empty file %s' % path)
             if self.getmeta("read_only"):
@@ -162,7 +162,7 @@ def open(self, path, mode='r', **kwargs):
         else:
             self._log(DEBUG, 'Opening existing file %s for reading' % path)
             handler = self.getrange(path,0)
-        
+
         return RemoteFileBuffer(self, path, mode, handler,
                     write_on_flush=False)
 
@@ -172,7 +172,7 @@ def desc(self, path):
             return self.getinfo(path)
         except:
             return ''
-    
+
     @_fix_path
     def exists(self, path):
         try:
@@ -185,7 +185,7 @@ def exists(self, path):
         except errors.ResourceInvalidError:
             self._log(DEBUG, "Path %s does not exists, probably misspelled URI" % path)
             return False
-     
+
     @_fix_path
     def getsize(self, path):
         try:
@@ -194,7 +194,7 @@ def getsize(self, path):
             return size
         except errors.ResourceNotFoundError:
             return 0
-    
+
     @_fix_path
     def isfile(self, path):
         try:
@@ -204,8 +204,8 @@ def isfile(self, path):
             isfile = False
         self._log(DEBUG, "Path %s is file: %d" % (path, isfile))
         return isfile
-    
-    @_fix_path        
+
+    @_fix_path
     def isdir(self, path):
         try:
             isdir = (self.getinfo(path)['type'] == 'dirnode')
@@ -214,48 +214,48 @@ def isdir(self, path):
         self._log(DEBUG, "Path %s is directory: %d" % (path, isdir))
         return isdir
 
-    
+
     def listdir(self, *args, **kwargs):
-        return [ item[0] for item in self.listdirinfo(*args, **kwargs) ]        
+        return [ item[0] for item in self.listdirinfo(*args, **kwargs) ]
 
     def listdirinfo(self, *args, **kwds):
         return list(self.ilistdirinfo(*args,**kwds))
 
     def ilistdir(self, *args, **kwds):
         for item in self.ilistdirinfo(*args,**kwds):
             yield item[0]
-    
+
     @_fix_path
     def ilistdirinfo(self, path="/", wildcard=None, full=False, absolute=False,
                     dirs_only=False, files_only=False):
         self._log(DEBUG, "Listing directory (listdirinfo) %s" % path)
-        
+
         if dirs_only and files_only:
             raise ValueError("dirs_only and files_only can not both be True")
-        
+
         for item in self.tahoeutil.list(self.dircap, path):
             if dirs_only and item['type'] == 'filenode':
                 continue
             elif files_only and item['type'] == 'dirnode':
                 continue
-            
+
             if wildcard is not None:
                 if isinstance(wildcard,basestring):
                     if not fnmatch.fnmatch(item['name'], wildcard):
                         continue
                 else:
                     if not wildcard(item['name']):
                         continue
-            
+
             if full:
                 item_path = relpath(pathjoin(path, item['name']))
             elif absolute:
-                item_path = abspath(pathjoin(path, item['name']))    
+                item_path = abspath(pathjoin(path, item['name']))
             else:
                 item_path = item['name']
-            
+
             yield (item_path, item)
-     
+
     @_fix_path
     def remove(self, path):
         self._log(INFO, 'Removing file %s' % path)
@@ -266,15 +266,15 @@ def remove(self, path):
             if not self.isdir(path):
                 raise errors.ResourceNotFoundError(path)
             raise errors.ResourceInvalidError(path)
-        
+
         try:
             self.tahoeutil.unlink(self.dircap, path)
         except Exception, e:
             raise errors.ResourceInvalidError(path)
-    
+
     @_fix_path
     def removedir(self, path, recursive=False, force=False):
-        self._log(INFO, "Removing directory %s" % path) 
+        self._log(INFO, "Removing directory %s" % path)
         if self.getmeta("read_only"):
             raise errors.UnsupportedError('read only filesystem')
         if not self.isdir(path):
@@ -283,32 +283,32 @@ def removedir(self, path, recursive=False, force=False):
             raise errors.ResourceInvalidError(path)
         if not force and self.listdir(path):
             raise errors.DirectoryNotEmptyError(path)
-        
+
         self.tahoeutil.unlink(self.dircap, path)
 
         if recursive and path != '/':
             try:
                 self.removedir(dirname(path), recursive=True)
             except errors.DirectoryNotEmptyError:
                 pass
-    
+
     @_fix_path
     def makedir(self, path, recursive=False, allow_recreate=False):
         self._log(INFO, "Creating directory %s" % path)
         if self.getmeta("read_only"):
-            raise errors.UnsupportedError('read only filesystem')       
+            raise errors.UnsupportedError('read only filesystem')
         if self.exists(path):
             if not self.isdir(path):
                 raise errors.ResourceInvalidError(path)
-            if not allow_recreate: 
+            if not allow_recreate:
                 raise errors.DestinationExistsError(path)
         if not recursive and not self.exists(dirname(path)):
             raise errors.ParentDirectoryMissingError(path)
         self.tahoeutil.mkdir(self.dircap, path)
-        
+
     def movedir(self, src, dst, overwrite=False):
         self.move(src, dst, overwrite=overwrite)
-    
+
     def move(self, src, dst, overwrite=False):
         self._log(INFO, "Moving file from %s to %s" % (src, dst))
         if self.getmeta("read_only"):
@@ -323,27 +323,27 @@ def move(self, src, dst, overwrite=False):
 
     def rename(self, src, dst):
         self.move(src, dst)
-        
+
     def copy(self, src, dst, overwrite=False, chunk_size=16384):
         if self.getmeta("read_only"):
             raise errors.UnsupportedError('read only filesystem')
         # FIXME: this is out of date; how to do native tahoe copy?
         # FIXME: Workaround because isfile() not exists on _TahoeLAFS
         FS.copy(self, src, dst, overwrite, chunk_size)
-        
+
     def copydir(self, src, dst, overwrite=False, ignore_errors=False, chunk_size=16384):
         if self.getmeta("read_only"):
             raise errors.UnsupportedError('read only filesystem')
         # FIXME: this is out of date; how to do native tahoe copy?
         # FIXME: Workaround because isfile() not exists on _TahoeLAFS
         FS.copydir(self, src, dst, overwrite, ignore_errors, chunk_size)
-       
-    
+
+
     def _log(self, level, message):
         if not logger.isEnabledFor(level): return
         logger.log(level, u'(%d) %s' % (id(self),
                                 unicode(message).encode('ASCII', 'replace')))
-        
+
     @_fix_path
     def getpathurl(self, path, allow_none=False, webapi=None):
         '''
@@ -359,15 +359,15 @@ def getpathurl(self, path, allow_none=False, webapi=None):
     def getrange(self, path, offset, length=None):
         return self.connection.get(u'/uri/%s%s' % (self.dircap, path),
                     offset=offset, length=length)
-       
-    @_fix_path             
-    def setcontents(self, path, file, chunk_size=64*1024):    
+
+    @_fix_path
+    def setcontents(self, path, file, chunk_size=64*1024, bypass_lock=False):
         self._log(INFO, 'Uploading file %s' % path)
         size=None
-        
+
         if self.getmeta("read_only"):
             raise errors.UnsupportedError('read only filesystem')
-        
+
         # Workaround for large files:
         # First create zero file placeholder, then
         # upload final content.
@@ -385,9 +385,9 @@ def setcontents(self, path, file, chunk_size=64*1024):
         self.connection.put(u'/uri/%s%s' % (self.dircap, path), file, size=size)
 
     @_fix_path
-    def getinfo(self, path): 
+    def getinfo(self, path):
         self._log(INFO, 'Reading meta for %s' % path)
-        info = self.tahoeutil.info(self.dircap, path)        
+        info = self.tahoeutil.info(self.dircap, path)
         #import datetime
         #info['created_time'] = datetime.datetime.now()
         #info['modified_time'] = datetime.datetime.now()

fs/ftpfs.py

@@ -1172,7 +1172,8 @@ def open(self, path, mode, buffering=-1, encoding=None, errors=None, newline=Non
         return f
 
     @ftperrors
-    def setcontents(self, path, data=b'', encoding=None, errors=None, chunk_size=1024*64):
+    def setcontents(self, path, data=b'', encoding=None, errors=None,
+                    chunk_size=1024*64, bypass_lock=False):
         path = normpath(path)
         data = iotools.make_bytes_io(data, encoding=encoding, errors=errors)
         self.refresh_dircache(dirname(path))

fs/memoryfs.py

@@ -642,7 +642,8 @@ def getcontents(self, path, mode="rb", encoding=None, errors=None, newline=None)
         return data
 
     @synchronize
-    def setcontents(self, path, data=b'', encoding=None, errors=None, chunk_size=1024*64):
+    def setcontents(self, path, data=b'', encoding=None, errors=None,
+                    chunk_size=1024*64, bypass_lock=False):
         if isinstance(data, six.binary_type):
             if not self.exists(path):
                 self.open(path, 'wb').close()
@@ -654,7 +655,9 @@ def setcontents(self, path, data=b'', encoding=None, errors=None, chunk_size=102
             dir_entry.mem_file = new_mem_file
             return len(data)
 
-        return super(MemoryFS, self).setcontents(path, data=data, encoding=encoding, errors=errors, chunk_size=chunk_size)
+        return super(MemoryFS, self).setcontents(
+            path, data=data, encoding=encoding, errors=errors,
+            chunk_size=chunk_size, bypass_lock=bypass_lock)
 
         # if isinstance(data, six.text_type):
         #     return super(MemoryFS, self).setcontents(path, data, encoding=encoding, errors=errors, chunk_size=chunk_size)