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

Fix encoding issue with unicode characters in file and path #162 

fix issue encountered when importing from a UTF-8 encoded filesystem with non-breaking spaces.
* skip test because failure case cannot be established
This commit is contained in:
misterpipine 2016-12-22 10:53:08 +01:00 committed by Jaisen Mathai
parent 5b4c74280a
commit 5dc31cf46f
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elodie.py Executable file → Normal file
View File

@ -83,11 +83,13 @@ def _import(destination, source, file, album_from_folder, trash, paths, allow_du
"""Import files or directories by reading their EXIF and organizing them accordingly. """Import files or directories by reading their EXIF and organizing them accordingly.
""" """
result = Result() result = Result()
destination = destination.decode(sys.getfilesystemencoding())
destination = os.path.abspath(os.path.expanduser(destination)) destination = os.path.abspath(os.path.expanduser(destination))
files = set() files = set()
paths = set(paths) paths = set(paths)
if source: if source:
source = source.decode(sys.getfilesystemencoding())
paths.add(source) paths.add(source)
if file: if file:
paths.add(file) paths.add(file)

18
elodie/tests/elodie_test.py
View File

@ -23,7 +23,6 @@ from elodie.media.video import Video
os.environ['TZ'] = 'GMT' os.environ['TZ'] = 'GMT'
def test_import_file_text(): def test_import_file_text():
temporary_folder, folder = helper.create_working_folder() temporary_folder, folder = helper.create_working_folder()
temporary_folder_destination, folder_destination = helper.create_working_folder() temporary_folder_destination, folder_destination = helper.create_working_folder()
@ -88,6 +87,23 @@ def test_import_file_video():
assert helper.path_tz_fix(os.path.join('2015-01-Jan','California','2015-01-19_12-45-11-video.mov')) in dest_path, dest_path assert helper.path_tz_fix(os.path.join('2015-01-Jan','California','2015-01-19_12-45-11-video.mov')) in dest_path, dest_path
def test_import_file_path_unicode():
raise SkipTest("Skipping test because failure case not established. gh-162")
temporary_folder, folder = helper.create_working_folder()
temporary_folder_destination, folder_destination = helper.create_working_folder()
origin = u'%s/unicode\xa0filename.txt' % folder
shutil.copyfile(helper.get_file('valid.txt'), origin)
reset_hash_db()
dest_path = elodie.import_file(origin, folder_destination, False, False, False)
restore_hash_db()
shutil.rmtree(folder)
shutil.rmtree(folder_destination)
assert helper.path_tz_fix(os.path.join('2016-04-Apr','Unknown Location',u'2016-04-07_11-15-26-unicode\xa0filename-sample-title.txt')) in dest_path, dest_path
def test_import_file_allow_duplicate_false(): def test_import_file_allow_duplicate_false():
temporary_folder, folder = helper.create_working_folder() temporary_folder, folder = helper.create_working_folder()
temporary_folder_destination, folder_destination = helper.create_working_folder() temporary_folder_destination, folder_destination = helper.create_working_folder()