skip if there is no folder date time
This commit is contained in:
parent
98e999b781
commit
8bb91c5641
1 changed files with 38 additions and 38 deletions
|
@ -103,7 +103,7 @@ class image_classifier:
|
||||||
if more_files:
|
if more_files:
|
||||||
files = files + more_files
|
files = files + more_files
|
||||||
except PermissionError as error:
|
except PermissionError as error:
|
||||||
self._log.warning(f"Permission denied accessing folder '{path}'")
|
self._log.warning(f"Permission denied accessing folder '{path}'. {error}")
|
||||||
return files
|
return files
|
||||||
|
|
||||||
def process_metadata(self, file):
|
def process_metadata(self, file):
|
||||||
|
@ -119,7 +119,7 @@ class image_classifier:
|
||||||
''' Obtain the file date from EXIF metadata or the file name. Return None
|
''' Obtain the file date from EXIF metadata or the file name. Return None
|
||||||
if it's not accessible or 'unknown-time' if it can't determine the date'''
|
if it's not accessible or 'unknown-time' if it can't determine the date'''
|
||||||
file_date = None
|
file_date = None
|
||||||
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 os.access(file, os.R_OK):
|
if not os.access(file, os.R_OK):
|
||||||
self._log.error(f"The file '{file}' is not readable.")
|
self._log.error(f"The file '{file}' is not readable.")
|
||||||
|
@ -130,10 +130,10 @@ class image_classifier:
|
||||||
self._log.debug(f"File creation time in EXIF: {original_date} \
|
self._log.debug(f"File creation time in EXIF: {original_date} \
|
||||||
(type: {type(original_date)})")
|
(type: {type(original_date)})")
|
||||||
try:
|
try:
|
||||||
#file_date = original_date.strftime('%Y/%Y.%m.%d')
|
# file_date = original_date.strftime('%Y/%Y.%m.%d')
|
||||||
file_date = original_date
|
file_date = original_date
|
||||||
except Exception as error:
|
except Exception as error:
|
||||||
self._log.error(f"Failed to convert EXIF information about date '{original_date}'.")
|
self._log.error(f"Failed to convert EXIF information about date '{original_date}'. {error}")
|
||||||
file_date = None
|
file_date = None
|
||||||
if file_date is None:
|
if file_date is None:
|
||||||
self._log.debug('Date not stored in EXIF metadata')
|
self._log.debug('Date not stored in EXIF metadata')
|
||||||
|
@ -157,7 +157,6 @@ class image_classifier:
|
||||||
self._log.debug(f"Time based folder name section '{file_date}'")
|
self._log.debug(f"Time based folder name section '{file_date}'")
|
||||||
return file_date
|
return file_date
|
||||||
|
|
||||||
|
|
||||||
def process_file(self, file):
|
def process_file(self, file):
|
||||||
''' Process a file, find faces, add EXIF information and
|
''' Process a file, find faces, add EXIF information and
|
||||||
move it to the folder of the day'''
|
move it to the folder of the day'''
|
||||||
|
@ -169,6 +168,7 @@ class image_classifier:
|
||||||
if self.is_image(file):
|
if self.is_image(file):
|
||||||
self.process_metadata(file)
|
self.process_metadata(file)
|
||||||
folder_date_time = self.get_file_date(file)
|
folder_date_time = self.get_file_date(file)
|
||||||
|
if folder_date_time:
|
||||||
folder_date = folder_date_time.strftime(self.folder_date_format)
|
folder_date = folder_date_time.strftime(self.folder_date_format)
|
||||||
if folder_date:
|
if folder_date:
|
||||||
if self.is_image(file):
|
if self.is_image(file):
|
||||||
|
|
Loading…
Reference in a new issue