Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-2659: airtime-import: displaying help text on all exception

Browse source 
- it's displaying help text on all exception and unknown errors
This commit is contained in:
James 2011-09-09 16:12:21 -04:00
parent 8239588a95
commit 5d8f87208b
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
utils/airtime-import/airtime-import.py
View file

@ -84,10 +84,8 @@ def checkOtherOption(args):
def errorIfMultipleOption(args, msg=''):
if(checkOtherOption(args)):
if(msg != ''):
printHelp()
raise OptionValueError(msg)
else:
printHelp()
raise OptionValueError("This option cannot be combined with other options")
def printHelp():
@ -123,7 +121,6 @@ There are two ways to import audio files into Airtime:
def CopyAction(option, opt, value, parser):
errorIfMultipleOption(parser.rargs)
if(len(parser.rargs) == 0 ):
printHelp()
raise OptionValueError("No argument found. This option requires at least one argument.")
stor = helper_get_stor_dir()
if(stor is None):
@ -134,7 +131,6 @@ def CopyAction(option, opt, value, parser):
def MoveAction(option, opt, value, parser):
errorIfMultipleOption(parser.rargs)
if(len(parser.rargs) == 0 ):
printHelp()
raise OptionValueError("No argument found. This option requires at least one argument.")
stor = helper_get_stor_dir()
if(stor is None):
@ -145,10 +141,8 @@ def MoveAction(option, opt, value, parser):
def WatchAddAction(option, opt, value, parser):
errorIfMultipleOption(parser.rargs)
if(len(parser.rargs) > 1):
printHelp()
raise OptionValueError("Too many arguments. This option requires exactly one argument.")
elif(len(parser.rargs) == 0 ):
printHelp()
raise OptionValueError("No argument found. This option requires exactly one argument.")
path = parser.rargs[0]
if (path[0] == "/" or path[0] == "~"):
@ -171,7 +165,6 @@ def WatchAddAction(option, opt, value, parser):
def WatchListAction(option, opt, value, parser):
errorIfMultipleOption(parser.rargs)
if(len(parser.rargs) > 0):
printHelp()
raise OptionValueError("This option doesn't take any arguments.")
res = api_client.list_all_watched_dirs()
if(res is None):
@ -188,10 +181,8 @@ def WatchListAction(option, opt, value, parser):
def WatchRemoveAction(option, opt, value, parser):
errorIfMultipleOption(parser.rargs)
if(len(parser.rargs) > 1):
printHelp()
raise OptionValueError("Too many arguments. This option requires exactly one argument.")
elif(len(parser.rargs) == 0 ):
printHelp()
raise OptionValueError("No argument found. This option requires exactly one argument.")
path = parser.rargs[0]
if (path[0] == "/" or path[0] == "~"):
@ -234,10 +225,8 @@ def StorageSetAction(option, opt, value, parser):
sys.exit(1)
if(len(parser.rargs) > 1):
printHelp()
raise OptionValueError("Too many arguments. This option requires exactly one argument.")
elif(len(parser.rargs) == 0 ):
printHelp()
raise OptionValueError("No argument found. This option requires exactly one argument.")
path = parser.rargs[0]
@ -261,10 +250,13 @@ def StorageSetAction(option, opt, value, parser):
def StorageGetAction(option, opt, value, parser):
errorIfMultipleOption(parser.rargs)
if(len(parser.rargs) > 0):
printHelp()
raise OptionValueError("This option does not take any arguments.")
print helper_get_stor_dir()
class OptionValueError(RuntimeError):
def __init__(self, msg):
self.msg = msg
usage = """[-c|--copy FILE/DIR [FILE/DIR...]] [-m|--move FILE/DIR [FILE/DIR...]]
[--watch-add DIR] [--watch-list] [--watch-remove DIR]
[--storage-dir-set DIR] [--storage-dir-get]"""
@ -294,7 +286,16 @@ if(len(sys.argv) == 1 or '-' not in sys.argv[1]):
printHelp()
sys.exit()
(option, args) = parser.parse_args()
try:
(option, args) = parser.parse_args()
except Exception, e:
printHelp()
print "Error: "+e.msg
sys.exit()
except SystemExit:
printHelp()
sys.exit()
if option.help:
printHelp()
sys.exit()