ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-03-11 06:43:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use relative paths in magic folder db.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-07-20 17:30:56 +01:00
parent ad4b4843c2
commit afa9d9ae10
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,10 +407,10 @@ class MagicFolder(service.MultiService):
"(this is normal for temporary objects)" % (path_u,)) "(this is normal for temporary objects)" % (path_u,))
self._stats_provider.count('magic_folder.objects_disappeared', 1) self._stats_provider.count('magic_folder.objects_disappeared', 1)
d2 = defer.succeed(None) d2 = defer.succeed(None)
if self._db.check_file_db_exists(path_u): #FIXME relpath_u? if self._db.check_file_db_exists(relpath_u):
d2.addCallback(get_metadata) d2.addCallback(get_metadata)
def set_deleted(metadata): def set_deleted(metadata):
current_version = self._db.get_local_file_version(path_u) + 1 #FIXME relpath_u? current_version = self._db.get_local_file_version(relpath_u) + 1
metadata['version'] = current_version metadata['version'] = current_version
metadata['deleted'] = True metadata['deleted'] = True
emptyUploadable = Data("", self._convergence) emptyUploadable = Data("", self._convergence)
@ -423,7 +423,7 @@ class MagicFolder(service.MultiService):
if os.path.isdir(path_u): if os.path.isdir(path_u):
return _add_dir(encoded_name_u) return _add_dir(encoded_name_u)
elif os.path.isfile(path_u): elif os.path.isfile(path_u):
version = self._db.get_local_file_version(path_u) #FIXME relpath_u? version = self._db.get_local_file_version(relpath_u)
if version is None: if version is None:
version = 0 version = 0
else: else: