diff --git a/b2sdk/_internal/sync/policy.py b/b2sdk/_internal/sync/policy.py index 724d09c4..493cae9b 100644 --- a/b2sdk/_internal/sync/policy.py +++ b/b2sdk/_internal/sync/policy.py @@ -436,6 +436,8 @@ def make_b2_delete_actions( # B2 does not really store folders, so there is no need to hide # them or delete them return + if source_path is not None and not source_path.is_visible(): + source_path = None for version_index, version in enumerate(dest_path.all_versions): keep = (version_index == 0) and (source_path is not None) and not transferred if not keep: @@ -477,6 +479,8 @@ def make_b2_keep_days_actions( # B2 does not really store folders, so there is no need to hide # them or delete them return + if source_path is not None and not source_path.is_visible(): + source_path = None for version_index, version in enumerate(dest_path.all_versions): # How old is this version? age_days = (now_millis - version.mod_time_millis) / ONE_DAY_IN_MS diff --git a/changelog.d/167.fixed.md b/changelog.d/167.fixed.md new file mode 100644 index 00000000..ad01d3dd --- /dev/null +++ b/changelog.d/167.fixed.md @@ -0,0 +1 @@ +Bucket-to-bucket sync with `KeepOrDeleteMode.DELETE` or `KEEP_BEFORE_DELETE` now deletes or hides the destination file when the source file is hidden, the same as a local destination already did. diff --git a/test/unit/sync/test_sync.py b/test/unit/sync/test_sync.py index ccb4692d..20ba49d5 100644 --- a/test/unit/sync/test_sync.py +++ b/test/unit/sync/test_sync.py @@ -278,6 +278,22 @@ def test_delete_hide_b2_multiple_versions_old(self, synchronizer_factory, src_ty ] self.assert_folder_sync_actions(synchronizer, src, dst, expected) + def test_delete_b2_when_source_hidden(self, synchronizer_factory): + synchronizer = synchronizer_factory(keep_days_or_delete=KeepOrDeleteMode.DELETE) + src = self.b2_folder_factory(('a.txt', [-300, 100])) + dst = self.b2_folder_factory(('a.txt', [100])) + expected = ['b2_delete(folder/a.txt, id_a_100, )'] + self.assert_folder_sync_actions(synchronizer, src, dst, expected) + + def test_keep_days_hide_b2_when_source_hidden(self, synchronizer_factory): + synchronizer = synchronizer_factory( + keep_days_or_delete=KeepOrDeleteMode.KEEP_BEFORE_DELETE, keep_days=1 + ) + src = self.b2_folder_factory(('a.txt', [-TODAY, TODAY - 2 * DAY])) + dst = self.b2_folder_factory(('a.txt', [TODAY - 2 * DAY])) + expected = ['b2_hide(folder/a.txt)'] + self.assert_folder_sync_actions(synchronizer, src, dst, expected) + @pytest.mark.parametrize( 'src_type', [