From ecb6e4688e0355edf9740173c8cbfcb6af24a5d8 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Wed, 14 Aug 2024 23:34:30 +0800 Subject: [PATCH] shadowmire.py: update to taoky/shadowmire@0a6a958e49ed1ce287596f04414fc21faf4ffac8 Signed-off-by: Harry Chen --- shadowmire.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/shadowmire.py b/shadowmire.py index 604dc5e..ef8bf1b 100755 --- a/shadowmire.py +++ b/shadowmire.py @@ -826,7 +826,7 @@ def do_update( hrefs = get_existing_hrefs(package_simple_path) existing_hrefs = [] if hrefs is None else hrefs # Download JSON meta - file_url = urljoin(self.upstream, f"/json/{package_name}") + file_url = urljoin(self.upstream, f"json/{package_name}") success, resp = download( self.session, file_url, self.jsonmeta_dir / (package_name + ".new") ) @@ -851,7 +851,7 @@ def do_update( logger.info("removing file %s (if exists)", p) package_path = Path(normpath(package_simple_path / p)) package_path.unlink(missing_ok=True) - package_simple_url = urljoin(self.upstream, f"/simple/{package_name}/") + package_simple_url = urljoin(self.upstream, f"simple/{package_name}/") for href in remote_hrefs: url = urljoin(package_simple_url, href) dest = Path(normpath(package_simple_path / href)) @@ -871,12 +871,9 @@ def do_update( # generate indexes self.write_meta_to_simple(package_simple_path, meta) - last_serial = get_local_serial(package_simple_path) - if not last_serial: - logger.warning("cannot get valid package serial from %s", package_name) - else: - if use_db: - self.local_db.set(package_name, last_serial) + last_serial: int = meta["last_serial"] + if use_db: + self.local_db.set(package_name, last_serial) return last_serial