The_Great_Archive/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2026-09-14 11:06:13 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix CI progress and host detection edge cases

Browse Source
This commit is contained in:
Nick Sweeting 2026-07-26 22:13:51 -07:00
parent 8267d757aa
commit fa493cde27
No known key found for this signature in database
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archivebox/machine/detect.py
View File

@ -28,6 +28,10 @@ def _run_abxpkg_host_binary(name: str, *args: str) -> subprocess.CompletedProces
provider = provider.get_provider_with_overrides(
overrides={name: {"version": platform.mac_ver()[0] or "0.0.0"}},
)
elif name == "lsb_release":
provider = provider.get_provider_with_overrides(
overrides={name: {"version": "1.0.0"}},
)
loaded = provider.load(name)
if loaded is None or loaded.loaded_abspath is None:
raise RuntimeError(f"abxpkg could not resolve {name}")

11
archivebox/progressmonitor/views.py
View File

@ -469,7 +469,7 @@ def live_progress_view(request):
snapshot["id"] for crawl_snapshots in displayed_snapshots_by_crawl.values() for snapshot in crawl_snapshots
]
detailed_snapshot_ids = [snapshot["id"] for snapshot in snapshots if snapshot["status"] != Snapshot.StatusChoices.QUEUED]
process_value_fields = ("id", "process_type", "status", "pwd", "cmd", "pid", "exit_code", "started_at", "modified_at")
process_value_fields = ("id", "process_type", "status", "pwd", "cmd", "pid", "exit_code", "started_at", "ended_at", "modified_at")
if active_crawl_ids or displayed_snapshot_ids:
process_scope = Process.objects.filter(
machine_id=machine_id,
@ -596,10 +596,15 @@ def live_progress_view(request):
if status == "started" and proc["pid"]:
payload["pid"] = proc["pid"]
proc_started_at = proc["started_at"] or proc["modified_at"]
proc_run_at = (
proc_started_at
if proc["status"] == Process.StatusChoices.RUNNING
else (proc["ended_at"] or proc["modified_at"] or proc_started_at)
)
if phase == "snapshot" and snapshot_id:
process_records_by_snapshot.setdefault(snapshot_id, []).append((payload, proc_started_at))
process_records_by_snapshot.setdefault(snapshot_id, []).append((payload, proc_run_at))
elif crawl_id:
process_records_by_crawl.setdefault(crawl_id, []).append((payload, proc_started_at))
process_records_by_crawl.setdefault(crawl_id, []).append((payload, proc_run_at))
active_crawls = []
total_workers = len(running_worker_ids)