Skip to content

Fix issue #486: enabling conversion when download_command is set #1032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mateuszr wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix issue #486: enabling conversion when download_command is set #1032

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e73c317
Fix issue #486: enabling conversion when download_command is set
Nov 4, 2019
4a3fc9e
removing unnecessary option
Feb 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions mps_youtube/commands/download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,21 @@ def list_string_sub(orig, repl, lst):
util.dbg("Downloading using: %s", " ".join(cmd_list))
subprocess.call(cmd_list)

def _transcode(song, filename, audio=False):
""" Transcode filename

Return new filename (transcoded file)
"""
active_encoder = g.encoders[config.ENCODER.get]
ext = filename.split(".")[-1]
valid_ext = ext in active_encoder['valid'].split(",")

if audio and g.muxapp:
remux_audio(filename, song.title)

if config.ENCODER.get != 0 and valid_ext:
filename = transcode(filename, active_encoder)
return filename

def _download(song, filename, url=None, audio=False, allow_transcode=True):
""" Download file, show status.
Expand All @@ -352,6 +367,10 @@ def _download(song, filename, url=None, audio=False, allow_transcode=True):
title = c.y + os.path.splitext(os.path.basename(filename))[0] + c.w
util.xprint("Downloading %s using custom command" % title)
external_download(song, filename, url)

if allow_transcode:
_transcode(song, filename, audio)

return None

if not config.OVERWRITE.get:
Expand Down Expand Up @@ -392,15 +411,8 @@ def _download(song, filename, url=None, audio=False, allow_transcode=True):
sys.stdout.write("\r" + status + ' ' * 4 + "\r")
sys.stdout.flush()

active_encoder = g.encoders[config.ENCODER.get]
ext = filename.split(".")[-1]
valid_ext = ext in active_encoder['valid'].split(",")

if audio and g.muxapp:
remux_audio(filename, song.title)

if config.ENCODER.get != 0 and valid_ext and allow_transcode:
filename = transcode(filename, active_encoder)
if allow_transcode:
filename = _transcode(song, filename, audio)

return filename

Expand Down