aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Garcia <sarbalap+freshmeat@gmail.com>2008-07-22 11:00:38 +0200
committerRicardo Garcia <devnull@localhost>2008-07-22 11:00:38 +0200
commite8e20c76f23e73c8f4f864667b03515ab5d7523f (patch)
tree209d13b9dff4775c268de8d649387bd3de9dcc6e
parentae2e6e461c4df66e85b973e7fb0c3b686581a4c6 (diff)
Fix not taking into account outs.outtmpl
-rwxr-xr-xyoutube-dl3
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube-dl b/youtube-dl
index 7d3758654..814e1b68b 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -519,7 +519,8 @@ if __name__ == '__main__':
'forcetitle': opts.gettitle,
'simulate': (opts.simulate or opts.geturl or opts.gettitle),
'format': opts.format,
- 'outtmpl': ((opts.usetitle and '%(stitle)s-%(id)s.%(ext)s')
+ 'outtmpl': ((opts.outtmpl is not None and opts.outtmpl)
+ or (opts.usetitle and '%(stitle)s-%(id)s.%(ext)s')
or (opts.useliteral and '%(title)s-%(id)s.%(ext)s')
or '%(id)s.%(ext)s'),
})