catman/yt-mls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: zipping did not skip existing files when appending archive

Browse Source
This commit is contained in:
Maximilian Wagner
2023-08-03 11:03:58 +02:00
parent c03d0bd6d9
commit eb72d36285
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend.py
View File

@@ -332,11 +332,11 @@ def zip_folder(full_rel_path):
break break
# get filename of existing zip else empty string # get filename of existing zip else empty string
existing_zip = directory_contains_zip(full_rel_path) existing_zip_name = directory_contains_zip(full_rel_path)
# get or generate filename # get or generate filename
if existing_zip: if existing_zip_name:
filename = existing_zip filename = existing_zip_name
else: else:
# generate filename without slashes as that might be a problem but that was not tested # generate filename without slashes as that might be a problem but that was not tested
filename = (b64encode(os.urandom(4)).decode('utf-8') filename = (b64encode(os.urandom(4)).decode('utf-8')
@@ -352,7 +352,7 @@ def zip_folder(full_rel_path):
# Open the existing zip file in append mode # Open the existing zip file in append mode
with zipfile.ZipFile(downloads_path() + full_rel_path + filename, 'a') as existing_zip: with zipfile.ZipFile(downloads_path() + full_rel_path + filename, 'a') as existing_zip:
file_list = existing_zip.namelist() file_list = existing_zip.namelist()
file_list = [e[len(parent)+len(downloads_path())+1:] for e in file_list] file_list = [e[len(parent)+1:] for e in file_list]
for entry in os.scandir(downloads_path() + full_rel_path): for entry in os.scandir(downloads_path() + full_rel_path):
if entry.is_file() and not entry.name.endswith('.zip') and entry.name not in file_list: if entry.is_file() and not entry.name.endswith('.zip') and entry.name not in file_list: