mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-21 10:09:59 -04:00
Resume a part file only for the file it was begun for.
A part left by a download of other bytes under the same name was resumed, and the result failed its sha256 check as if the download were damaged. A note beside the part now names the file it belongs to by the expected sha256; a part of another file is deleted with a log line and the download starts over, and the same file is still resumed from another server. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
@@ -79,18 +79,18 @@ def safe_extract(zip_path, dest):
|
||||
z.extractall(dest)
|
||||
|
||||
|
||||
def _fetch(release, key, layout, progress, cancel, version):
|
||||
def _fetch(release, key, layout, progress, cancel, version, log=None):
|
||||
url, headers, size, sha = release.asset(key)
|
||||
entry = release.manifest[key]
|
||||
dest = layout.downloads / entry['name']
|
||||
net.download(url, dest, sha256=sha, size=size, headers=headers, progress=progress, cancel=cancel,
|
||||
version=version)
|
||||
version=version, log=log)
|
||||
return dest
|
||||
|
||||
|
||||
def stage_app(layout, release, progress=None, cancel=None, version='dev'):
|
||||
def stage_app(layout, release, progress=None, cancel=None, version='dev', log=None):
|
||||
"""Download, check and unpack the release's app archive into app/<version>; returns that folder."""
|
||||
zip_path = _fetch(release, 'app', layout, progress, cancel, version)
|
||||
zip_path = _fetch(release, 'app', layout, progress, cancel, version, log)
|
||||
ver = versions.display(release.version)
|
||||
final = layout.apps / ver
|
||||
part = layout.apps / f'{ver}.part'
|
||||
@@ -118,12 +118,12 @@ def runtime_needed(layout, release):
|
||||
return bool(rt) and not layout.dev and rt.get('id') != runtime_id(layout)
|
||||
|
||||
|
||||
def stage_runtime(layout, release, progress=None, cancel=None, version='dev', dest=None):
|
||||
def stage_runtime(layout, release, progress=None, cancel=None, version='dev', dest=None, log=None):
|
||||
"""Unpack a new Python into dest (python.next, for the stub to swap in at the next start); False when the running
|
||||
one is current."""
|
||||
if not runtime_needed(layout, release):
|
||||
return False
|
||||
zip_path = _fetch(release, 'runtime', layout, progress, cancel, version)
|
||||
zip_path = _fetch(release, 'runtime', layout, progress, cancel, version, log)
|
||||
nxt = Path(dest) if dest else layout.root / 'python.next'
|
||||
shutil.rmtree(nxt, ignore_errors=True)
|
||||
part = nxt.with_name(nxt.name + '.part')
|
||||
@@ -147,16 +147,16 @@ def prerelease(release):
|
||||
return True
|
||||
|
||||
|
||||
def stage(layout, release, progress=None, cancel=None, version='dev'):
|
||||
def stage(layout, release, progress=None, cancel=None, version='dev', log=None):
|
||||
"""Download, check and unpack a release into app/<version>, with the Python it brings in python.staged there,
|
||||
without switching to it; staged.json, written last, marks it complete. Earlier staged releases it supersedes are
|
||||
removed. Returns the folder."""
|
||||
ver = versions.display(release.version)
|
||||
folder = stage_app(layout, release, progress=progress, cancel=cancel, version=version)
|
||||
folder = stage_app(layout, release, progress=progress, cancel=cancel, version=version, log=log)
|
||||
runtime = ''
|
||||
if runtime_needed(layout, release):
|
||||
stage_runtime(layout, release, progress=progress, cancel=cancel, version=version,
|
||||
dest=folder / STAGED_PYTHON)
|
||||
dest=folder / STAGED_PYTHON, log=log)
|
||||
runtime = release.manifest['runtime']['id']
|
||||
write_text(folder / STAGED, json.dumps({'version': ver, 'runtime': runtime, 'prerelease': prerelease(release),
|
||||
'notes': release.notes}))
|
||||
@@ -262,7 +262,7 @@ def prune(layout):
|
||||
shutil.rmtree(d, ignore_errors=True)
|
||||
if layout.downloads.is_dir():
|
||||
for f in layout.downloads.iterdir():
|
||||
if f.suffix in ('.part', '.zip'):
|
||||
if f.suffix in ('.part', '.zip', net.PART_OF):
|
||||
f.unlink(missing_ok=True)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user