Merge pull request #3342 from dsm1212/issue3341

decode paths before using them to fix manual post process
This commit is contained in:
AdeHub
2024-07-23 20:17:10 +12:00
committed by GitHub
2 changed files with 4 additions and 2 deletions

View File

@@ -860,6 +860,8 @@ def smartMove(src, dest, delete=True):
try:
os.rename(src, os.path.join(source_dir, newfile))
filename = newfile
source_path = os.path.join(source_dir, filename)
dest_path = os.path.join(dest, filename)
except Exception as e:
logger.warn(f"Error renaming {src}: {e}")
break

View File

@@ -1231,9 +1231,9 @@ def forcePostProcess(dir=None, expand_subfolders=True, album_dir=None, keep_orig
subfolders = helpers.expand_subfolders(path_to_folder)
if expand_subfolders and subfolders is not None:
folders.extend(subfolders)
folders.extend(subfolders.decode(headphones.SYS_ENCODING, 'replace'))
else:
folders.append(path_to_folder)
folders.append(path_to_folder.decode(headphones.SYS_ENCODING, 'replace'))
# Log number of folders
if folders: