Allow overriding any option from env

- Allow any configuration option to be overriden via the environment
- Merge env in a single place at config.py instead of multiple places in multiple files

Author: mvnural

ydl_server/config.py

@@ -16,3 +16,7 @@
         'ignoreerrors': True
         },
 }
+
+import os
+from collections import ChainMap
+app_config = ChainMap(os.environ, app_defaults)

ydl_server/logdb.py

@@ -1,9 +1,8 @@
-import os
 import sqlite3
 import re
 from queue import Queue
 from threading import Thread
-from ydl_server.config import app_defaults
+from ydl_server.config import app_config
 
 STATUS_NAME =["Running",
         "Completed",
@@ -55,7 +54,7 @@ class JobsDB:
 
     @staticmethod
     def check_db_latest():
-        conn = sqlite3.connect("file://%s" % app_defaults['YDL_DB_PATH'], uri=True)
+        conn = sqlite3.connect("file://%s" % app_config['YDL_DB_PATH'], uri=True)
         cursor = conn.cursor()
         cursor.execute("PRAGMA table_info('jobs')")
         columns = [row[1] for row in cursor.fetchall()]
@@ -67,7 +66,7 @@ def check_db_latest():
 
     @staticmethod
     def init_db():
-        conn = sqlite3.connect("file://%s" % app_defaults['YDL_DB_PATH'], uri=True)
+        conn = sqlite3.connect("file://%s" % app_config['YDL_DB_PATH'], uri=True)
         cursor = conn.cursor()
         cursor.execute("CREATE TABLE if not exists jobs \
                 (id INTEGER PRIMARY KEY AUTOINCREMENT, \
@@ -82,7 +81,7 @@ def init_db():
         conn.close()
 
     def __init__(self, readonly=True):
-        self.conn = sqlite3.connect("file://%s%s" % (app_defaults['YDL_DB_PATH'],
+        self.conn = sqlite3.connect("file://%s%s" % (app_config['YDL_DB_PATH'],
                                             "?mode=ro" if readonly else ""),
                                     uri=True)
 

ydl_server/ydlhandler.py

@@ -1,4 +1,3 @@
-import os
 from queue import Queue
 from threading import Thread
 import subprocess
@@ -12,7 +11,7 @@
 
 from ydl_server.logdb import JobsDB, Job, Actions, JobType
 from ydl_server import jobshandler
-from ydl_server.config import app_defaults
+from ydl_server.config import app_config
 
 queue = Queue()
 thread = None
@@ -59,8 +58,8 @@ def reload_youtube_dl():
             importlib.reload(sys.modules[module])
 
 def update():
-    if os.environ.get('YDL_PYTHONPATH'):
-        command = ["pip", "install", "--no-cache-dir", "-t", os.environ.get('YDL_PYTHONPATH'), "--upgrade", "youtube-dlc"]
+    if app_config['YDL_PYTHONPATH']:
+        command = ["pip", "install", "--no-cache-dir", "-t", app_config['YDL_PYTHONPATH'], "--upgrade", "youtube-dlc"]
     else:
         command = ["pip", "install", "--no-cache-dir", "--upgrade", "youtube-dlc"]
     proc = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
@@ -84,7 +83,7 @@ def get_ydl_options(request_options):
     elif requested_format in ['mp4', 'flv', 'webm', 'ogg', 'mkv', 'avi']:
         request_vars['YDL_RECODE_VIDEO_FORMAT'] = requested_format
 
-    ydl_vars = ChainMap(request_vars, os.environ, app_defaults)
+    ydl_vars = ChainMap(request_vars, app_config)
 
     postprocessors = []
 
@@ -138,7 +137,7 @@ def fetch_metadata(url):
 def download(url, request_options, output, job_id):
     with youtube_dlc.YoutubeDL(get_ydl_options(request_options)) as ydl:
         ydl.params['extract_flat'] = 'in_playlist'
-        ydl_opts = ChainMap(os.environ, app_defaults)
+        ydl_opts = app_config
         info = ydl.extract_info(url, download=False)
         if 'title' in info and info['title']:
             jobshandler.put((Actions.SET_NAME, (job_id, info['title'])))

youtube-dl-server.py

@@ -1,7 +1,5 @@
 from __future__ import unicode_literals
 import json
-import os
-from collections import ChainMap
 from itertools import chain
 from operator import itemgetter
 from queue import Queue
@@ -10,7 +8,7 @@
 from pathlib import Path
 from ydl_server.logdb import JobsDB, Job, Actions, JobType
 from ydl_server import jobshandler, ydlhandler
-from ydl_server.config import app_defaults
+from ydl_server.config import app_config
 
 app = Bottle()
 
@@ -125,11 +123,10 @@ def ydl_update():
 
 ydlhandler.resume_pending()
 
-app_vars = ChainMap(os.environ, app_defaults)
 
-app.run(host=app_vars['YDL_SERVER_HOST'],
-        port=app_vars['YDL_SERVER_PORT'],
-        debug=app_vars['YDL_DEBUG'])
+app.run(host=app_config['YDL_SERVER_HOST'],
+        port=app_config['YDL_SERVER_PORT'],
+        debug=app_config['YDL_DEBUG'])
 ydlhandler.finish()
 jobshandler.finish()
 ydlhandler.join()