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 invalid package skipping

Browse Source
This commit is contained in:
taoky 2024-08-04 17:09:58 +08:00
parent 0f97cb7dbd
commit 9008d2cbce
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
shadowmire.py
View File

@ -384,6 +384,9 @@ class SyncBase:
def determine_sync_plan( def determine_sync_plan(
self, local: dict[str, int], excludes: list[re.Pattern[str]] self, local: dict[str, int], excludes: list[re.Pattern[str]]
) -> Plan: ) -> Plan:
"""
local should NOT skip invalid (-1) serials
"""
remote = self.fetch_remote_versions() remote = self.fetch_remote_versions()
remote = self.filter_remote_with_excludes(remote, excludes) remote = self.filter_remote_with_excludes(remote, excludes)
# store remote to remote.json # store remote to remote.json
@ -402,7 +405,10 @@ class SyncBase:
local_serial = local[i] local_serial = local[i]
remote_serial = remote[i] remote_serial = remote[i]
if local_serial != remote_serial: if local_serial != remote_serial:
to_update.append(i) if local_serial == -1:
logger.info("skip %s, as it's marked as not exist at upstream", i)
else:
to_update.append(i)
output = Plan(remove=to_remove, update=to_update) output = Plan(remove=to_remove, update=to_update)
return output return output
@ -770,12 +776,12 @@ def sync(
exclude: tuple[str], exclude: tuple[str],
prerelease_exclude: tuple[str], prerelease_exclude: tuple[str],
) -> None: ) -> None:
basedir = ctx.obj["basedir"] basedir: Path = ctx.obj["basedir"]
local_db = ctx.obj["local_db"] local_db: LocalVersionKV = ctx.obj["local_db"]
excludes = exclude_to_excludes(exclude) excludes = exclude_to_excludes(exclude)
prerelease_excludes = exclude_to_excludes(prerelease_exclude) prerelease_excludes = exclude_to_excludes(prerelease_exclude)
syncer = get_syncer(basedir, local_db, sync_packages, shadowmire_upstream) syncer = get_syncer(basedir, local_db, sync_packages, shadowmire_upstream)
local = local_db.dump() local = local_db.dump(skip_invalid=False)
plan = syncer.determine_sync_plan(local, excludes) plan = syncer.determine_sync_plan(local, excludes)
# save plan for debugging # save plan for debugging
with overwrite(basedir / "plan.json") as f: with overwrite(basedir / "plan.json") as f:
@ -787,8 +793,8 @@ def sync(
@cli.command(help="(Re)generate local db and json from simple/") @cli.command(help="(Re)generate local db and json from simple/")
@click.pass_context @click.pass_context
def genlocal(ctx: click.Context) -> None: def genlocal(ctx: click.Context) -> None:
basedir = ctx.obj["basedir"] basedir: Path = ctx.obj["basedir"]
local_db = ctx.obj["local_db"] local_db: LocalVersionKV = ctx.obj["local_db"]
local = {} local = {}
for package_path in (basedir / "simple").iterdir(): for package_path in (basedir / "simple").iterdir():
package_name = package_path.name package_name = package_path.name
@ -812,8 +818,8 @@ def verify(
exclude: tuple[str], exclude: tuple[str],
prerelease_exclude: tuple[str], prerelease_exclude: tuple[str],
) -> None: ) -> None:
basedir = ctx.obj["basedir"] basedir: Path = ctx.obj["basedir"]
local_db = ctx.obj["local_db"] local_db: LocalVersionKV = ctx.obj["local_db"]
excludes = exclude_to_excludes(exclude) excludes = exclude_to_excludes(exclude)
prerelease_excludes = exclude_to_excludes(prerelease_exclude) prerelease_excludes = exclude_to_excludes(prerelease_exclude)
syncer = get_syncer(basedir, local_db, sync_packages, shadowmire_upstream) syncer = get_syncer(basedir, local_db, sync_packages, shadowmire_upstream)
@ -849,8 +855,8 @@ def do_update(
prerelease_exclude: tuple[str], prerelease_exclude: tuple[str],
package_name: str, package_name: str,
) -> None: ) -> None:
basedir = ctx.obj["basedir"] basedir: Path = ctx.obj["basedir"]
local_db = ctx.obj["local_db"] local_db: LocalVersionKV = ctx.obj["local_db"]
excludes = exclude_to_excludes(exclude) excludes = exclude_to_excludes(exclude)
prerelease_excludes = exclude_to_excludes(prerelease_exclude) prerelease_excludes = exclude_to_excludes(prerelease_exclude)
syncer = get_syncer(basedir, local_db, sync_packages, shadowmire_upstream) syncer = get_syncer(basedir, local_db, sync_packages, shadowmire_upstream)