Skip to content
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

According to README download_all should ignore filtered albums. #159

Merged
merged 3 commits into from
Oct 7, 2023
Merged

According to README download_all should ignore filtered albums. #159

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed12173
According to README it `download_all` should ignore filtered albums.
tymmej Oct 7, 2023
116da8b
Merge branch 'main' into filter_all_download
mandarons Oct 7, 2023
afe72f5
Documentation updated
mandarons Oct 7, 2023
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
2 changes: 2 additions & 0 deletions src/sync_photos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,8 @@ def sync_photos(config, photos):
folder_format = config_parser.get_photos_folder_format(config=config)
if download_all:
for album in photos.albums.keys():
if filters["albums"] and album in iter(filters["albums"]):
continue
sync_album(
album=photos.albums[album],
destination_path=os.path.join(destination_path, album),
Expand Down
33 changes: 32 additions & 1 deletion tests/test_sync_photos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ def setUp(self) -> None:
def tearDown(self) -> None:
"""Remove temp directory."""
shutil.rmtree(tests.TEMP_DIR)
if os.path.exists(tests.PHOTOS_DIR):
shutil.rmtree(tests.PHOTOS_DIR)

@patch(target="keyring.get_password", return_value=data.VALID_PASSWORD)
@patch(
Expand Down Expand Up @@ -65,7 +67,7 @@ def test_sync_photos_original(
)
@patch("icloudpy.ICloudPyService")
@patch("src.read_config")
def test_sync_photos_all_albums(
def test_sync_photos_all_albums_filtered(
self, mock_read_config, mock_service, mock_get_username, mock_get_password
):
"""Test for successful original photo size download."""
Expand All @@ -84,6 +86,35 @@ def test_sync_photos_all_albums(
album_1_path = os.path.join(
self.destination_path, config["photos"]["filters"]["albums"][1]
)
self.assertFalse(os.path.isdir(album_0_path))
self.assertFalse(os.path.isdir(album_1_path))

@patch(target="keyring.get_password", return_value=data.VALID_PASSWORD)
@patch(
target="src.config_parser.get_username", return_value=data.AUTHENTICATED_USER
)
@patch("icloudpy.ICloudPyService")
@patch("src.read_config")
def test_sync_photos_all_albums_not_filtered(
self, mock_read_config, mock_service, mock_get_username, mock_get_password
):
"""Test for successful original photo size download."""
mock_service = self.service
config = self.config.copy()
config["photos"]["destination"] = self.destination_path
config["photos"]["all_albums"] = True
mock_read_config.return_value = config
album_0_path = os.path.join(
self.destination_path, config["photos"]["filters"]["albums"][0]
)
album_1_path = os.path.join(
self.destination_path, config["photos"]["filters"]["albums"][1]
)
config["photos"]["filters"]["albums"] = None
# Sync original photos
self.assertIsNone(
sync_photos.sync_photos(config=config, photos=mock_service.photos)
)
self.assertTrue(os.path.isdir(album_0_path))
self.assertTrue(os.path.isdir(album_1_path))
self.assertTrue(len(os.listdir(album_0_path)) > 1)
Expand Down