Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue where photos without EXIF were not using the correct date for folder or file names #330 #331

Merged
merged 2 commits into from
Jul 30, 2019
Merged

Fix issue where photos without EXIF were not using the correct date for folder or file names #330 #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5f67fb
Fix issue where photos without EXIF were using wrong date
jmathai Jul 27, 2019
2332915
Refactor filesystem.get_file_name() to take metadata instead of media
jmathai Jul 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions elodie/filesystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def get_current_directory(self):
"""
return os.getcwd()

def get_file_name(self, media):
def get_file_name(self, metadata):
"""Generate file name for a photo or video using its metadata.

Originally we hardcoded the file name to include an ISO date format.
Expand All @@ -128,10 +128,6 @@ def get_file_name(self, media):
:class:`~elodie.media.video.Video`
:returns: str or None for non-photo or non-videos
"""
if(not media.is_valid()):
return None

metadata = media.get_metadata()
if(metadata is None):
return None

Expand Down Expand Up @@ -519,6 +515,7 @@ def process_file(self, _file, destination, media, **kwargs):
allow_duplicate = kwargs['allowDuplicate']

stat_info_original = os.stat(_file)
metadata = media.get_metadata()

if(not media.is_valid()):
print('%s is not a valid media file. Skipping...' % _file)
Expand All @@ -537,15 +534,13 @@ def process_file(self, _file, destination, media, **kwargs):
log.warn('At least one plugin pre-run failed for %s' % _file)
return

media.set_original_name()
metadata = media.get_metadata()

directory_name = self.get_folder_path(metadata)

dest_directory = os.path.join(destination, directory_name)
file_name = self.get_file_name(media)
file_name = self.get_file_name(metadata)
dest_path = os.path.join(dest_directory, file_name)

media.set_original_name()

# If source and destination are identical then
# we should not write the file. gh-210
if(_file == dest_path):
Expand Down
45 changes: 34 additions & 11 deletions elodie/tests/filesystem_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,35 +207,35 @@ def test_get_file_name_definition_custom():
def test_get_file_name_plain():
filesystem = FileSystem()
media = Photo(helper.get_file('plain.jpg'))
file_name = filesystem.get_file_name(media)
file_name = filesystem.get_file_name(media.get_metadata())

assert file_name == helper.path_tz_fix('2015-12-05_00-59-26-plain.jpg'), file_name

def test_get_file_name_with_title():
filesystem = FileSystem()
media = Photo(helper.get_file('with-title.jpg'))
file_name = filesystem.get_file_name(media)
file_name = filesystem.get_file_name(media.get_metadata())

assert file_name == helper.path_tz_fix('2015-12-05_00-59-26-with-title-some-title.jpg'), file_name

def test_get_file_name_with_original_name_exif():
filesystem = FileSystem()
media = Photo(helper.get_file('with-filename-in-exif.jpg'))
file_name = filesystem.get_file_name(media)
file_name = filesystem.get_file_name(media.get_metadata())

assert file_name == helper.path_tz_fix('2015-12-05_00-59-26-foobar.jpg'), file_name

def test_get_file_name_with_original_name_title_exif():
filesystem = FileSystem()
media = Photo(helper.get_file('with-filename-and-title-in-exif.jpg'))
file_name = filesystem.get_file_name(media)
file_name = filesystem.get_file_name(media.get_metadata())

assert file_name == helper.path_tz_fix('2015-12-05_00-59-26-foobar-foobar-title.jpg'), file_name

def test_get_file_name_with_uppercase_and_spaces():
filesystem = FileSystem()
media = Photo(helper.get_file('Plain With Spaces And Uppercase 123.jpg'))
file_name = filesystem.get_file_name(media)
file_name = filesystem.get_file_name(media.get_metadata())

assert file_name == helper.path_tz_fix('2015-12-05_00-59-26-plain-with-spaces-and-uppercase-123.jpg'), file_name

Expand All @@ -252,7 +252,7 @@ def test_get_file_name_custom():

filesystem = FileSystem()
media = Photo(helper.get_file('plain.jpg'))
file_name = filesystem.get_file_name(media)
file_name = filesystem.get_file_name(media.get_metadata())

if hasattr(load_config, 'config'):
del load_config.config
Expand All @@ -272,7 +272,7 @@ def test_get_file_name_custom_with_title():

filesystem = FileSystem()
media = Photo(helper.get_file('with-title.jpg'))
file_name = filesystem.get_file_name(media)
file_name = filesystem.get_file_name(media.get_metadata())

if hasattr(load_config, 'config'):
del load_config.config
Expand All @@ -292,7 +292,7 @@ def test_get_file_name_custom_with_empty_value():

filesystem = FileSystem()
media = Photo(helper.get_file('plain.jpg'))
file_name = filesystem.get_file_name(media)
file_name = filesystem.get_file_name(media.get_metadata())

if hasattr(load_config, 'config'):
del load_config.config
Expand All @@ -313,7 +313,7 @@ def test_get_file_name_custom_with_lower_capitalization():

filesystem = FileSystem()
media = Photo(helper.get_file('plain.jpg'))
file_name = filesystem.get_file_name(media)
file_name = filesystem.get_file_name(media.get_metadata())

if hasattr(load_config, 'config'):
del load_config.config
Expand All @@ -334,7 +334,7 @@ def test_get_file_name_custom_with_invalid_capitalization():

filesystem = FileSystem()
media = Photo(helper.get_file('plain.jpg'))
file_name = filesystem.get_file_name(media)
file_name = filesystem.get_file_name(media.get_metadata())

if hasattr(load_config, 'config'):
del load_config.config
Expand All @@ -355,7 +355,7 @@ def test_get_file_name_custom_with_upper_capitalization():

filesystem = FileSystem()
media = Photo(helper.get_file('plain.jpg'))
file_name = filesystem.get_file_name(media)
file_name = filesystem.get_file_name(media.get_metadata())

if hasattr(load_config, 'config'):
del load_config.config
Expand Down Expand Up @@ -787,6 +787,29 @@ def test_process_file_validate_original_checksum():
assert origin_checksum_preprocess == origin_checksum, (origin_checksum_preprocess, origin_checksum)


# See https://github.com/jmathai/elodie/issues/330
def test_process_file_no_exif_date_is_correct_gh_330():
filesystem = FileSystem()
temporary_folder, folder = helper.create_working_folder()

origin = os.path.join(folder,'photo.jpg')
shutil.copyfile(helper.get_file('no-exif.jpg'), origin)

atime = 1330712100
utime = 1330712900
os.utime(origin, (atime, utime))

media = Photo(origin)
metadata = media.get_metadata()

destination = filesystem.process_file(origin, temporary_folder, media, allowDuplicate=True)

shutil.rmtree(folder)
shutil.rmtree(os.path.dirname(os.path.dirname(destination)))

assert '/2012-03-Mar/' in destination, destination
assert '/2012-03-02_18-28-20' in destination, destination

def test_process_file_with_location_and_title():
filesystem = FileSystem()
temporary_folder, folder = helper.create_working_folder()
Expand Down