yacloud/tunasync-scripts
1
0
Fork 0
mirror of https://github.com/tuna/tunasync-scripts.git synced 2025-04-19 11:42:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

shadowmire.py: update to taoky/shadowmire@0a6a958e49

Browse Source 
Signed-off-by: Harry Chen <i@harrychen.xyz>
This commit is contained in:
Harry Chen 2024-08-14 23:34:30 +08:00
parent b4f0196910
commit ecb6e4688e
No known key found for this signature in database
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shadowmire.py
View File

@ -826,7 +826,7 @@ class SyncPlainHTTP(SyncBase):
hrefs = get_existing_hrefs(package_simple_path) hrefs = get_existing_hrefs(package_simple_path)
existing_hrefs = [] if hrefs is None else hrefs existing_hrefs = [] if hrefs is None else hrefs
# Download JSON meta # Download JSON meta
file_url = urljoin(self.upstream, f"/json/{package_name}") file_url = urljoin(self.upstream, f"json/{package_name}")
success, resp = download( success, resp = download(
self.session, file_url, self.jsonmeta_dir / (package_name + ".new") self.session, file_url, self.jsonmeta_dir / (package_name + ".new")
) )
@ -851,7 +851,7 @@ class SyncPlainHTTP(SyncBase):
logger.info("removing file %s (if exists)", p) logger.info("removing file %s (if exists)", p)
package_path = Path(normpath(package_simple_path / p)) package_path = Path(normpath(package_simple_path / p))
package_path.unlink(missing_ok=True) 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: for href in remote_hrefs:
url = urljoin(package_simple_url, href) url = urljoin(package_simple_url, href)
dest = Path(normpath(package_simple_path / href)) dest = Path(normpath(package_simple_path / href))
@ -871,12 +871,9 @@ class SyncPlainHTTP(SyncBase):
# generate indexes # generate indexes
self.write_meta_to_simple(package_simple_path, meta) self.write_meta_to_simple(package_simple_path, meta)
last_serial = get_local_serial(package_simple_path) last_serial: int = meta["last_serial"]
if not last_serial: if use_db:
logger.warning("cannot get valid package serial from %s", package_name) self.local_db.set(package_name, last_serial)
else:
if use_db:
self.local_db.set(package_name, last_serial)
return last_serial return last_serial