From c580542727301cb17d8a427e44b903c2645211ff Mon Sep 17 00:00:00 2001 From: james Date: Mon, 25 Jul 2011 20:58:47 -0400 Subject: [PATCH] CC-2593: airtime-import crash on copy - the issue was on files with name containing non ascii characters - fixed --- utils/airtime-import/airtime-import.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/utils/airtime-import/airtime-import.py b/utils/airtime-import/airtime-import.py index 5d00a8f1d..77ea4bb75 100644 --- a/utils/airtime-import/airtime-import.py +++ b/utils/airtime-import/airtime-import.py @@ -37,6 +37,10 @@ def copy_or_move_files_to(paths, dest, flag): path = os.path.realpath(path) else: path = currentDir+path + path = path.decode('utf-8') + path = path.encode('utf-8') + dest = dest.decode('utf-8') + dest = dest.encode('utf-8') if(os.path.exists(path)): if(os.path.isdir(path)): path = format_dir_string(path) @@ -140,6 +144,8 @@ def WatchAddAction(option, opt, value, parser): elif(len(parser.rargs) == 0 ): raise OptionValueError("No argument found. This option requires exactly one argument.") path = parser.rargs[0] + path = path.decode('utf-8') + path = path.encode('utf-8') if(os.path.isdir(path)): res = api_client.add_watched_dir(path) if(res is None): @@ -175,6 +181,8 @@ def WatchRemoveAction(option, opt, value, parser): elif(len(parser.rargs) == 0 ): raise OptionValueError("No argument found. This option requires exactly one argument.") path = parser.rargs[0] + path = path.decode('utf-8') + path = path.encode('utf-8') if(os.path.isdir(path)): res = api_client.remove_watched_dir(path) if(res is None): @@ -215,6 +223,8 @@ def StorageSetAction(option, opt, value, parser): raise OptionValueError("No argument found. This option requires exactly one argument.") path = parser.rargs[0] + path = path.decode('utf-8') + path = path.encode('utf-8') if(os.path.isdir(path)): res = api_client.set_storage_dir(path) if(res is None):