Merge 02468c2 into ffb26fb

jmathai · Dec 2, 2018 · 899f4e6 · 899f4e6
2 parents ffb26fb + 02468c2
commit 899f4e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/elodie.py b/elodie.py
@@ -46,7 +46,7 @@ def import_file(_file, destination, album_from_folder, trash, allow_duplicates):
             (_file, _file))
         return
     # Check if the source, _file, is a child folder within destination
-    elif destination.startswith(os.path.dirname(_file)):
+    elif destination.startswith(os.path.abspath(os.path.dirname(_file))+os.sep):
         print('{"source": "%s", "destination": "%s", "error_msg": "Source cannot be in destination"}' % (_file, destination))
         return
 

diff --git a/elodie/tests/elodie_test.py b/elodie/tests/elodie_test.py
@@ -240,8 +240,8 @@ def test_import_destination_in_source():
     folder_destination = '{}/destination'.format(folder)
     os.mkdir(folder_destination)
 
-    origin = '%s/video.mov' % folder
-    shutil.copyfile(helper.get_file('video.mov'), origin)
+    origin = '%s/plain.jpg' % folder
+    shutil.copyfile(helper.get_file('plain.jpg'), origin)
 
     helper.reset_dbs()
     dest_path = elodie.import_file(origin, folder_destination, False, False, False)