From 001dfb924531a26351103f3c96dc68f486281120 Mon Sep 17 00:00:00 2001 From: bwq Date: Sat, 23 Jun 2012 20:28:04 +0200 Subject: [PATCH] Added data_dir option to use a custom data_dir --- CouchPotato.py | 7 ++++++- couchpotato/runner.py | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CouchPotato.py b/CouchPotato.py index 0099278..1c16275 100755 --- a/CouchPotato.py +++ b/CouchPotato.py @@ -35,7 +35,12 @@ class Loader(object): settings.setFile(self.options.config_file) # Create data dir if needed - self.data_dir = os.path.expanduser(Env.setting('data_dir')) + if self.options.data_dir: + self.data_dir = self.options.data_dir + + else: + self.data_dir = os.path.expanduser(Env.setting('data_dir')) + if self.data_dir == '': self.data_dir = getDataDir() diff --git a/couchpotato/runner.py b/couchpotato/runner.py index 0554180..5f838c7 100644 --- a/couchpotato/runner.py +++ b/couchpotato/runner.py @@ -26,6 +26,8 @@ def getOptions(base_path, args): parser = ArgumentParser(prog = 'CouchPotato.py') parser.add_argument('--config_file', default = os.path.join(data_dir, 'settings.conf'), dest = 'config_file', help = 'Absolute or ~/ path of the settings file (default ./_data/settings.conf)') + parser.add_argument('--data_dir', default = data_dir, + dest = 'data_dir', help = 'Absolute or ~/ path of the data dir') parser.add_argument('--debug', action = 'store_true', dest = 'debug', help = 'Debug mode') parser.add_argument('--console_log', action = 'store_true',