Merge pull request #655 from ritiek/release-v1.2.4

Bump to v1.2.4

CHANGES.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [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.4"

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"]
-    format_tags[12] = tags["id"]
+    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()