mirrors/streamrip
1
0
Fork 0
mirror of https://github.com/nathom/streamrip.git synced 2025-05-24 20:14:42 -04:00
Code Issues Projects Releases Packages Wiki Activity

Soundcloud searches for last.fm working

Browse source
This commit is contained in:
nathom 2021-05-12 15:37:30 -07:00
parent f19bb2d06f
commit 3414fa21a9
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
streamrip/core.py
View file

@ -386,7 +386,8 @@ class MusicDL(list):
playlist.append(track) playlist.append(track)
return True return True
except NoResultsFound: except (NoResultsFound, StopIteration) as err:
logger.debug("No results found for query=%s. Exception: %s", query, err)
return False return False
for purl in lastfm_urls: for purl in lastfm_urls:
@ -469,9 +470,11 @@ class MusicDL(list):
if i > limit: if i > limit:
return return
else: else:
logger.debug("Not generator")
items = ( items = (
results.get("data") or results.get("items") or results.get("collection") results.get("data") or results.get("items") or results.get("collection")
) )
logger.debug("Number of results: %d", len(items))
if items is None: if items is None:
raise NoResultsFound(query) raise NoResultsFound(query)
@ -637,7 +640,7 @@ class MusicDL(list):
if remaining_tracks_match is not None: if remaining_tracks_match is not None:
remaining_tracks = int(remaining_tracks_match.group(1)) - 50 remaining_tracks = int(remaining_tracks_match.group(1)) - 50
else: else:
raise ParsingError("Error parsing lastfm page") raise ParsingError("Error parsing lastfm page: %s", r.text)
playlist_title_match = re.search( playlist_title_match = re.search(
r'<h1 class="playlisting-playlist-header-title">([^<]+)</h1>', r.text r'<h1 class="playlisting-playlist-header-title">([^<]+)</h1>', r.text

4
streamrip/metadata.py
View file

@ -235,7 +235,7 @@ class TrackMetadata:
self.tracknumber = track.get("track_number", 1) self.tracknumber = track.get("track_number", 1)
self.discnumber = track.get("media_number", 1) self.discnumber = track.get("media_number", 1)
self.artist = safe_get(track, "performer", "name") self.artist = safe_get(track, "artist", "name")
elif self.__source == "tidal": elif self.__source == "tidal":
self.title = track["title"].strip() self.title = track["title"].strip()
@ -249,7 +249,7 @@ class TrackMetadata:
self._mod_title(track.get("version"), None) self._mod_title(track.get("version"), None)
self.tracknumber = track.get("track_position", 1) self.tracknumber = track.get("track_position", 1)
self.discnumber = track.get("disk_number", 1) self.discnumber = track.get("disk_number", 1)
self.artist = track.get("artist", {}).get("name") self.artist = safe_get(track, "artist", "name")
elif self.__source == "soundcloud": elif self.__source == "soundcloud":
self.title = track["title"].strip() self.title = track["title"].strip()