Support python2 and python3
This commit is contained in:
parent
3c3e4b0178
commit
1de1510a13
@ -1,6 +1,7 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import sys
|
||||||
|
|
||||||
from .common import PostProcessor
|
from .common import PostProcessor
|
||||||
from ..compat import compat_shlex_quote
|
from ..compat import compat_shlex_quote
|
||||||
@ -17,14 +18,14 @@ class ExecAfterDownloadPP(PostProcessor):
|
|||||||
|
|
||||||
def run(self, information):
|
def run(self, information):
|
||||||
cmd = self.exec_cmd
|
cmd = self.exec_cmd
|
||||||
info = {}
|
|
||||||
|
|
||||||
for key in information:
|
|
||||||
value = information[key]
|
|
||||||
info[key] = compat_shlex_quote(value) if isinstance(value, (str, unicode)) else value
|
|
||||||
|
|
||||||
# expose info to exec argument
|
# expose info to exec argument
|
||||||
# youtube-dl -x -o "%(playlist_index)s - %(title)s.%(ext)s" --exec "id3v2 -T {0[playlist_index]} -t {0[title]} {0[filepath]}" PLAYLIST_ID
|
# youtube-dl -x -o "%(playlist_index)s - %(title)s.%(ext)s" --exec "id3v2 -T {0[playlist_index]} -t {0[title]} {0[filepath]}" PLAYLIST_ID
|
||||||
|
str_types = (str) if sys.version_info.major > 2 else (str, unicode)
|
||||||
|
info = {}
|
||||||
|
for key in information:
|
||||||
|
value = information[key]
|
||||||
|
info[key] = compat_shlex_quote(value) if isinstance(value, str_types) else value
|
||||||
cmd = cmd.format(info)
|
cmd = cmd.format(info)
|
||||||
|
|
||||||
self._downloader.to_screen('[exec] Executing command: %s' % cmd)
|
self._downloader.to_screen('[exec] Executing command: %s' % cmd)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user