|
@@ -208,7 +208,7 @@ def buildfolders(artist, album=""):
|
|
|
if len(ALBUM) == 0:
|
|
if len(ALBUM) == 0:
|
|
|
album="UNKNOWN ALBUM"
|
|
album="UNKNOWN ALBUM"
|
|
|
else:
|
|
else:
|
|
|
- album = ALBUM
|
|
|
|
|
|
|
+ album = ALBUM.replace("'","")
|
|
|
# msg("buildfolders local album is set to: " + album, 3)
|
|
# msg("buildfolders local album is set to: " + album, 3)
|
|
|
global DESTFOLDER
|
|
global DESTFOLDER
|
|
|
DESTFOLDER = artist + "/" + album + "/"
|
|
DESTFOLDER = artist + "/" + album + "/"
|
|
@@ -330,7 +330,7 @@ def downloadsong(link, song):
|
|
|
msg("Downloadsong DESTFOLDER: " + DESTFOLDER, 3)
|
|
msg("Downloadsong DESTFOLDER: " + DESTFOLDER, 3)
|
|
|
try:
|
|
try:
|
|
|
if TOR:
|
|
if TOR:
|
|
|
- os.system(".torsocks youtube-dl --extract-audio --audio-format best --audio-quality 0 --output '''" + DESTFOLDER + "%(title)s.%(ext)s' --ignore-errors " + link)
|
|
|
|
|
|
|
+ os.system("torsocks youtube-dl --extract-audio --audio-format best --audio-quality 0 --output ''" + DESTFOLDER + "%(title)s.%(ext)s' --ignore-errors " + link)
|
|
|
else:
|
|
else:
|
|
|
os.system("youtube-dl --extract-audio --audio-format best --audio-quality 0 --output '''" + DESTFOLDER + "%(title)s.%(ext)s' --ignore-errors " + link)
|
|
os.system("youtube-dl --extract-audio --audio-format best --audio-quality 0 --output '''" + DESTFOLDER + "%(title)s.%(ext)s' --ignore-errors " + link)
|
|
|
completed.append(song['songnum'])
|
|
completed.append(song['songnum'])
|