danolo
/
deemix-py
mirror of https://gitlab.com/RemixDev/deemix-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Escape %folder% and %filename% in execute command' (#70) from kermit/deemix:escape-execute into main 

Reviewed-on: https://codeberg.org/RemixDev/deemix/pulls/70
This commit is contained in:
RemixDev 2020-10-02 18:11:44 +02:00
parent 559d3f0f84 861ac8f347
commit 66be97bec4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deemix/app/downloadjob.py
View File

@ -3,6 +3,7 @@ from eventlet.green.subprocess import call as execute
from os.path import sep as pathSep
from pathlib import Path
from shlex import quote
import re
import errno
@ -158,7 +159,7 @@ class DownloadJob:
f.write(orig.encode('utf-8'))
# Execute command after download
if self.settings['executeCommand'] != "":
execute(self.settings['executeCommand'].replace("%folder%", str(self.extrasPath)).replace("%filename%", result['filename']), shell=True)
execute(self.settings['executeCommand'].replace("%folder%", quote(str(self.extrasPath))).replace("%filename%", quote(result['filename'])), shell=True)
def collectionAfterDownload(self, tracks):
if not self.extrasPath:
@ -213,7 +214,7 @@ class DownloadJob:
f.write((line + "\n").encode('utf-8'))
# Execute command after download
if self.settings['executeCommand'] != "":
execute(self.settings['executeCommand'].replace("%folder%", str(self.extrasPath)), shell=True)
execute(self.settings['executeCommand'].replace("%folder%", quote(str(self.extrasPath))), shell=True)
def download(self, trackAPI_gw, track=None):
result = {}