mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2025-02-20 21:17:02 +00:00
Code Issues Releases Wiki Activity

Fixed upgrade leftover cleanup to prevent config reset when Bazarr is installed in the same directory as config and database. #1655

Browse source
This commit is contained in:
morpheus65535 2022-01-17 00:01:05 -05:00
parent 9d30414f9d
commit a3a8ed93c7
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bazarr/check_update.py
View file

@ -192,7 +192,14 @@ def update_cleaner(zipfile, bazarr_dir, config_dir):
'^venv' + separator,
'^WinPython' + separator,
separator + '__pycache__' + separator + '$']
if os.path.abspath(bazarr_dir).lower() in os.path.abspath(config_dir).lower():
if os.path.abspath(bazarr_dir).lower() == os.path.abspath(config_dir).lower():
# for users who installed Bazarr inside the config directory (ie: `%programdata%\Bazarr` on windows)
with os.scandir(config_dir) as directories:
for directory in directories:
if directory.is_dir():
dir_to_ignore.append('^' + directory.name + os.path.sep)
elif os.path.abspath(bazarr_dir).lower() in os.path.abspath(config_dir).lower():
# when config directory is a child of Bazarr installation directory
dir_to_ignore.append('^' + os.path.relpath(config_dir, bazarr_dir) + os.path.sep)
dir_to_ignore_regex = re.compile('(?:% s)' % '|'.join(dir_to_ignore))
logging.debug(f'BAZARR upgrade leftover cleaner will ignore directories matching this '