lukas
/
deemix-py
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patched utf8 for python3

This commit is contained in:
RemixDev 2020-05-06 13:07:27 +02:00
parent 7305d5fd64
commit d351343b44
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
deemix/app/downloader.py
View File

@ -575,8 +575,9 @@ def downloadTrackObj(dz, trackAPI, settings, bitrate, queueItem, extraTrack=None
# Save lyrics in lrc file # Save lyrics in lrc file
if settings['syncedLyrics'] and 'sync' in track['lyrics']: if settings['syncedLyrics'] and 'sync' in track['lyrics']:
with open(os.path.join(filepath, filename + '.lrc'), 'w', "utf-8-sig") as f: print(filepath, filename)
f.write(track['lyrics']['sync']) with open(os.path.join(filepath, filename + '.lrc'), 'wb') as f:
f.write(track['lyrics']['sync'].encode('utf-8'))
# Save local album art # Save local album art
if coverPath: if coverPath:
@ -761,15 +762,15 @@ def after_download(tracks, settings, queueItem):
if not extrasPath: if not extrasPath:
extrasPath = settings['downloadLocation'] extrasPath = settings['downloadLocation']
if settings['logErrors'] and errors != "": if settings['logErrors'] and errors != "":
with open(os.path.join(extrasPath, 'errors.txt'), 'w', "utf-8-sig") as f: with open(os.path.join(extrasPath, 'errors.txt'), 'wb') as f:
f.write(errors) f.write(errors.encode('utf-8'))
if settings['logSearched'] and searched != "": if settings['logSearched'] and searched != "":
with open(os.path.join(extrasPath, 'searched.txt'), 'w', "utf-8-sig") as f: with open(os.path.join(extrasPath, 'searched.txt'), 'wb') as f:
f.write(searched) f.write(searched.encode('utf-8'))
if settings['createM3U8File']: if settings['createM3U8File']:
with open(os.path.join(extrasPath, 'playlist.m3u8'), 'w', "utf-8-sig") as f: with open(os.path.join(extrasPath, 'playlist.m3u8'), 'wb') as f:
for line in playlist: for line in playlist:
f.write(line + "\n") f.write((line + "\n").encode('utf-8'))
if settings['executeCommand'] != "": if settings['executeCommand'] != "":
execute(settings['executeCommand'].replace("%folder%", extrasPath)) execute(settings['executeCommand'].replace("%folder%", extrasPath))
return extrasPath return extrasPath
@ -781,13 +782,13 @@ def after_download_single(track, settings, queueItem):
if 'extrasPath' not in track: if 'extrasPath' not in track:
track['extrasPath'] = settings['downloadLocation'] track['extrasPath'] = settings['downloadLocation']
if settings['logSearched'] and 'searched' in track: if settings['logSearched'] and 'searched' in track:
with open(os.path.join(track['extrasPath'], 'searched.txt'), 'w+', "utf-8-sig") as f: with open(os.path.join(track['extrasPath'], 'searched.txt'), 'wb+') as f:
orig = f.read() orig = f.read().decode('utf-8')
if not track['searched'] in orig: if not track['searched'] in orig:
if orig != "": if orig != "":
orig += "\r\n" orig += "\r\n"
orig += track['searched'] + "\r\n" orig += track['searched'] + "\r\n"
f.write(orig) f.write(orig.encode('utf-8'))
if settings['executeCommand'] != "": if settings['executeCommand'] != "":
execute(settings['executeCommand'].replace("%folder%", track['extrasPath'])) execute(settings['executeCommand'].replace("%folder%", track['extrasPath']))
return track['extrasPath'] return track['extrasPath']