takino
/
ordigi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix empty filename string

This commit is contained in:
Cédric Leporcq 2021-10-18 20:06:49 +02:00
parent 16b3c646c2
commit 4324470be0
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ordigi/collection.py
View File

@ -201,7 +201,7 @@ class FPath:
if re.match(regex, this_part[0]): if re.match(regex, this_part[0]):
this_part = this_part[1:] this_part = this_part[1:]
return this_part return this_part.strip()
def get_path(self, metadata, whitespace_sub='_'): def get_path(self, metadata, whitespace_sub='_'):
"""path_format: {%Y-%d-%m}/%u{city}/{album} """path_format: {%Y-%d-%m}/%u{city}/{album}
@ -216,26 +216,25 @@ class FPath:
for path_part in path_parts: for path_part in path_parts:
this_parts = path_part.split('|') this_parts = path_part.split('|')
for this_part in this_parts: for this_part in this_parts:
this_part = self.get_path_part(this_part, metadata) part = self.get_path_part(this_part, metadata)
if this_part: if part != '':
# Check if all masks are substituted # Check if all masks are substituted
if True in [c in this_part for c in '{}']: if True in [c in part for c in '{}']:
self.logger.error( self.logger.error(
f'Format path part invalid: \ f'Format path part invalid: \
{this_part}' {this_part}'
) )
sys.exit(1) sys.exit(1)
path.append(this_part.strip()) path.append(part)
# We break as soon as we have a value to append # We break as soon as we have a value to append
break break
# Else we continue for fallbacks # Else we continue for fallbacks
if path == []: # If last path is empty or start with dot
path = [metadata['filename']] if part == '' or re.match(r'^\..*', part):
elif len(path[-1]) == 0 or re.match(r'^\..*', path[-1]): path.append(metadata['filename'])
path[-1] = metadata['filename']
path_string = os.path.join(*path) path_string = os.path.join(*path)