From 3b41c8df8160197d9fb03b66fad9ef23e82c644d Mon Sep 17 00:00:00 2001 From: tcely Date: Mon, 23 Dec 2024 16:55:26 -0500 Subject: [PATCH 1/2] Remove duplicated ' to:' --- tubesync/sync/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py index 37983932..10350562 100644 --- a/tubesync/sync/tasks.py +++ b/tubesync/sync/tasks.py @@ -430,7 +430,7 @@ def download_media(media_id): copyfile(media.thumb.path, media.thumbpath) # If selected, write an NFO file if media.source.write_nfo: - log.info(f'Writing media NFO file to: to: {media.nfopath}') + log.info(f'Writing media NFO file to: {media.nfopath}') write_text_file(media.nfopath, media.nfoxml) # Schedule a task to update media servers for mediaserver in MediaServer.objects.all(): From 0795eb951d7918c3ee3333494f1952014068cbd5 Mon Sep 17 00:00:00 2001 From: tcely Date: Wed, 25 Dec 2024 00:21:58 -0500 Subject: [PATCH 2/2] Consistency fixes The `filepath` variable is defined before the `if` and used throughout the first block, so we should use it in the `else` block too. Otherwise, a change to that variable would change the first block but not the second block. --- tubesync/sync/tasks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py index 10350562..f58fce36 100644 --- a/tubesync/sync/tasks.py +++ b/tubesync/sync/tasks.py @@ -359,7 +359,7 @@ def download_media(media_id): return if media.skip: # Media was toggled to be skipped after the task was scheduled - log.warn(f'Download task triggered for media: {media} (UUID: {media.pk}) but ' + log.warn(f'Download task triggered for media: {media} (UUID: {media.pk}) but ' f'it is now marked to be skipped, not downloading') return if media.downloaded and media.media_file: @@ -446,7 +446,7 @@ def download_media(media_id): else: # Expected file doesn't exist on disk err = (f'Failed to download media: {media} (UUID: {media.pk}) to disk, ' - f'expected outfile does not exist: {media.filepath}') + f'expected outfile does not exist: {filepath}') log.error(err) # Raising an error here triggers the task to be re-attempted (or fail) raise DownloadFailedException(err)