takino/ordigi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup complex if/else conditions

Browse Source
This commit is contained in:
Fabrice Laporte 2015-12-30 01:32:29 +01:00
parent 8a7725f68e
commit 5452aa9adb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
elodie.py
View File

@ -96,19 +96,18 @@ def _update(params):
if params['--time']: if params['--time']:
time_string = params['--time'] time_string = params['--time']
time_format = '%Y-%m-%d %H:%M:%S' time_format = '%Y-%m-%d %H:%M:%S'
if(re.match('^\d{4}-\d{2}-\d{2}$', time_string)): if re.match('^\d{4}-\d{2}-\d{2}$', time_string):
time_string = '%s 00:00:00' % time_string time_string = '%s 00:00:00' % time_string
if(re.match('^\d{4}-\d{2}-\d{2}$', time_string) is None and re.match('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}\d{2}$', time_string)): elif re.match('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}\d{2}$', time_string):
if(constants.debug == True): if constants.debug:
print 'Invalid time format. Use YYYY-mm-dd hh:ii:ss or YYYY-mm-dd' print 'Invalid time format. Use YYYY-mm-dd hh:ii:ss or YYYY-mm-dd'
print '{"source":"%s", "error_msg":"Invalid time format. Use YYYY-mm-dd hh:ii:ss or YYYY-mm-dd"}' % file_path print '{"source":"%s", "error_msg":"Invalid time format. Use YYYY-mm-dd hh:ii:ss or YYYY-mm-dd"}' % file_path
sys.exit(1) sys.exit(1)
if(time_format is not None): time = datetime.strptime(time_string, time_format)
time = datetime.strptime(time_string, time_format) media.set_date_taken(time)
media.set_date_taken(time) updated = True
updated = True
if params['--album']: if params['--album']:
media.set_album(params['--album']) media.set_album(params['--album'])
@ -146,6 +145,7 @@ def _update(params):
dest_path = filesystem.process_file(file_path, destination, dest_path = filesystem.process_file(file_path, destination,
updated_media, move=True, allowDuplicate=True) updated_media, move=True, allowDuplicate=True)
if constants.debug: if constants.debug:
print u'%s -> %s' % (file_path, dest_path)
print '{"source":"%s", "destination":"%s"}' % (file_path, dest_path) print '{"source":"%s", "destination":"%s"}' % (file_path, dest_path)
# If the folder we moved the file out of or its parent are empty we delete it. # If the folder we moved the file out of or its parent are empty we delete it.
filesystem.delete_directory_if_empty(os.path.dirname(file_path)) filesystem.delete_directory_if_empty(os.path.dirname(file_path))
@ -157,8 +157,8 @@ filesystem = FileSystem()
if __name__ == '__main__': if __name__ == '__main__':
params = docopt(usage()) params = docopt(usage())
if(params['import'] == True): if params['import']:
_import(params) _import(params)
elif(params['update'] == True): elif params['update']:
_update(params) _update(params)
sys.exit(0) sys.exit(0)