This prevents a zero byte file from being written
This commit is contained in:
parent
e3123872c4
commit
9be5ab13fc
|
@ -369,6 +369,12 @@ class FileSystem(object):
|
||||||
checksum_file
|
checksum_file
|
||||||
))
|
))
|
||||||
|
|
||||||
|
# If source and destination are identical then
|
||||||
|
# we should not write the file. gh-210
|
||||||
|
if(_file == dest_path):
|
||||||
|
print('Final source and destination path should not be identical')
|
||||||
|
return
|
||||||
|
|
||||||
self.create_directory(dest_directory)
|
self.create_directory(dest_directory)
|
||||||
|
|
||||||
if(move is True):
|
if(move is True):
|
||||||
|
|
|
@ -619,6 +619,27 @@ full_path=%year/%month/%day
|
||||||
shutil.rmtree(folder)
|
shutil.rmtree(folder)
|
||||||
shutil.rmtree(os.path.dirname(os.path.dirname(destination)))
|
shutil.rmtree(os.path.dirname(os.path.dirname(destination)))
|
||||||
|
|
||||||
|
def test_process_existing_file_without_changes():
|
||||||
|
# gh-210
|
||||||
|
filesystem = FileSystem()
|
||||||
|
temporary_folder, folder = helper.create_working_folder()
|
||||||
|
|
||||||
|
origin = os.path.join(folder,'plain.jpg')
|
||||||
|
shutil.copyfile(helper.get_file('plain.jpg'), origin)
|
||||||
|
|
||||||
|
media = Photo(origin)
|
||||||
|
destination = filesystem.process_file(origin, temporary_folder, media, allowDuplicate=True)
|
||||||
|
|
||||||
|
assert helper.path_tz_fix(os.path.join('2015-12-Dec', 'Unknown Location', '2015-12-05_00-59-26-plain.jpg')) in destination, destination
|
||||||
|
|
||||||
|
media_second = Photo(destination)
|
||||||
|
destination_second = filesystem.process_file(destination, temporary_folder, media_second, allowDuplicate=True)
|
||||||
|
|
||||||
|
assert destination_second is None, destination_second
|
||||||
|
|
||||||
|
shutil.rmtree(folder)
|
||||||
|
shutil.rmtree(os.path.dirname(os.path.dirname(destination)))
|
||||||
|
|
||||||
def test_set_utime_with_exif_date():
|
def test_set_utime_with_exif_date():
|
||||||
filesystem = FileSystem()
|
filesystem = FileSystem()
|
||||||
temporary_folder, folder = helper.create_working_folder()
|
temporary_folder, folder = helper.create_working_folder()
|
||||||
|
|
Loading…
Reference in New Issue