Implemented save sync lyrics
This commit is contained in:
parent
c92a612c75
commit
7f1a34f859
|
@ -191,21 +191,7 @@ class Deezer:
|
||||||
|
|
||||||
def get_lyrics_gw(self, sng_id):
|
def get_lyrics_gw(self, sng_id):
|
||||||
body = self.gw_api_call('song.getLyrics', {'sng_id': sng_id})
|
body = self.gw_api_call('song.getLyrics', {'sng_id': sng_id})
|
||||||
lyr = {
|
return body["results"]
|
||||||
'unsyncLyrics': {
|
|
||||||
'description': "",
|
|
||||||
'lyrics': body["results"]["LYRICS_TEXT"]
|
|
||||||
},
|
|
||||||
'syncLyrics': "",
|
|
||||||
}
|
|
||||||
for i in range(len(body["results"]["LYRICS_SYNC_JSON"])):
|
|
||||||
if "lrc_timestamp" in body["results"]["LYRICS_SYNC_JSON"][i]:
|
|
||||||
lyr['syncLyrics'] += body["results"]["LYRICS_SYNC_JSON"][i]["lrc_timestamp"] + \
|
|
||||||
body["results"]["LYRICS_SYNC_JSON"][i]["line"] + "\r\n"
|
|
||||||
elif i + 1 < len(body["results"]["LYRICS_SYNC_JSON"]):
|
|
||||||
lyr['syncLyrics'] += body["results"]["LYRICS_SYNC_JSON"][i + 1]["lrc_timestamp"] + \
|
|
||||||
body["results"]["LYRICS_SYNC_JSON"][i]["line"] + "\r\n"
|
|
||||||
return lyr
|
|
||||||
|
|
||||||
def get_user_playlist(self, user_id):
|
def get_user_playlist(self, user_id):
|
||||||
body = self.api_call('user/' + str(user_id) + '/playlists', {'limit': -1})
|
body = self.api_call('user/' + str(user_id) + '/playlists', {'limit': -1})
|
||||||
|
|
|
@ -124,7 +124,9 @@ def getTrackData(trackAPI_gw, trackAPI = None, albumAPI_gw = None, albumAPI = No
|
||||||
track['lyrics'] = {}
|
track['lyrics'] = {}
|
||||||
if 'LYRICS_ID' in trackAPI_gw:
|
if 'LYRICS_ID' in trackAPI_gw:
|
||||||
track['lyrics']['id'] = trackAPI_gw['LYRICS_ID']
|
track['lyrics']['id'] = trackAPI_gw['LYRICS_ID']
|
||||||
if "LYRICS" in trackAPI_gw:
|
if not "LYRICS" in trackAPI_gw and int(track['lyrics']['id']) != 0:
|
||||||
|
trackAPI_gw["LYRICS"] = dz.get_lyrics_gw(track['id'])
|
||||||
|
if int(track['lyrics']['id']) != 0:
|
||||||
if "LYRICS_TEXT" in trackAPI_gw["LYRICS"]:
|
if "LYRICS_TEXT" in trackAPI_gw["LYRICS"]:
|
||||||
track['lyrics']['unsync'] = trackAPI_gw["LYRICS"]["LYRICS_TEXT"]
|
track['lyrics']['unsync'] = trackAPI_gw["LYRICS"]["LYRICS_TEXT"]
|
||||||
if "LYRICS_SYNC_JSON" in trackAPI_gw["LYRICS"]:
|
if "LYRICS_SYNC_JSON" in trackAPI_gw["LYRICS"]:
|
||||||
|
@ -256,7 +258,7 @@ def downloadTrackObj(trackAPI, settings, overwriteBitrate=False, extraTrack=None
|
||||||
track['album']['picUrl'] = "http://e-cdn-images.deezer.com/images/cover/{}/{}x{}-000000-80-0-0.{}".format(track['album']['pic'], settings['embeddedArtworkSize'], settings['embeddedArtworkSize'], 'png' if settings['PNGcovers'] else 'jpg')
|
track['album']['picUrl'] = "http://e-cdn-images.deezer.com/images/cover/{}/{}x{}-000000-80-0-0.{}".format(track['album']['pic'], settings['embeddedArtworkSize'], settings['embeddedArtworkSize'], 'png' if settings['PNGcovers'] else 'jpg')
|
||||||
|
|
||||||
# Generate filename and filepath from metadata
|
# Generate filename and filepath from metadata
|
||||||
filename = generateFilename(track, trackAPI, settings) + extensions[track['selectedFormat']]
|
filename = generateFilename(track, trackAPI, settings)
|
||||||
(filepath, artistPath, coverPath, extrasPath) = generateFilepath(track, trackAPI, settings)
|
(filepath, artistPath, coverPath, extrasPath) = generateFilepath(track, trackAPI, settings)
|
||||||
|
|
||||||
# Download and cache coverart
|
# Download and cache coverart
|
||||||
|
@ -269,7 +271,12 @@ def downloadTrackObj(trackAPI, settings, overwriteBitrate=False, extraTrack=None
|
||||||
track['album']['picPath'] = None
|
track['album']['picPath'] = None
|
||||||
|
|
||||||
makedirs(filepath, exist_ok=True)
|
makedirs(filepath, exist_ok=True)
|
||||||
writepath = os.path.join(filepath, filename)
|
writepath = os.path.join(filepath, filename + extensions[track['selectedFormat']])
|
||||||
|
|
||||||
|
# Save lyrics in lrc file
|
||||||
|
if settings['syncedLyrics'] and 'sync' in track['lyrics']:
|
||||||
|
with open(os.path.join(filepath, filename + '.lrc'), 'w') as f:
|
||||||
|
f.write(track['lyrics']['sync'])
|
||||||
|
|
||||||
track['downloadUrl'] = dz.get_track_stream_url(track['id'], track['MD5'], track['mediaVersion'], track['selectedFormat'])
|
track['downloadUrl'] = dz.get_track_stream_url(track['id'], track['MD5'], track['mediaVersion'], track['selectedFormat'])
|
||||||
with open(writepath, 'wb') as stream:
|
with open(writepath, 'wb') as stream:
|
||||||
|
|
Loading…
Reference in New Issue