Merge pull request #31 from xiongzi/master

environment variable to customize output file names

README.md

@@ -35,6 +35,7 @@ Certain values can be set via environment variables, using the `-e` parameter on
 
 * __DOWNLOAD_DIR__: path to where the downloads will be saved. Defaults to `/downloads` in the docker image, and `.` otherwise.
 * __URL_PREFIX__: base path for the web server (for use when hosting behind a reverse proxy). Defaults to `/`.
+* __OUTPUT_TEMPLATE__: the template for the filenames of the downloaded videos, formatted according to [this spec](https://github.com/ytdl-org/youtube-dl/blob/master/README.md#output-template). Defaults to `%(title)s.%(ext)s`.
 
 ## Bookmarklet
 

app/main.py

@@ -17,6 +17,7 @@ class Config:
     _DEFAULTS = {
         'DOWNLOAD_DIR': '.',
         'URL_PREFIX': '',
+        'OUTPUT_TEMPLATE': '%(title)s.%(ext)s',
     }
 
     def __init__(self):

app/ytdl.py

@@ -32,8 +32,9 @@ class DownloadInfo:
 class Download:
     manager = None
 
-    def __init__(self, download_dir, quality, info):
+    def __init__(self, download_dir, output_template, quality, info):
         self.download_dir = download_dir
+        self.output_template = output_template
         if quality == 'best':
             self.format = None
         elif quality in ('1440p', '1080p', '720p', '480p'):
@@ -59,7 +60,7 @@ class Download:
                 'quiet': True,
                 'no_color': True,
                 #'skip_download': True,
-                'outtmpl': os.path.join(self.download_dir, '%(title)s.%(ext)s'),
+                'outtmpl': os.path.join(self.download_dir, self.output_template),
                 'format': self.format,
                 'cachedir': False,
                 'socket_timeout': 30,
@@ -147,7 +148,7 @@ class DownloadQueue:
         elif etype == 'video' or etype.startswith('url') and 'id' in entry:
             if entry['id'] not in self.queue:
                 dl = DownloadInfo(entry['id'], entry['title'], entry.get('webpage_url') or entry['url'])
-                self.queue[entry['id']] = Download(self.config.DOWNLOAD_DIR, quality, dl)
+                self.queue[entry['id']] = Download(self.config.DOWNLOAD_DIR, self.config.OUTPUT_TEMPLATE, quality, dl)
                 self.event.set()
                 await self.notifier.added(dl)
             return {'status': 'ok'}