yacloud/shadowmire
1
0
Fork 0
mirror of https://github.com/taoky/shadowmire.git synced 2025-07-08 09:12:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix step 3 syncing removed packages in verify, and performance improvement in check_and_update()

Browse Source
This commit is contained in:
taoky 2024-08-08 06:24:20 +08:00
parent 5637860cde
commit c120c2c747
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shadowmire.py
View File

@ -504,7 +504,7 @@ class SyncBase:
if self.sync_packages:
should_update = False
for href, size in hrefsize_json:
dest = (package_simple_path / href).resolve()
dest = Path(normpath(package_simple_path / href))
if not dest.exists():
logger.info("add %s as it's missing packages", package_name)
should_update = True
@ -1042,7 +1042,8 @@ def verify(
logger.info("remove packages NOT in local db")
local_names = set(local_db.keys())
simple_dirs = set([i.name for i in (basedir / "simple").iterdir() if i.is_dir()])
not_in_local = simple_dirs - local_names
json_files = set([i.name for i in (basedir / "json").iterdir() if i.is_file()])
not_in_local = (simple_dirs | json_files) - local_names
logger.info("%s packages NOT in local db", len(not_in_local))
for package_name in not_in_local:
logger.debug("package %s not in local db", package_name)
@ -1066,6 +1067,9 @@ def verify(
logger.debug("package %s not in remote index", package_name)
syncer.do_remove(package_name, remove_packages=False)
# After some removal, local_names is changed.
local_names = set(local_db.keys())
logger.info(
"make sure all local indexes are valid, and (if --sync-packages) have valid local package files"
)