Skip to content

Commit

Permalink
fix: MediaItem extension references
Browse files Browse the repository at this point in the history
  • Loading branch information
NTFSvolume committed Jan 31, 2025
1 parent 60714e3 commit a2e6581
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
4 changes: 2 additions & 2 deletions cyberdrop_dl/clients/download_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ async def mark_completed(self, domain: str, media_item: MediaItem) -> None:
async def add_file_size(self, domain: str, media_item: MediaItem) -> None:
if not media_item.complete_file:
media_item.complete_file = self.get_file_location(media_item)
if media_item.complete_file.exists():
if media_item.complete_file.is_file():
await self.manager.db_manager.history_table.add_filesize(domain, media_item)

async def handle_media_item_completion(self, media_item: MediaItem, downloaded: bool = False) -> None:
Expand Down Expand Up @@ -372,7 +372,7 @@ async def iterate_filename(self, complete_file: Path, media_item: MediaItem) ->
"""Iterates the filename until it is unique."""
partial_file = None
for iteration in itertools.count(1):
filename = f"{complete_file.stem} ({iteration}){media_item.ext}"
filename = f"{complete_file.stem} ({iteration}){complete_file.suffix}"
temp_complete_file = media_item.download_folder / filename
if (
not temp_complete_file.exists()
Expand Down
9 changes: 1 addition & 8 deletions cyberdrop_dl/scraper/crawler.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,7 @@ async def handle_file(
original_filename = filename

download_folder = get_download_path(self.manager, scrape_item, self.folder_domain)
media_item = MediaItem(
url,
scrape_item,
download_folder,
filename,
original_filename,
debrid_link,
)
media_item = MediaItem(url, scrape_item, download_folder, filename, original_filename, debrid_link, ext)

check_complete = await self.manager.db_manager.history_table.check_complete(self.domain, url, scrape_item.url)
if check_complete:
Expand Down
4 changes: 2 additions & 2 deletions cyberdrop_dl/utils/data_enums_classes/url_objects.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class MediaItem:
filename: str
original_filename: str | None = None
debrid_link: URL | None = field(default=None, hash=False, compare=False)
ext: str = ""

# exclude from __init__
file_lock_reference_name: str | None = field(default=None, init=False)
Expand All @@ -50,14 +51,13 @@ class MediaItem:
# slots for __post_init__
referer: URL = field(init=False)
album_id: str | None = field(init=False)
ext: str = field(init=False)
datetime: int | None = field(init=False, hash=False, compare=False)
parents: list[URL] = field(init=False, hash=False, compare=False)

def __post_init__(self, origin: ScrapeItem) -> None:
self.referer = origin.url
self.album_id = origin.album_id
self.ext = Path(self.filename).suffix
self.ext = self.ext or Path(self.filename).suffix
self.original_filename = self.original_filename or self.filename
self.parents = origin.parents.copy()
self.datetime = origin.possible_datetime
Expand Down

0 comments on commit a2e6581

Please sign in to comment.