From 522ce0b7fbee68ff0b7e9c600914429b12851b0a Mon Sep 17 00:00:00 2001 From: James Date: Fri, 9 Sep 2011 11:04:14 -0400 Subject: [PATCH 1/2] CC-2659: print help on more cases - done --- utils/airtime-import/airtime-import.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/utils/airtime-import/airtime-import.py b/utils/airtime-import/airtime-import.py index c309be720..014428702 100644 --- a/utils/airtime-import/airtime-import.py +++ b/utils/airtime-import/airtime-import.py @@ -84,8 +84,10 @@ 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(): @@ -121,6 +123,7 @@ 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): @@ -131,6 +134,7 @@ 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): @@ -141,8 +145,10 @@ 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] == "~"): @@ -165,6 +171,7 @@ 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): @@ -181,8 +188,10 @@ 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] == "~"): @@ -225,8 +234,10 @@ 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] @@ -250,6 +261,7 @@ 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() From 8239588a9587157c92e38e46985d7223c14db525 Mon Sep 17 00:00:00 2001 From: James Date: Fri, 9 Sep 2011 11:35:30 -0400 Subject: [PATCH 2/2] CC-2798: Delete a song from the playlist builder doesn't refesh the list - fixed --- airtime_mvc/public/js/airtime/library/library.js | 1 + 1 file changed, 1 insertion(+) diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 971bad119..f6b2d194c 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -31,6 +31,7 @@ function deleteAudioClip(json) { } deleteItem("au", json.id); + location.reload(true); } //callbacks called by jjmenu