[Pkg-owncloud-commits] [python-owncloud] 86/96: Right parsing of argument parameters and the cfg

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository python-owncloud.

commit 23862cd5820c6cf1bcac39c42baa39128405b8e4
Author: hefee <hefee at netzguerilla.net>
Date:   Thu Apr 11 21:56:08 2013 +0200

    Right parsing of argument parameters and the cfg
    
    First load defaults, than the cfg and on top the arguments of the cmd line.
    
    Fix #28
---
 csync/csync.py |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/csync/csync.py b/csync/csync.py
index 2ffdf01..2d120fb 100755
--- a/csync/csync.py
+++ b/csync/csync.py
@@ -106,7 +106,7 @@ class ownCloudSync():
 			self.cfg['url'],
 			USERNAME,
 			)
-		if cfg.has_key('dry_run'):
+		if cfg.has_key('dry_run') and cfg['dry_run']:
 			return
 		self.sync()
 
@@ -214,7 +214,8 @@ def getConfigPath():
 		print 'getConfigPath:', cfgPath
 	return cfgPath
 
-def getConfig(args):
+def getConfig(parser):
+	args = vars(parser.parse_args())
 	if DEBUG:
 		print 'From args: '
 		pargs = copy.copy(args)
@@ -259,6 +260,8 @@ def getConfig(args):
 		if DEBUG:
 			print 'password coming from environment'
 	#cmd line arguments win out over config files.
+	parser.set_defaults(**cfg)
+	args = vars(parser.parse_args())
 	cfg.update(args)
 	if DEBUG:
 		print 'Finished config file:'
@@ -268,14 +271,10 @@ def getConfig(args):
 		pprint.pprint(pcfg)
 	return cfg
 
-def startSync(args):
-	if args['debug']:
-		global DEBUG
-		DEBUG = True
-		print 'Turning debug on'
-	cfg = getConfig(args)
+def startSync(parser):
+	cfg = getConfig(parser)
 	try:
-		sync = ownCloudSync(cfg)
+		ownCloudSync(cfg)
 	except KeyError:
 		exc_type, exc_value, exc_tb = sys.exc_info()
 		print 'Sorry this option: %s is required, was not found in cfg file or on cmd line.' % (exc_value)
@@ -343,8 +342,15 @@ Password options:
 	if keyring:
 		parser.add_argument('--use-keyring', action = 'store_true', default = False,
 				help = "use keyring if available to store password safely.")
+
 	args = vars(parser.parse_args())
-	startSync(args)
+	if args['debug']:
+		global DEBUG
+		DEBUG = True
+		print 'Turning debug on'
+	startSync(parser)
 
 if __name__ == '__main__':
 	main()
+
+# vim: noet:ts=4:sw=4:sts=4

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/python-owncloud.git