From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 11 Aug 2015 14:21:10 +0000 (+0100)
Subject: Extract get_metadata and get_filenode to methods of Uploader.
X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/frontends/somewhere?a=commitdiff_plain;h=3ac269f07174b1184288ecc13225fd2538571d6b;p=tahoe-lafs%2Ftahoe-lafs.git

Extract get_metadata and get_filenode to methods of Uploader.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py
index 1164aa5d..15d1262f 100644
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -291,25 +291,13 @@ class Uploader(QueueMixin):
             self._pending.remove(path_u)  # FIXME make _upload_pending hold relative paths
             relpath_u = os.path.relpath(path_u, self._local_path_u)
             encoded_name_u = magicpath.path2magic(relpath_u)
-            def get_metadata(result):
-                try:
-                    metadata_d = self._upload_dirnode.get_metadata_for(encoded_name_u)
-                except KeyError:
-                    return Failure()
-                return metadata_d
-            def get_filenode(path_u):
-                try:
-                    node_d = self._upload_dirnode.get(path_u)
-                except KeyError:
-                    return Failure()
-                return node_d
             if not os.path.exists(path_u):
                 self._log("drop-upload: notified object %r disappeared "
                           "(this is normal for temporary objects)" % (path_u,))
                 self._count('objects_disappeared')
                 d2 = defer.succeed(None)
                 if self._db.check_file_db_exists(relpath_u):
-                    d2.addCallback(get_metadata)
+                    d2.addCallback(lambda ign: self._get_metadata(encoded_name_u))
                     current_version = self._db.get_local_file_version(relpath_u) + 1
                     def set_deleted(metadata):
                         print "SET_DELETED new version %s----------------------------------------------" % (current_version,)
@@ -328,7 +316,7 @@ class Uploader(QueueMixin):
                         self._db.did_upload_file(filecap, relpath_u, current_version, int(mtime), int(ctime), size)
                         print "after change magic-folder db %s %s %s %s %s %s-----------------------" % (filecap, relpath_u, current_version, mtime, ctime, size)
                         self._count('files_uploaded')
-                    d2.addCallback(lambda x: get_filenode(encoded_name_u))
+                    d2.addCallback(lambda x: self._get_filenode(encoded_name_u))
                     d2.addCallback(add_db_entry)
 
                 d2.addCallback(lambda x: Exception("file does not exist"))
@@ -388,6 +376,20 @@ class Uploader(QueueMixin):
         d.addBoth(self._do_callback)
         return d
 
+    def _get_metadata(self, encoded_name_u):
+        try:
+            d = self._upload_dirnode.get_metadata_for(encoded_name_u)
+        except KeyError:
+            return Failure()
+        return d
+
+    def _get_filenode(self, encoded_name_u):
+        try:
+            d = self._upload_dirnode.get(encoded_name_u)
+        except KeyError:
+            return Failure()
+        return d
+
 
 class Downloader(QueueMixin):
     def __init__(self, client, local_path_u, db, collective_dircap):