From: David Stainton <dstainton415@gmail.com>
Date: Sat, 18 Apr 2015 00:47:09 +0000 (+0100)
Subject: Teach uploader to monitor subdirectories
X-Git-Url: https://git.rkrishnan.org/%5B/frontends/%22file:/somewhere?a=commitdiff_plain;h=9f68ca715b6c1dd2c5863dc3fce667415390db72;p=tahoe-lafs%2Ftahoe-lafs.git

Teach uploader to monitor subdirectories
---

diff --git a/src/allmydata/frontends/drop_upload.py b/src/allmydata/frontends/drop_upload.py
index 1b3d52a6..68cd4ffb 100644
--- a/src/allmydata/frontends/drop_upload.py
+++ b/src/allmydata/frontends/drop_upload.py
@@ -17,6 +17,8 @@ from allmydata.scripts import backupdb, tahoe_backup
 from allmydata.util.encodingutil import listdir_unicode, quote_output, \
      quote_local_unicode_path, to_str, FilenameEncodingError, unicode_to_url
 
+from allmydata.interfaces import NoSuchChildError
+from twisted.python import failure
 
 
 class DropUploader(service.MultiService):
@@ -77,7 +79,7 @@ class DropUploader(service.MultiService):
         # be an IN_CLOSE_WRITE after an IN_CREATE (I think).
         # TODO: what about IN_MOVE_SELF or IN_UNMOUNT?
         mask = inotify.IN_CLOSE_WRITE | inotify.IN_MOVED_TO | inotify.IN_ONLYDIR
-        self._notifier.watch(self._local_path, mask=mask, callbacks=[self._notify])
+        self._notifier.watch(self._local_path, mask=mask, callbacks=[self._notify], autoAdd=True)
 
     def _check_db_file(self, childpath):
         # returns True if the file must be uploaded.
@@ -163,7 +165,7 @@ class DropUploader(service.MultiService):
 
         # FIXME (ticket #1712): if this already exists as a mutable file, we replace the
         # directory entry, but we should probably modify the file (as the SFTP frontend does).
-        def _add_file(ign):
+        def _add_file(ignore):
             self._pending.remove(path)
             name = path.basename()
             # on Windows the name is already Unicode
@@ -171,11 +173,35 @@ class DropUploader(service.MultiService):
                 name = name.decode(get_filesystem_encoding())
             u = FileName(path.path, self._convergence)
             return self._parent.add_file(name, u)
-        d.addCallback(_add_file)
+
+        def _add_dir(ignore):
+             return self._parent.create_subdirectory(name)
+
+        def _maybe_upload(val):
+            if not os.path.exists(path.path):
+                self._log("uploader: not uploading non-existent file.")
+                self._stats_provider.count('drop_upload.objects_disappeared', 1)
+                return NoSuchChildError("not uploading non-existent file")
+            elif os.path.islink(path.path):
+                self._log("operator ERROR: symlink not being processed.")
+                return failure.Failure()
+
+            if os.path.isdir(path.path):
+                d.addCallback(_add_dir)
+                return None
+            elif os.path.isfile(path.path):
+                d.addCallback(_add_file)
+                return None
+            else:
+                self._log("operator ERROR: non-directory/non-regular file not being processed.")
+                return failure.Failure()
+
+        d.addCallback(_maybe_upload)
 
         def _succeeded(ign):
             self._stats_provider.count('drop_upload.objects_queued', -1)
             self._stats_provider.count('drop_upload.objects_uploaded', 1)
+
         def _failed(f):
             self._stats_provider.count('drop_upload.objects_queued', -1)
             if path.exists():
@@ -187,8 +213,10 @@ class DropUploader(service.MultiService):
                           "(this is normal for temporary objects): %r" % (path.path, f))
                 self._stats_provider.count('drop_upload.objects_disappeared', 1)
                 return None
+
         d.addCallbacks(_succeeded, _failed)
         d.addBoth(self._uploaded_callback)
+
         return d
 
     def set_uploaded_callback(self, callback):