KevinMidboe/spotify-downloader
1
0
Fork 0
mirror of https://github.com/KevinMidboe/spotify-downloader.git synced 2025-10-29 18:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #674 from ritiek/fix-mutagen-crash

Browse Source 
Fix mutagen crash
This commit is contained in:
Ritiek Malhotra
2020-03-02 17:44:14 +05:30
committed by GitHub
parent 9ecf957c81 75311e56d1
commit ade55c6dba
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [Unreleased]
### Fixed
Embed release date metadata only when available (follow up of #672) ([@ritiek](https://github.com/ritiek)) (#674)
## [1.2.5] - 2020-03-02 ## [1.2.5] - 2020-03-02
### Fixed ### Fixed

16
spotdl/metadata.py
View File

@@ -76,8 +76,9 @@ class EmbedMetadata:
# https://github.com/quodlibet/mutagen/blob/master/mutagen/id3/_frames.py # https://github.com/quodlibet/mutagen/blob/master/mutagen/id3/_frames.py
# Each class represents an id3 tag # Each class represents an id3 tag
audiofile = ID3(music_file) audiofile = ID3(music_file)
audiofile["TORY"] = TORY(encoding=3, text=meta_tags["year"]) if meta_tags["year"]:
audiofile["TYER"] = TYER(encoding=3, text=meta_tags["year"]) audiofile["TORY"] = TORY(encoding=3, text=meta_tags["year"])
audiofile["TYER"] = TYER(encoding=3, text=meta_tags["year"])
if meta_tags["publisher"]: if meta_tags["publisher"]:
audiofile["TPUB"] = TPUB(encoding=3, text=meta_tags["publisher"]) audiofile["TPUB"] = TPUB(encoding=3, text=meta_tags["publisher"])
audiofile["COMM"] = COMM( audiofile["COMM"] = COMM(
@@ -109,7 +110,8 @@ class EmbedMetadata:
meta_tags = self.meta_tags meta_tags = self.meta_tags
audiofile = MP4(music_file) audiofile = MP4(music_file)
self._embed_basic_metadata(audiofile, preset=M4A_TAG_PRESET) self._embed_basic_metadata(audiofile, preset=M4A_TAG_PRESET)
audiofile[M4A_TAG_PRESET["year"]] = meta_tags["year"] if meta_tags["year"]:
audiofile[M4A_TAG_PRESET["year"]] = meta_tags["year"]
audiofile[M4A_TAG_PRESET["comment"]] = meta_tags["external_urls"][self.provider] audiofile[M4A_TAG_PRESET["comment"]] = meta_tags["external_urls"][self.provider]
if meta_tags["lyrics"]: if meta_tags["lyrics"]:
audiofile[M4A_TAG_PRESET["lyrics"]] = meta_tags["lyrics"] audiofile[M4A_TAG_PRESET["lyrics"]] = meta_tags["lyrics"]
@@ -130,7 +132,8 @@ class EmbedMetadata:
meta_tags = self.meta_tags meta_tags = self.meta_tags
audiofile = FLAC(music_file) audiofile = FLAC(music_file)
self._embed_basic_metadata(audiofile) self._embed_basic_metadata(audiofile)
audiofile["year"] = meta_tags["year"] if meta_tags["year"]:
audiofile["year"] = meta_tags["year"]
audiofile["comment"] = meta_tags["external_urls"][self.provider] audiofile["comment"] = meta_tags["external_urls"][self.provider]
if meta_tags["lyrics"]: if meta_tags["lyrics"]:
audiofile["lyrics"] = meta_tags["lyrics"] audiofile["lyrics"] = meta_tags["lyrics"]
@@ -155,8 +158,9 @@ class EmbedMetadata:
if meta_tags["album"]["name"]: if meta_tags["album"]["name"]:
audiofile[preset["album"]] = meta_tags["album"]["name"] audiofile[preset["album"]] = meta_tags["album"]["name"]
audiofile[preset["title"]] = meta_tags["name"] audiofile[preset["title"]] = meta_tags["name"]
audiofile[preset["date"]] = meta_tags["release_date"] if meta_tags["release_date"]:
audiofile[preset["originaldate"]] = meta_tags["release_date"] audiofile[preset["date"]] = meta_tags["release_date"]
audiofile[preset["originaldate"]] = meta_tags["release_date"]
if meta_tags["genre"]: if meta_tags["genre"]:
audiofile[preset["genre"]] = meta_tags["genre"] audiofile[preset["genre"]] = meta_tags["genre"]
if meta_tags["copyright"]: if meta_tags["copyright"]: