Skip to content

Bulk asynchronous downloader for multiple file hosts

refactor: remove relative path

NTFSvolumedd780c0eeea7
diff --git a/cyberdrop_dl/url_objects.py b/cyberdrop_dl/url_objects.py
index ba30744b4..e74745b12 100644
--- a/cyberdrop_dl/url_objects.py
+++ b/cyberdrop_dl/url_objects.py
@@ -360,14 +360,9 @@ class ScrapeItem:
if self.parents:
return self.parents[-1]
- def relative_download_path(self, domain: str) -> Path:
- if self.retry_path:
- return self.retry_path
- if not self.folders:
- return Path(f"Loose Files ({domain})")
- if self.part_of_album:
- return Path(*self.folders)
- return Path(*self.folders) / f"Loose Files ({domain})"
+ @property
+ def is_loose_file(self) -> bool:
+ return not self.folders or not self.part_of_album
@property
def path(self) -> Path:
@@ -376,7 +371,12 @@ class ScrapeItem:
return Path(*self.folders)
def compose_download_path(self, domain: str) -> Path:
- return self.download_folder / self.relative_download_path(domain)
+ if self.retry_path:
+ return self.retry_path
+ path = self.download_folder / self.path
+ if self.is_loose_file:
+ path = path / f"Loose Files ({domain})"
+ return path
def copy(self) -> Self:
"""Returns a deep copy of this scrape_item"""
diff --git a/tests/test_database.py b/tests/test_database.py
index d79ae5b60..e8d4ad725 100644
--- a/tests/test_database.py
+++ b/tests/test_database.py
@@ -145,23 +145,24 @@ class TestGetDownloadPath:
assert not item.folders
assert not item.part_of_album
assert not item.retry_path
- download_path = item.relative_download_path("cyberdrop")
- assert download_path == Path("Loose Files (cyberdrop)")
+ assert item.path == Path()
+ download_path = item.compose_download_path("cyberdrop")
+ assert download_path == Path("downloads/Loose Files (cyberdrop)")
def test_loose_file_with_parent(self, item: ScrapeItem) -> None:
item.add_to_parent_title("a/sub/folder")
- download_path = item.relative_download_path("cyberdrop")
- assert download_path == Path("a-sub-folder/Loose Files (cyberdrop)")
+ download_path = item.compose_download_path("cyberdrop")
+ assert download_path == Path("downloads/a-sub-folder/Loose Files (cyberdrop)")
def test_album_file(self, item: ScrapeItem) -> None:
item.add_to_parent_title("a/sub/folder")
item.part_of_album = True
- download_path = item.relative_download_path("cyberdrop")
- assert download_path == Path("a-sub-folder")
+ download_path = item.compose_download_path("cyberdrop")
+ assert download_path == Path("downloads/a-sub-folder")
def test_retry_path(self, item: ScrapeItem) -> None:
item.add_to_parent_title("a/sub/folder")
item.part_of_album = True
item.retry_path = retry_path = Path("a/retry/path")
- download_path = item.relative_download_path("cyberdrop")
+ download_path = item.compose_download_path("cyberdrop")
assert download_path == retry_path