Skip to content

Extract folder scanning module #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Extract folder scanning module #212

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
43dfd5f
Move chunks to `scan` module
agoncharov-reef May 17, 2022
ba50848
Fix file headers
agoncharov-reef May 17, 2022
d1ca3ce
UnSyncableFilename -> UnsupportedFilename
agoncharov-reef May 17, 2022
11cb325
Refactor super()
agoncharov-reef May 17, 2022
bc38109
SyncPath -> ScanPath
agoncharov-reef May 17, 2022
eddc479
Separate Report from SyncReport
agoncharov-reef May 17, 2022
48dcf4c
Reformat imports
agoncharov-reef May 17, 2022
bf42cb7
Don't create redundant `keep_days` variable
agoncharov-reef May 17, 2022
8d0023f
Move `zip_folders` to `scan/scan.py`
agoncharov-reef May 17, 2022
266aa6c
Fix imports
agoncharov-reef May 17, 2022
95c39b8
Fix tests
agoncharov-reef May 17, 2022
19fb2b5
Lint fix
agoncharov-reef May 17, 2022
cdba814
Update changelog
agoncharov-reef May 17, 2022
8ac1500
Update CHANGELOG.md
agoncharov-reef May 19, 2022
df25245
Avoid calling time.time()
agoncharov-reef May 23, 2022
60b0641
Minor fixes
agoncharov-reef May 23, 2022
d8a4c45
Extract scan tests from sync unit tests
agoncharov-reef May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions b2sdk/v2/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@
from b2sdk._v3 import * # noqa
from b2sdk._v3 import parse_folder as parse_sync_folder
from b2sdk._v3 import AbstractPath as AbstractSyncPath
from b2sdk._v3 import B2Path as B2SyncPath
from b2sdk._v3 import LocalPath as LocalSyncPath
from b2sdk._v3 import UnsupportedFilename as UnSyncableFilename

from .api import B2Api
from .b2http import B2Http
from .bucket import Bucket, BucketFactory
from .session import B2Session
from .sync import B2SyncPath
from .transfer import DownloadManager, UploadManager
1 change: 1 addition & 0 deletions b2sdk/v2/exception.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from b2sdk._v3.exception import * # noqa

v3BucketIdNotFound = BucketIdNotFound
UnSyncableFilename = UnsupportedFilename


# overridden to retain old style isinstance check and attributes
Expand Down
4 changes: 4 additions & 0 deletions b2sdk/v2/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
from b2sdk._v3 import B2Path


B2SyncPath = B2Path
8 changes: 4 additions & 4 deletions test/unit/v0/test_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

from .deps_exception import UnSyncableFilename, NotADirectory, UnableToCreateDirectory, EmptyDirectory, InvalidArgument, CommandError
from .deps import FileVersionInfo
from .deps import AbstractFolder, B2Folder, LocalFolder
from .deps import B2Folder, LocalFolder
from .deps import LocalSyncPath, B2SyncPath
from .deps import ScanPoliciesManager, DEFAULT_SCAN_MANAGER
from .deps import BoundedQueueExecutor, make_folder_sync_actions, zip_folders
Expand Down Expand Up @@ -447,8 +447,8 @@ def test_multiple_versions(self):

self.assertEqual(
[
"B2SyncPath(inner/a.txt, [('a2', 2000, 'upload'), ('a1', 1000, 'upload')])",
"B2SyncPath(inner/b.txt, [('b2', 1999, 'upload'), ('b1', 1001, 'upload')])"
"B2Path(inner/a.txt, [('a2', 2000, 'upload'), ('a1', 1000, 'upload')])",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be kept for v0, v1 and v2

"B2Path(inner/b.txt, [('b2', 1999, 'upload'), ('b1', 1001, 'upload')])"
], [
str(f) for f in folder.all_files(self.reporter)
if f.relative_path in ('inner/a.txt', 'inner/b.txt')
Expand All @@ -461,7 +461,7 @@ def test_exclude_modified_multiple_versions(self):
)
folder = self.prepare_folder(use_file_versions_info=True)
self.assertEqual(
["B2SyncPath(inner/b.txt, [('b2', 1999, 'upload'), ('b1', 1001, 'upload')])"], [
["B2Path(inner/b.txt, [('b2', 1999, 'upload'), ('b1', 1001, 'upload')])"], [
str(f) for f in folder.all_files(self.reporter, policies_manager=polices_manager)
if f.relative_path in ('inner/a.txt', 'inner/b.txt')
]
Expand Down
8 changes: 4 additions & 4 deletions test/unit/v1/test_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

from ..test_base import TestBase

from .deps import AbstractFolder, B2Folder, LocalFolder
from .deps import B2Folder, LocalFolder
from .deps import BoundedQueueExecutor, zip_folders
from .deps import LocalSyncPath, B2SyncPath
from .deps import FileVersionInfo
Expand Down Expand Up @@ -451,8 +451,8 @@ def test_multiple_versions(self):

self.assertEqual(
[
"B2SyncPath(inner/a.txt, [('a2', 2000, 'upload'), ('a1', 1000, 'upload')])",
"B2SyncPath(inner/b.txt, [('b2', 1999, 'upload'), ('b1', 1001, 'upload')])"
"B2Path(inner/a.txt, [('a2', 2000, 'upload'), ('a1', 1000, 'upload')])",
"B2Path(inner/b.txt, [('b2', 1999, 'upload'), ('b1', 1001, 'upload')])"
], [
str(f) for f in folder.all_files(self.reporter)
if f.relative_path in ('inner/a.txt', 'inner/b.txt')
Expand All @@ -465,7 +465,7 @@ def test_exclude_modified_multiple_versions(self):
)
folder = self.prepare_folder(use_file_versions_info=True)
self.assertEqual(
["B2SyncPath(inner/b.txt, [('b2', 1999, 'upload'), ('b1', 1001, 'upload')])"], [
["B2Path(inner/b.txt, [('b2', 1999, 'upload'), ('b1', 1001, 'upload')])"], [
str(f) for f in folder.all_files(self.reporter, policies_manager=polices_manager)
if f.relative_path in ('inner/a.txt', 'inner/b.txt')
]
Expand Down