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

Adjust verify behavior

Browse Source
This commit is contained in:
taoky 2024-08-02 16:14:10 +08:00
parent b0187e947f
commit 889ed86497
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
shadowmire.py
View File

@ -345,7 +345,16 @@ class SyncBase:
to_update = plan.update to_update = plan.update
for package_name in to_remove: for package_name in to_remove:
logger.info("Removing %s", package_name) logger.info("removing %s", package_name)
self.do_remove(package_name)
for idx, package_name in enumerate(to_update):
logger.info("updating %s", package_name)
self.do_update(package_name)
if idx % 1000 == 0:
self.local_db.dump_json()
def do_remove(self, package_name: str) -> bool:
meta_dir = self.simple_dir / package_name meta_dir = self.simple_dir / package_name
index_html = meta_dir / "index.html" index_html = meta_dir / "index.html"
try: try:
@ -363,11 +372,6 @@ class SyncBase:
# remove all files inside meta_dir # remove all files inside meta_dir
self.local_db.remove(package_name) self.local_db.remove(package_name)
remove_dir_with_files(meta_dir) remove_dir_with_files(meta_dir)
for idx, package_name in enumerate(to_update):
logger.info("Updating %s", package_name)
self.do_update(package_name)
if idx % 1000 == 0:
self.local_db.dump_json()
def do_update(self, package_name: str) -> bool: def do_update(self, package_name: str) -> bool:
raise NotImplementedError raise NotImplementedError
@ -537,12 +541,12 @@ def main(args: argparse.Namespace) -> None:
local_db.dump_json() local_db.dump_json()
elif args.command == "verify": elif args.command == "verify":
sync = SyncPyPI(basedir=basedir, local_db=local_db) sync = SyncPyPI(basedir=basedir, local_db=local_db)
remote = sync.fetch_remote_versions() local_names = set(local_db.keys())
for package_name in remote: simple_dirs = set(list((basedir / "simple").iterdir()))
local_serial = get_local_serial(basedir / "simple" / package_name) for package_name in simple_dirs - local_names:
if local_serial == remote[package_name]: logger.info("removing %s", package_name)
logger.info("%s serial same as remote", package_name) sync.do_remove(package_name)
continue for package_name in local_names:
logger.info("updating %s", package_name) logger.info("updating %s", package_name)
sync.do_update(package_name) sync.do_update(package_name)
sync.finalize() sync.finalize()
@ -557,7 +561,8 @@ if __name__ == "__main__":
"genlocal", help="(Re)generate local db and json from simple/" "genlocal", help="(Re)generate local db and json from simple/"
) )
parser_verify = subparsers.add_parser( parser_verify = subparsers.add_parser(
"verify", help="Verify existing sync and download missing things" "verify",
help="Verify existing sync from local db, download missing things, remove unreferenced packages",
) )
args = parser.parse_args() args = parser.parse_args()