flyingrub
/
scdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix windows issues

master
Alexander Molochko 2019-12-07 18:59:31 +03:00
parent 30968bc5a1
commit e9f20970a0
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scdl/scdl.py
View File

@ -74,6 +74,7 @@ from scdl import __version__, CLIENT_ID, ALT_CLIENT_ID
from scdl import client, utils from scdl import client, utils
from datetime import datetime from datetime import datetime
import subprocess
logging.basicConfig(level=logging.INFO, format='%(message)s') logging.basicConfig(level=logging.INFO, format='%(message)s')
logging.getLogger('requests').setLevel(logging.WARNING) logging.getLogger('requests').setLevel(logging.WARNING)
@ -480,7 +481,7 @@ def download_original_file(track, title):
new = shlex.quote(newfilename) new = shlex.quote(newfilename)
old = shlex.quote(filename) old = shlex.quote(filename)
logger.debug("ffmpeg -i {0} {1} -loglevel fatal".format(old, new)) logger.debug("ffmpeg -i {0} {1} -loglevel fatal".format(old, new))
os.system("ffmpeg -i {0} {1} -loglevel fatal".format(old, new)) subprocess.call("ffmpeg -i {0} {1} -loglevel fatal".format(old, new))
os.remove(filename) os.remove(filename)
filename = newfilename filename = newfilename
@ -510,10 +511,10 @@ def download_hls_mp3(track, title):
# Get the requests stream # Get the requests stream
url = get_track_m3u8(track) url = get_track_m3u8(track)
os.system( res = subprocess.call(
"ffmpeg -i {0} -c copy {1} -loglevel fatal".format( "ffmpeg -i {0} -c copy {1} -loglevel fatal".format(
shlex.quote(url), '"' + url + '"',
shlex.quote(filename) '"' + filename + '"'
) )
) )
return filename return filename
@ -554,7 +555,6 @@ def download_track(track, playlist_name=None, playlist_file=None):
if arguments['--remove']: if arguments['--remove']:
fileToKeep.append(filename) fileToKeep.append(filename)
if filename.endswith('.mp3') or filename.endswith('.flac'): if filename.endswith('.mp3') or filename.endswith('.flac'):
try: try:
set_metadata(track, filename, playlist_name) set_metadata(track, filename, playlist_name)
@ -578,6 +578,7 @@ def can_convert(filename):
ext = os.path.splitext(filename)[1] ext = os.path.splitext(filename)[1]
return 'wav' in ext or 'aif' in ext return 'wav' in ext or 'aif' in ext
def already_downloaded(track, title, filename): def already_downloaded(track, title, filename):
""" """
Returns True if the file has already been downloaded Returns True if the file has already been downloaded
@ -720,5 +721,6 @@ def signal_handler(signal, frame):
logger.info('\nGood bye!') logger.info('\nGood bye!')
sys.exit(0) sys.exit(0)
if __name__ == '__main__': if __name__ == '__main__':
main() main()