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

CC-2593: airtime-import crash on copy

Browse source 
- the issue was on files with name containing non ascii characters
- fixed
This commit is contained in:
james 2011-07-25 20:58:47 -04:00
parent d94357e5e5
commit c580542727
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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):