From d76b0b6c275ff380d099438927cfa49770a93482 Mon Sep 17 00:00:00 2001 From: Anuj Agarwal Date: Thu, 26 Dec 2019 12:31:14 +0530 Subject: [PATCH] Treat hidden file as deleted in sync --- README.md | 2 +- b2sdk/sync/policy.py | 6 ++++-- b2sdk/v0/sync.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index baa21042d..1ccdb5c44 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ b2sdk>=0.0.0,<1.0.0 ## 1.0.4 (not release yet) -* ??? +* Make sync treat hidden files as deleted ## 1.0.2 (2019-10-15) diff --git a/b2sdk/sync/policy.py b/b2sdk/sync/policy.py index ebf14b339..f7bef3dc9 100644 --- a/b2sdk/sync/policy.py +++ b/b2sdk/sync/policy.py @@ -85,7 +85,7 @@ def _should_transfer(self): """ Decide whether to transfer the file from the source to the destination. """ - if self._source_file is None: + if self._source_file is None or self._source_file.latest_version().action == 'hide': # No source file. Nothing to transfer. return False elif self._dest_file is None: @@ -292,7 +292,9 @@ class DownAndDeletePolicy(DownPolicy): def _get_hide_delete_actions(self): for action in super(DownAndDeletePolicy, self)._get_hide_delete_actions(): yield action - if self._dest_file is not None and self._source_file is None: + if self._dest_file is not None and ( + self._source_file is None or self._source_file.latest_version().action == 'hide' + ): # Local files have either 0 or 1 versions. If the file is there, # it must have exactly 1 version. yield LocalDeleteAction(self._dest_file.name, self._dest_file.versions[0].id_) diff --git a/b2sdk/v0/sync.py b/b2sdk/v0/sync.py index 3fd0b0054..09c6e2f82 100644 --- a/b2sdk/v0/sync.py +++ b/b2sdk/v0/sync.py @@ -48,7 +48,7 @@ def sync_folders(self, *args, **kwargs): except InvalidArgument as e: raise CommandError('--%s %s' % (e.parameter_name, e.message)) except IncompleteSync as e: - raise CommandError(e.message) + raise CommandError(str(e)) def get_synchronizer_from_args(