From 4eb9845ff72b45252c3c4699bc5e7656f30a5ce5 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 11 Aug 2024 17:27:41 +0200 Subject: [PATCH] Improved asf, aac metadata import --- cps/audio.py | 18 +++++++++--------- cps/uploader.py | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cps/audio.py b/cps/audio.py index 61ec1b484..6e080f3f2 100644 --- a/cps/audio.py +++ b/cps/audio.py @@ -80,10 +80,10 @@ def get_audio_file_info(tmp_file_path, original_file_extension, original_file_na tmp_cover_name = os.path.join(os.path.dirname(tmp_file_path), 'cover.jpg') cover.cover_processing(tmp_file_path, cover_info.data, "." + cover_info.mime[-3:]) elif original_file_extension in [".aac"]: - title = audio_file.tags.get('Title').value if "title" in audio_file else None - author = audio_file.tags.get('Artist').value if "artist" in audio_file else None - comments = None # audio_file.tags.get('COMM', None) - tags = "" + title = audio_file.tags.get('Title').value if "Title" in audio_file else None + author = audio_file.tags.get('Artist').value if "Artist" in audio_file else None + comments = audio_file.tags.get('Comment').value if "Comment" in audio_file else None + tags = audio_file.tags.get('Genre').value if "Genre" in audio_file else None series = audio_file.tags.get('Album').value if "Album" in audio_file else None series_id = audio_file.tags.get('Track').value if "Track" in audio_file else None publisher = audio_file.tags.get('Label').value if "Label" in audio_file else None @@ -94,15 +94,15 @@ def get_audio_file_info(tmp_file_path, original_file_extension, original_file_na with open(tmp_cover_name, "wb") as cover_file: cover_file.write(cover_data.value.split(b"\x00",1)[1]) elif original_file_extension in [".asf"]: - title = audio_file.tags.get('Title')[0].value if "title" in audio_file else None - author = audio_file.tags.get('Artist')[0].value if "artist" in audio_file else None - comments = None # audio_file.tags.get('COMM', None) - tags = "" + title = audio_file.tags.get('Title')[0].value if "Title" in audio_file else None + author = audio_file.tags.get('Artist')[0].value if "Artist" in audio_file else None + comments = audio_file.tags.get('Comments')[0].value if "Comments" in audio_file else None + tags = audio_file.tags.get('Genre')[0].value if "Genre" in audio_file else None series = audio_file.tags.get('Album')[0].value if "Album" in audio_file else None series_id = audio_file.tags.get('Track')[0].value if "Track" in audio_file else None publisher = audio_file.tags.get('Label')[0].value if "Label" in audio_file else None pubdate = audio_file.tags.get('Year')[0].value if "Year" in audio_file else None - cover_data = audio_file.tags['WM/Picture'] + cover_data = audio_file.tags.get('WM/Picture', None) if cover_data: tmp_cover_name = os.path.join(os.path.dirname(tmp_file_path), 'cover.jpg') with open(tmp_cover_name, "wb") as cover_file: diff --git a/cps/uploader.py b/cps/uploader.py index bdb3a2b0d..a2cd05446 100644 --- a/cps/uploader.py +++ b/cps/uploader.py @@ -92,7 +92,7 @@ def process(tmp_file_path, original_file_name, original_file_extension, rar_exec original_file_extension, rar_executable) elif extension_upper in [".MP3", ".OGG", ".FLAC", ".WAV", ".AAC", ".AIFF", ".ASF", ".MP4", - ".M4A", ".M4B"] and use_audio_meta: + ".M4A", ".M4B", ".OGV"] and use_audio_meta: meta = audio.get_audio_file_info(tmp_file_path, original_file_extension, original_file_name) except Exception as ex: log.warning('cannot parse metadata, using default: %s', ex)