mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2025-01-31 19:33:31 +00:00
Code Issues Releases Wiki Activity

Fixed issue with upgrade cleanup routine when installed with Windows Installer.

Browse source
This commit is contained in:
morpheus65535 2021-08-06 10:29:58 -04:00
parent 91c53ba475
commit dd80fec9d4
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bazarr/check_update.py
View file

@ -180,10 +180,13 @@ def update_cleaner(zipfile, bazarr_dir, config_dir):
dir_to_ignore = ['^.' + os.path.sep, dir_to_ignore = ['^.' + os.path.sep,
'^bin' + os.path.sep, '^bin' + os.path.sep,
'^venv' + os.path.sep, '^venv' + os.path.sep,
'^WinPython' + os.path.sep,
os.path.sep + '__pycache__' + os.path.sep + '$'] os.path.sep + '__pycache__' + os.path.sep + '$']
if os.path.abspath(bazarr_dir) in os.path.abspath(config_dir): if os.path.abspath(bazarr_dir) in os.path.abspath(config_dir):
dir_to_ignore.append('^' + os.path.relpath(config_dir, bazarr_dir) + os.path.sep) 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)) dir_to_ignore_regex = re.compile('(?:% s)' % '|'.join(dir_to_ignore))
file_to_ignore = ['nssm.exe', '7za.exe']
extension_to_ignore = ['.pyc'] extension_to_ignore = ['.pyc']
file_on_disk = [] file_on_disk = []
@ -196,7 +199,9 @@ def update_cleaner(zipfile, bazarr_dir, config_dir):
folder_list.append(relative_foldername) folder_list.append(relative_foldername)
for file in filenames: for file in filenames:
if os.path.splitext(file)[1] in extension_to_ignore: if file in file_to_ignore:
continue
elif os.path.splitext(file)[1] in extension_to_ignore:
continue continue
elif foldername == bazarr_dir: elif foldername == bazarr_dir:
file_on_disk.append(file) file_on_disk.append(file)