From: David Stainton <dstainton415@gmail.com>
Date: Tue, 14 Jul 2015 23:39:26 +0000 (-0700)
Subject: rename ignore count to upload ignore count
X-Git-Url: https://git.rkrishnan.org/listings/pb2server.py?a=commitdiff_plain;h=bfba27393a47b8d8bec4ec1b143bbb81a3c318c1;p=tahoe-lafs%2Ftahoe-lafs.git

rename ignore count to upload ignore count
---

diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py
index fc9a2ad1..4b51606c 100644
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -91,10 +91,9 @@ class MagicFolder(service.MultiService):
 
         self._processed_callback = lambda ign: None
         self._download_callback = lambda ign: None
-        self._ignore_count = 0
+        self._upload_ignore_count = 0
         self._download_ignore_count = 0
 
-        # XXX correct?
         self._notifier = self._inotify.INotify()
 
         if hasattr(self._notifier, 'set_pending_delay'):
@@ -462,10 +461,10 @@ class MagicFolder(service.MultiService):
         return None  # intentionally suppress failures, which have already been logged
 
     def _do_processed_callback(self, res):
-        if self._ignore_count == 0:
+        if self._upload_ignore_count == 0:
             self._processed_callback(res)
         else:
-            self._ignore_count -= 1
+            self._upload_ignore_count -= 1
         return None  # intentionally suppress failures, which have already been logged
 
     def set_download_callback(self, callback, ignore_count=0):
@@ -482,7 +481,7 @@ class MagicFolder(service.MultiService):
         local filesystem notification has been processed (successfully or unsuccessfully).
         """
         self._processed_callback = callback
-        self._ignore_count = ignore_count
+        self._upload_ignore_count = ignore_count
 
     def finish(self, for_tests=False):
         self._stopped = True