adelgado/image_classifier
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change test for no move

Browse source
This commit is contained in:
Antonio J. Delgado 2021-09-08 14:42:59 +03:00
parent 0850f4af39
commit d3117d61eb
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
image_classifier/image_classifier.py
View file

@ -86,27 +86,28 @@ class image_classifier:
self._log.debug(f"Updated file '{file}'.") self._log.debug(f"Updated file '{file}'.")
dirname = os.path.dirname(os.path.realpath(file)) dirname = os.path.dirname(os.path.realpath(file))
filename = os.path.basename(file) filename = os.path.basename(file)
if not self.no_move:
new_path = False new_path = False
if 'Exif.Photo.DateTimeOriginal' in self.metadata.exif_keys: if 'Exif.Photo.DateTimeOriginal' in self.metadata.exif_keys:
original_date = self.metadata['Exif.Photo.DateTimeOriginal'].value original_date = self.metadata['Exif.Photo.DateTimeOriginal'].value
self._log.debug(f"File creation time: {original_date} (type: {type(original_date)})") self._log.debug(f"File creation time: {original_date} (type: {type(original_date)})")
new_path = os.path.join(dirname, original_date.strftime('%Y/%m/%d'), filename) new_path = os.path.join(dirname, original_date.strftime('%Y/%m/%d'), filename)
if not new_path: if not new_path:
match = re.search(r'(?P<year>20[0-9]{2})[\-/\._]?(?P<month>[0-1]?[0-9])[\-/\._]?(?P<day>[0-3]?[0-9])', filename) match = re.search(r'(?P<year>20[0-9]{2})[\-/\._]?(?P<month>[0-1]?[0-9])[\-/\._]?(?P<day>[0-3]?[0-9])', filename)
if match: if match:
new_path = os.path.join(dirname, match.group('year'), match.group('month'), match.group('day'), filename) new_path = os.path.join(dirname, match.group('year'), match.group('month'), match.group('day'), filename)
if not new_path: if not new_path:
match = re.search(r'(?P<day>[0-3]?[0-9])[\-/\._]?(?P<month>[0-1]?[0-9])[\-/\._]?(?P<year>20[0-9]{2})', filename) match = re.search(r'(?P<day>[0-3]?[0-9])[\-/\._]?(?P<month>[0-1]?[0-9])[\-/\._]?(?P<year>20[0-9]{2})', filename)
if match: if match:
new_path = os.path.join(dirname, match.group('year'), match.group('month'), match.group('day'), filename) new_path = os.path.join(dirname, match.group('year'), match.group('month'), match.group('day'), filename)
if not new_path: if not new_path:
new_path = os.path.join(dirname, 'unknown-time', filename) new_path = os.path.join(dirname, 'unknown-time', filename)
os.makedirs(os.path.dirname(new_path), exist_ok=True) os.makedirs(os.path.dirname(new_path), exist_ok=True)
if self.no_move == False:
self._log.info(f"Moving file '{file}' to '{new_path}'...") self._log.info(f"Moving file '{file}' to '{new_path}'...")
shutil.move(file, new_path) shutil.move(file, new_path)
else: else:
self._log.debug('Not moving to subfolders.') self._log.info(f"NOT moving file '{file}' to '{new_path}' because of --no-move")
def print_metadata(self): def print_metadata(self):
print("IPTC keys:") print("IPTC keys:")