dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use settings datadir again. fix #518

Browse Source
This commit is contained in:
Ruud
2012-07-01 00:43:34 +02:00
parent 6c8b6a749f
commit c274867571
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CouchPotato.py
-1
View File
@@ -37,7 +37,6 @@ class Loader(object):
# Create data dir if needed # Create data dir if needed
if self.options.data_dir: if self.options.data_dir:
self.data_dir = self.options.data_dir self.data_dir = self.options.data_dir
else: else:
self.data_dir = os.path.expanduser(Env.setting('data_dir')) self.data_dir = os.path.expanduser(Env.setting('data_dir'))
couchpotato/runner.py
+13 -6
View File
@@ -20,14 +20,12 @@ import warnings
def getOptions(base_path, args): def getOptions(base_path, args):
data_dir = getDataDir()
# Options # Options
parser = ArgumentParser(prog = 'CouchPotato.py') parser = ArgumentParser(prog = 'CouchPotato.py')
parser.add_argument('--config_file', default = os.path.join(data_dir, 'settings.conf'), parser.add_argument('--data_dir',
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') dest = 'data_dir', help = 'Absolute or ~/ path of the data dir')
parser.add_argument('--config_file',
dest = 'config_file', help = 'Absolute or ~/ path of the settings file (default DATA_DIR/settings.conf)')
parser.add_argument('--debug', action = 'store_true', parser.add_argument('--debug', action = 'store_true',
dest = 'debug', help = 'Debug mode') dest = 'debug', help = 'Debug mode')
parser.add_argument('--console_log', action = 'store_true', parser.add_argument('--console_log', action = 'store_true',
@@ -36,12 +34,21 @@ def getOptions(base_path, args):
dest = 'quiet', help = 'No console logging') dest = 'quiet', help = 'No console logging')
parser.add_argument('--daemon', action = 'store_true', parser.add_argument('--daemon', action = 'store_true',
dest = 'daemon', help = 'Daemonize the app') dest = 'daemon', help = 'Daemonize the app')
parser.add_argument('--pid_file', default = os.path.join(data_dir, 'couchpotato.pid'), parser.add_argument('--pid_file',
dest = 'pid_file', help = 'Path to pidfile needed for daemon') dest = 'pid_file', help = 'Path to pidfile needed for daemon')
options = parser.parse_args(args) options = parser.parse_args(args)
data_dir = os.path.expanduser(options.data_dir if options.data_dir else getDataDir())
if not options.config_file:
options.config_file = os.path.join(data_dir, 'settings.conf')
if not options.pid_file:
options.pid_file = os.path.join(data_dir, 'couchpotato.pid')
options.config_file = os.path.expanduser(options.config_file) options.config_file = os.path.expanduser(options.config_file)
options.pid_file = os.path.expanduser(options.pid_file)
return options return options