From b705e08e484e629c1afc1ee5bafa3eb2d48e1a1b Mon Sep 17 00:00:00 2001 From: Roland Date: Thu, 22 Feb 2024 13:12:26 -0700 Subject: [PATCH] Handling if multiple videos exist at start of video download. --- modules/videos/downloader.py | 3 ++- wrolpi/files/models.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/videos/downloader.py b/modules/videos/downloader.py index 7086e1a2..7851bdcb 100755 --- a/modules/videos/downloader.py +++ b/modules/videos/downloader.py @@ -211,7 +211,8 @@ class VideoDownloader(Downloader, ABC): # Video may have been downloaded previously, get its location for error reporting. location = None with get_db_session() as session: - video = Video.get_by_url(url, session=session) + videos = session.query(Video).join(FileGroup).filter_by(url=url).all() + video = videos[0] if videos else None if video and video.channel_id: location = f'/videos/channel/{video.channel_id}/video/{video.id}' elif video: diff --git a/wrolpi/files/models.py b/wrolpi/files/models.py index 98e79e5e..95060118 100644 --- a/wrolpi/files/models.py +++ b/wrolpi/files/models.py @@ -12,6 +12,7 @@ from sqlalchemy.orm.collections import InstrumentedList from wrolpi.common import Base, ModelHelper, tsvector, logger, recursive_map, get_media_directory from wrolpi.dates import TZDateTime, now, from_timestamp, strptime_ms, strftime from wrolpi.db import optional_session +from wrolpi.downloader import download_manager from wrolpi.errors import FileGroupIsTagged from wrolpi.files import indexers from wrolpi.media_path import MediaPathType