Merge pull request #675 from ritiek/release-v1.2.6

Release changes for v1.2.6

CHANGES.md

@@ -6,6 +6,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.2.6] (Hotfix Release) - 2020-03-02
+### Fixed
+Embed release date metadata only when available (follow up of #672) ([@ritiek](https://github.com/ritiek)) (#674)
+
+## [1.2.5] - 2020-03-02
+### Fixed
+- Skip crash when accessing YouTube-API-only fields in scrape mode ([@ritiek](https://github.com/ritiek)) (#672)
+
+### Changed
+- Changed FFMPEG args to convert to 48k quality audio instead of the current 44k audio. ([@AvinashReddy3108](https://github.com/AvinashReddy3108)) (#667)
+
+## [1.2.4] - 2020-01-10
+### Fixed
+- Fixed a crash occuring when lyrics for a track are not yet released
+  on Genius ([@ritiek](https://github.com/ritiek)) (#654)
+- Fixed a regression where a track would fail to download if it isn't
+  found on Spotify ([@ritiek](https://github.com/ritiek)) (#653)
+
 ## [1.2.3] - 2019-12-20
 ### Added
 - Added `--no-remove-original-file` ([@NightMachinary](https://github.com/NightMachinary)) (#580)

spotdl/__init__.py

@@ -1 +1 @@
-__version__ = "1.2.3"
+__version__ = "1.2.6"

spotdl/convert.py

@@ -117,7 +117,7 @@ class Converter:
 
         if self.input_ext == ".m4a":
             if self.output_ext == ".mp3":
-                ffmpeg_params = "-codec:v copy -codec:a libmp3lame -ar 44100 "
+                ffmpeg_params = "-codec:v copy -codec:a libmp3lame -ar 48000 "
             elif self.output_ext == ".webm":
                 ffmpeg_params = "-codec:a libopus -vbr on "
             elif self.output_ext == ".m4a":
@@ -125,12 +125,12 @@ class Converter:
 
         elif self.input_ext == ".webm":
             if self.output_ext == ".mp3":
-                ffmpeg_params = "-codec:a libmp3lame -ar 44100 "
+                ffmpeg_params = "-codec:a libmp3lame -ar 48000 "
             elif self.output_ext == ".m4a":
-                ffmpeg_params = "-cutoff 20000 -codec:a aac -ar 44100 "
+                ffmpeg_params = "-cutoff 20000 -codec:a aac -ar 48000 "
 
         if self.output_ext == ".flac":
-            ffmpeg_params = "-codec:a flac -ar 44100 "
+            ffmpeg_params = "-codec:a flac -ar 48000 "
 
         # add common params for any of the above combination
         ffmpeg_params += "-b:a 192k -vn "

spotdl/internals.py

@@ -93,7 +93,10 @@ def format_string(
     format_tags[9] = tags["track_number"]
     format_tags[10] = tags["total_tracks"]
     format_tags[11] = tags["external_ids"]["isrc"]
+    try:
         format_tags[12] = tags["id"]
+    except KeyError:
+        pass
 
     format_tags_sanitized = {
         k: sanitize_title(str(v), ok="'-_()[]{}") if slugification else str(v)

spotdl/lyrics/providers/genius.py

@@ -37,8 +37,10 @@ class Genius(LyricBase):
     def _get_lyrics_text(self, html):
         soup = BeautifulSoup(html, "html.parser")
         lyrics_paragraph = soup.find("p")
-        lyrics = lyrics_paragraph.get_text()
-        return lyrics
+        if lyrics_paragraph:
+            return lyrics_paragraph.get_text()
+        else:
+            raise LyricsNotFound("The lyrics for this track are yet to be released.")
 
     def get_lyrics(self, linesep="\n", timeout=None):
         url = self._guess_lyric_url()

spotdl/metadata.py

@@ -76,6 +76,7 @@ class EmbedMetadata:
         # https://github.com/quodlibet/mutagen/blob/master/mutagen/id3/_frames.py
         # Each class represents an id3 tag
         audiofile = ID3(music_file)
+        if 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"]:
@@ -109,6 +110,7 @@ class EmbedMetadata:
         meta_tags = self.meta_tags
         audiofile = MP4(music_file)
         self._embed_basic_metadata(audiofile, preset=M4A_TAG_PRESET)
+        if meta_tags["year"]:
             audiofile[M4A_TAG_PRESET["year"]] = meta_tags["year"]
         audiofile[M4A_TAG_PRESET["comment"]] = meta_tags["external_urls"][self.provider]
         if meta_tags["lyrics"]:
@@ -130,6 +132,7 @@ class EmbedMetadata:
         meta_tags = self.meta_tags
         audiofile = FLAC(music_file)
         self._embed_basic_metadata(audiofile)
+        if meta_tags["year"]:
             audiofile["year"] = meta_tags["year"]
         audiofile["comment"] = meta_tags["external_urls"][self.provider]
         if meta_tags["lyrics"]:
@@ -155,6 +158,7 @@ class EmbedMetadata:
         if meta_tags["album"]["name"]:
             audiofile[preset["album"]] = meta_tags["album"]["name"]
         audiofile[preset["title"]] = meta_tags["name"]
+        if meta_tags["release_date"]:
             audiofile[preset["date"]] = meta_tags["release_date"]
             audiofile[preset["originaldate"]] = meta_tags["release_date"]
         if meta_tags["genre"]:

spotdl/youtube_tools.py

@@ -109,8 +109,8 @@ def generate_metadata(content):
             "artists": [{"name": None}],
             "name": None,
         },
-        "year": content.published.split("-")[0],
-        "release_date": content.published.split(" ")[0],
+        "year": None,
+        "release_date": None,
         "type": "track",
         "disc_number": 1,
         "track_number": 1,
@@ -122,6 +122,14 @@ def generate_metadata(content):
         "genre": None,
     }
 
+    # Workaround for
+    # https://github.com/ritiek/spotify-downloader/issues/671
+    try:
+        meta_tags["year"] = content.published.split("-")[0]
+        meta_tags["release_date"] = content.published.split(" ")[0]
+    except pafy.util.GdataError:
+        pass
+
     return meta_tags