ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-30 09:48:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some pyflakes errors and warnings.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-07-16 18:41:44 +01:00
parent f423e72062
commit 2bd93d2e02
3 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/allmydata/frontends/magic_folder.py
View File

@ -199,7 +199,6 @@ class MagicFolder(service.MultiService):
def _filter_scan_batch(self, result):
extension = []
max_version_dict = {}
for name in self._download_scan_batch.keys():
if name in self._download_pending:
continue
@ -246,9 +245,12 @@ class MagicFolder(service.MultiService):
except FilenameEncodingError:
raise(Exception("WARNING: magic folder: could not list directory %s due to a filename encoding error" % (quoted_path,)))
d = defer.succeed(None)
for child in children:
assert isinstance(child, unicode), child
childpath = os.path.join(localpath, child)
def _process_child(ign, childpath=childpath):
# note: symlinks to directories are both islink() and isdir()
isdir = os.path.isdir(childpath)
isfile = os.path.isfile(childpath)
@ -256,21 +258,25 @@ class MagicFolder(service.MultiService):
if islink:
self.warn("WARNING: cannot backup symlink %s" % quote_local_unicode_path(childpath))
return None
elif isdir:
# process directories unconditionally
self._append_to_upload_deque(childpath)
# recurse on the child directory
self._scan(childpath)
return self._scan(childpath)
elif isfile:
file_version = self._db.get_local_file_version(childpath)
if file_version is None:
# XXX upload if we didn't record our version in magicfolder db?
self._append_to_upload_deque(childpath)
return None
else:
file_node, metadata = self._get_collective_latest_file(childpath)
d2 = self._get_collective_latest_file(childpath)
def _got_latest_file((file_node, metadata)):
collective_version = metadata['version']
if collective_version is None:
continue
return None
if file_version > collective_version:
self._append_to_upload_deque(childpath)
elif file_version < collective_version:
@ -278,12 +284,19 @@ class MagicFolder(service.MultiService):
# we must download it and unlink the old file from our upload dirnode
self._append_to_download_deque(childpath)
# XXX where should we save the returned deferred?
d = self._upload_dirnode.delete(childpath, must_be_file=True)
return self._upload_dirnode.delete(childpath, must_be_file=True)
else:
# XXX same version. do nothing.
pass
d2.addCallback(_got_latest_file)
return d2
else:
self.warn("WARNING: cannot backup special file %s" % quote_local_unicode_path(childpath))
return None
d.addCallback(_process_child)
d.addErrback(log.err)
return d
def startService(self):
self._db = backupdb.get_backupdb(self._dbfile, create_version=(backupdb.SCHEMA_v3, 3))

6
src/allmydata/scripts/magic_folder_cli.py
View File

@ -1,11 +1,11 @@
import os, json
import os
from cStringIO import StringIO
from twisted.python import usage
from .common import BaseOptions, BasedirOptions, get_aliases
from .cli import MakeDirectoryOptions, ListOptions, LnOptions
import tahoe_ls, tahoe_mv
from .cli import MakeDirectoryOptions, LnOptions
import tahoe_mv
from allmydata.util import fileutil
from allmydata import uri

1
src/allmydata/test/test_cli_magic_folder.py
View File

@ -1,6 +1,5 @@
import os.path
import re
import json
from twisted.trial import unittest
from twisted.internet import defer