Fix unicode decoding bug in compatability.py and add_original_name.py (#194)

elodie/compatability.py

@@ -1,10 +1,11 @@
 import os
 import shutil
+import sys
 
 from elodie import constants
 
 
-def _decode(string, encoding='utf8'):
+def _decode(string, encoding=sys.getfilesystemencoding()):
     """Return a utf8 encoded unicode string.
 
     Python2 and Python3 differ in how they handle strings.

elodie/tools/add_original_name.py

@@ -30,11 +30,10 @@ def main(argv):
         if os.path.isdir(path):
             for source in filesystem.get_all_files(path, None):
                 status = add_original_name(source, subclasses)
-                result.append((source, status))
-                
+                result.append((_decode(source), status))
         else:
             status = add_original_name(path, subclasses)
-            result.append((path, status))
+            result.append((_decode(path), status))
 
     result.write()
 
@@ -48,11 +47,10 @@ def add_original_name(source, subclasses):
     if metadata['original_name'] is not None:
         print('{} already has OriginalFileName...Skipping'.format(source))
         return
-    
+
     original_name = parse_original_name_from_media(metadata)
     return media.set_original_name(original_name)
-    
-    
+
 def parse_original_name_from_media(metadata):
     # 2015-07-23_04-31-12-img_9414-test3.jpg
     base_name = metadata['base_name']