Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f95387c5b8 | |||
| 1dc86121f6 | |||
| cd54e5f2c5 | |||
| 1b24d1b032 | |||
| 7ac14416b5 | |||
| b22a2f5593 | |||
| f45d8c9b34 | |||
| 8d6ce47e87 | |||
| 03b2dd8363 | |||
| ab89dda0b4 | |||
| 305c88ba09 | |||
| 82f3ea49de | |||
| 8d695227bc | |||
| 82bef0a08c | |||
| 73f347449e |
@@ -5,6 +5,79 @@ All notable changes to RigDoctor are recorded here. Format follows
|
|||||||
(`MAJOR.MINOR.PATCH`, pre-1.0). `__version__` and `pyproject.toml` must match the git
|
(`MAJOR.MINOR.PATCH`, pre-1.0). `__version__` and `pyproject.toml` must match the git
|
||||||
release tag (so the auto-updater, D18, can compare versions).
|
release tag (so the auto-updater, D18, can compare versions).
|
||||||
|
|
||||||
|
## [0.18.2] - 2026-05-22
|
||||||
|
### Fixed
|
||||||
|
- **GUI wouldn't start** (0.18.0 regression): the recording indicator used a wrong relative
|
||||||
|
import (`from .core` → `rigdoctor.gui.core`, which doesn't exist), crashing `MainWindow` on
|
||||||
|
launch. Corrected to `from ..core`.
|
||||||
|
|
||||||
|
## [0.18.1] - 2026-05-22
|
||||||
|
### Changed
|
||||||
|
- Recording badge: dropped the sample count (not useful at a glance) — it now shows just
|
||||||
|
**● Recording** + the game, plus a **⚠ GPU-lost** line if one is detected.
|
||||||
|
|
||||||
|
## [0.18.0] - 2026-05-22
|
||||||
|
### Added
|
||||||
|
- **Global recording indicator.** While a capture is running, the sidebar shows a red
|
||||||
|
**● Recording** badge on every page — with the **game** being captured and the live sample
|
||||||
|
count (and a GPU-lost flag if seen). It polls the recorder, so it reflects captures started
|
||||||
|
any way: manual `record`, a guided diagnostic, or the Steam launch wrapper.
|
||||||
|
|
||||||
|
## [0.17.0] - 2026-05-22
|
||||||
|
### Added
|
||||||
|
- **Inventory page is back in the GUI** (it was removed in 0.7.2 in favor of the CLI). Sidebar
|
||||||
|
**Inventory** → System / CPU / Firmware / Memory / GPU / Storage / Display as cards, with
|
||||||
|
**Copy Markdown** and **Save…** for pasting into forum/bug reports, and **Refresh**. Root-only
|
||||||
|
details (motherboard/BIOS/RAM modules via dmidecode) fill in after the launch password prompt.
|
||||||
|
Backed by the existing M5 `core/inventory.py` — the CLI `rigdoctor inventory` is unchanged.
|
||||||
|
|
||||||
|
## [0.16.0] - 2026-05-22
|
||||||
|
### Added
|
||||||
|
- **Automatic crash-capture via a Steam launch wrapper (M6/D12).** Set `rigdoctor wrap
|
||||||
|
%command%` as a game's Steam launch option (or in Lutris/Heroic's wrapper field) and RigDoctor
|
||||||
|
starts a focused, game-tagged capture when the game launches and stops it cleanly on exit — no
|
||||||
|
manual Run Diagnostic / Finish. A hard freeze leaves the capture unterminated, so it's flagged
|
||||||
|
as a crash next launch. The wrapper resolves the game name from Steam's `SteamAppId`, doesn't
|
||||||
|
disturb an existing capture, and returns the game's exit code. (`core/wrap.py`, `rigdoctor wrap`.)
|
||||||
|
- GUI **Auto-capture…** helper on the Games page: shows the exact launch-option line (absolute
|
||||||
|
path, copy button) and how to set it in Steam.
|
||||||
|
- Auto-capture preserves an unanalyzed crash (`diagnostic-crash.jsonl`) before starting a new
|
||||||
|
capture, so relaunching the game can't wipe a crash report you haven't seen yet.
|
||||||
|
### Fixed
|
||||||
|
- `docs/MODULES.md` status column was stale — M1, M3, M4, M5, M8, M10, and M13 are done and now
|
||||||
|
marked ✅ (only M2 and M11 remain not-started; M6/M9/M12 in progress).
|
||||||
|
|
||||||
|
## [0.15.0] - 2026-05-22
|
||||||
|
### Added
|
||||||
|
- **Hard-crash detection & recovery for the guided diagnostic.** If a focused capture ends
|
||||||
|
without a clean stop (the recorder never wrote `session-stop` and isn't running), RigDoctor
|
||||||
|
treats it as a likely hard freeze. On launch the **Games** page shows a warning banner —
|
||||||
|
*"Your last diagnostic for <game> ended unexpectedly…"* — with **Analyze crash** / **Dismiss**.
|
||||||
|
- **Deeper crash analysis.** *Analyze crash* combines the captured window (final readings before
|
||||||
|
the freeze + any GPU-lost event) with a focused scan of the **previous (crashed) boot's kernel
|
||||||
|
log** (`journalctl -k -b -1`: Xid/panic/OOM/MCE/AER/thermal) plus SMART/driver/persistence/
|
||||||
|
live-temp checks — the full "what happened" picture. `core/diagnostic.py` gains
|
||||||
|
`pending_crash()` / `analyze_crash()`; `health.check_previous_boot()` +
|
||||||
|
`run_health_checks(include_journal=False)` back it.
|
||||||
|
|
||||||
|
## [0.14.0] - 2026-05-22
|
||||||
|
### Changed
|
||||||
|
- **Dashboard headline tiles are now history trend graphs** instead of single-value gauges —
|
||||||
|
GPU temp, GPU load, CPU temp, and memory each plot their recent history (with the current
|
||||||
|
value, window min/max, and a dashed warning-threshold line), so you can see changes over time
|
||||||
|
rather than only the instantaneous reading. New `HistoryGraph` widget (QPainter, no new deps).
|
||||||
|
|
||||||
|
## [0.13.0] - 2026-05-22
|
||||||
|
### Added
|
||||||
|
- **Run Diagnostic now explains itself and can launch the game.** Clicking Run Diagnostic shows
|
||||||
|
what to do — *play the game, reproduce the crash, then Finish & analyze* (and that data
|
||||||
|
survives a hard freeze + reboot) — and offers **Launch game & start** (asks Steam to run it by
|
||||||
|
appid) or **Start without launching**. The recording banner now spells out the next step
|
||||||
|
instead of just showing a sample count.
|
||||||
|
### Fixed
|
||||||
|
- Button labels containing "&" (e.g. "Finish & analyze") rendered as "Finish _analyze" because
|
||||||
|
Qt treated the "&" as a keyboard mnemonic — now escaped so the ampersand shows literally.
|
||||||
|
|
||||||
## [0.12.0] - 2026-05-22
|
## [0.12.0] - 2026-05-22
|
||||||
### Added
|
### Added
|
||||||
- **Guided diagnostic in the GUI.** Each game on the **Games** page now has a **Run Diagnostic**
|
- **Guided diagnostic in the GUI.** Each game on the **Games** page now has a **Run Diagnostic**
|
||||||
|
|||||||
+19
-11
@@ -8,18 +8,18 @@ Status: ⬜ not started · 🟦 designing · 🟨 in progress · ✅ done
|
|||||||
|
|
||||||
| ID | Module | Bundle | Key deps | GPU scope | Priority | Status |
|
| ID | Module | Bundle | Key deps | GPU scope | Priority | Status |
|
||||||
|----|--------|--------|----------|-----------|----------|--------|
|
|----|--------|--------|----------|-----------|----------|--------|
|
||||||
| M1 | Sensor core | Essential | none (nvidia-smi, sysfs) | all (NVIDIA first) | P0 | ⬜ |
|
| M1 | Sensor core | Essential | none (nvidia-smi, sysfs) | all (NVIDIA first) | P0 | ✅ |
|
||||||
| M3 | Crash-capture logger | Essential | none (opt: smartmontools) | all (NVIDIA first) | P0 | 🟨 |
|
| M3 | Crash-capture logger | Essential | none (opt: smartmontools) | all (NVIDIA first) | P0 | ✅ |
|
||||||
| M4 | Health report (log scan) | Essential | none (opt: smartmontools) | all (NVIDIA first) | P0 | 🟨 |
|
| M4 | Health report (log scan) | Essential | none (opt: smartmontools) | all (NVIDIA first) | P0 | ✅ |
|
||||||
| M2 | Live monitor (TUI) | Monitoring | none (stdlib curses) | all | P1 | ⬜ |
|
| M2 | Live monitor (TUI) | Monitoring | none (stdlib curses) | all | P1 | ⬜ |
|
||||||
| M8 | Alerting | Monitoring | libnotify (opt) | all | P2 | 🟨 |
|
| M8 | Alerting | Monitoring | libnotify (opt) | all | P2 | ✅ |
|
||||||
| M5 | System inventory | Diagnostics | none (opt: lm-sensors, dmidecode) | all | P1 | 🟨 |
|
| M5 | System inventory | Diagnostics | none (opt: lm-sensors, dmidecode) | all | P1 | ✅ |
|
||||||
| M6 | Gaming env checks | Diagnostics | none | all | P2 | 🟨 |
|
| M6 | Gaming env checks | Diagnostics | none | all | P2 | 🟨 |
|
||||||
| M10 | Desktop GUI | Desktop UI | **python3-pyside6** | all | P2 | 🟨 |
|
| M10 | Desktop GUI | Desktop UI | **python3-pyside6** | all | P2 | ✅ |
|
||||||
| M11 | Tray / menu-bar applet | Desktop UI | **python3-pyside6** (+ AppIndicator on GNOME) | all | P2 | ⬜ |
|
| M11 | Tray / menu-bar applet | Desktop UI | **python3-pyside6** (+ AppIndicator on GNOME) | all | P2 | ⬜ |
|
||||||
| M9 | Installer | (meta) | none | all | P1 | 🟨 |
|
| M9 | Installer | (meta) | none | all | P1 | 🟨 |
|
||||||
| M12 | Session sharing / remote assist | Sharing | none (Tier 3: tmate/sshx) | all | P3 | 🟨 |
|
| M12 | Session sharing / remote assist | Sharing | none (Tier 3: tmate/sshx) | all | P3 | 🟨 |
|
||||||
| M13 | Auto-update | (core) | none (stdlib; user-local file swap) | all | P3 | 🟨 |
|
| M13 | Auto-update | (core) | none (stdlib; user-local file swap) | all | P3 | ✅ |
|
||||||
| ~~M7~~ | ~~Stress / repro~~ | — | — | — | — | ❌ dropped (D7) |
|
| ~~M7~~ | ~~Stress / repro~~ | — | — | — | — | ❌ dropped (D7) |
|
||||||
|
|
||||||
## Notes per module
|
## Notes per module
|
||||||
@@ -31,8 +31,10 @@ Status: ⬜ not started · 🟦 designing · 🟨 in progress · ✅ done
|
|||||||
*Implemented (manual trigger):* JSONL log with fsync-per-sample, size-based rotation
|
*Implemented (manual trigger):* JSONL log with fsync-per-sample, size-based rotation
|
||||||
(`log_max_bytes`/`log_backups`), GPU-lost/recovered event markers, atomic status file, and
|
(`log_max_bytes`/`log_backups`), GPU-lost/recovered event markers, atomic status file, and
|
||||||
`rigdoctor record run|start|stop|status|report`. The foreground `run` is the systemd-ready
|
`rigdoctor record run|start|stop|status|report`. The foreground `run` is the systemd-ready
|
||||||
entrypoint; the service unit + always-on/game-launch triggers (D6/D12) land in Phase 4.
|
entrypoint. The **game-launch trigger** is implemented via the D12 wrapper (`rigdoctor wrap
|
||||||
Also fully driven from the GUI's Recording/Logs page (M10) via shared `core.reccontrol`.
|
%command%`, see M6/below); the `systemd --user` service unit + always-on trigger (D6) and the
|
||||||
|
zero-config watcher (D12) are still pending. Also fully driven from the GUI's Recording/Logs
|
||||||
|
page (M10) via shared `core.reccontrol`.
|
||||||
- **M4 Health report** — turns scattered logs into a prioritized, plain-language findings
|
- **M4 Health report** — turns scattered logs into a prioritized, plain-language findings
|
||||||
list with **suggested** fixes (read-only, D9). Reuses M1 for a live snapshot. Also powers
|
list with **suggested** fixes (read-only, D9). Reuses M1 for a live snapshot. Also powers
|
||||||
the **guided diagnostic session** (with M3): pick a game → focused capture → scan →
|
the **guided diagnostic session** (with M3): pick a game → focused capture → scan →
|
||||||
@@ -56,8 +58,14 @@ Status: ⬜ not started · 🟦 designing · 🟨 in progress · ✅ done
|
|||||||
for the runtime-reversible tunables (governor / NVIDIA persistence / PCIe ASPM / swappiness /
|
for the runtime-reversible tunables (governor / NVIDIA persistence / PCIe ASPM / swappiness /
|
||||||
THP — dropdown + Apply via a single pkexec prompt, `core/fixes.py`) and **one-click install**
|
THP — dropdown + Apply via a single pkexec prompt, `core/fixes.py`) and **one-click install**
|
||||||
of optional tools (GameMode / MangoHud / cpupower, now in the M9 catalog). GRUB/mitigations
|
of optional tools (GameMode / MangoHud / cpupower, now in the M9 catalog). GRUB/mitigations
|
||||||
stay suggestion-only. *Pending:* non-Steam launchers (Lutris/Heroic) and GPU power-profile
|
stay suggestion-only. *Guided diagnostic (D12 "pick a game", `core/diagnostic.py`):* a focused
|
||||||
(PowerMizer) checks.
|
capture tagged with a game → window-scoped report (capture summary + M4 findings), in the CLI
|
||||||
|
(`rigdoctor diagnose start/status/finish`) and GUI (per-game **Run Diagnostic** → recording
|
||||||
|
banner → results dialog). **Auto-capture** via the D12 wrapper (`rigdoctor wrap %command%`,
|
||||||
|
`core/wrap.py`; GUI "Auto-capture…" helper). **Hard crashes are detected** (capture left
|
||||||
|
without a clean stop) and flagged on next launch with a crash-boot kernel-log analysis
|
||||||
|
(`pending_crash`/`analyze_crash` + `health.check_previous_boot`). *Pending:* non-Steam
|
||||||
|
launchers (Lutris/Heroic), GPU power-profile (PowerMizer) checks, and the zero-config watcher.
|
||||||
- **M8 Alerting** — threshold/event notifications; integrates with the tray applet (M11).
|
- **M8 Alerting** — threshold/event notifications; integrates with the tray applet (M11).
|
||||||
- **M10 Desktop GUI** — PySide6 graphical front-end over the core engine (dashboard, log
|
- **M10 Desktop GUI** — PySide6 graphical front-end over the core engine (dashboard, log
|
||||||
browser, report viewer, logger controls). Optional; adds the Qt dependency. *Bootstrapped
|
browser, report viewer, logger controls). Optional; adds the Qt dependency. *Bootstrapped
|
||||||
|
|||||||
+10
-5
@@ -45,11 +45,16 @@ Ubuntu + NVIDIA first; `.deb` distribution (see `DECISIONS.md`).
|
|||||||
diagnose start/status/finish`, and a **Run Diagnostic** button per game on the GUI Games
|
diagnose start/status/finish`, and a **Run Diagnostic** button per game on the GUI Games
|
||||||
page → recording banner → results dialog with the capture summary + findings). Tags a
|
page → recording banner → results dialog with the capture summary + findings). Tags a
|
||||||
focused capture with the chosen game (own diagnostic log, window-scoped report) and
|
focused capture with the chosen game (own diagnostic log, window-scoped report) and
|
||||||
combines the capture summary with the M4 findings. *Pending:* the tray (M11) entry point,
|
combines the capture summary with the M4 findings. **Auto start/stop** via the D12
|
||||||
and auto start/stop via the D12 wrapper/watcher.
|
wrapper is wired in, and a **hard-crash is detected** (capture left without a clean stop)
|
||||||
- [ ] Logger trigger modes: always-on + game-launch (D12 — wrapper first:
|
→ flagged on next launch with a deeper crash-boot log analysis. *Pending:* the tray (M11)
|
||||||
`rigdoctor wrap %command%` + global Steam compat-tool; zero-config watcher
|
entry point and the zero-config watcher.
|
||||||
(Steam RunningAppID + /proc) and GameMode hook follow)
|
- [~] Logger trigger modes: always-on + game-launch (D12) — *game-launch **wrapper** done:*
|
||||||
|
`rigdoctor wrap %command%` (per-game Steam launch option / Lutris/Heroic wrapper field)
|
||||||
|
auto-brackets a focused capture around the game; GUI "Auto-capture…" helper shows the
|
||||||
|
launch-option string. *Pending:* global Steam compat-tool registration, the zero-config
|
||||||
|
watcher (Steam RunningAppID + /proc), GameMode hook, and the always-on `systemd --user`
|
||||||
|
service.
|
||||||
- [~] M9 interactive installer — *done:* distro/GPU detection + optional-dependency install
|
- [~] M9 interactive installer — *done:* distro/GPU detection + optional-dependency install
|
||||||
(`rigdoctor install`, GUI Setup tab); **user-local `install.sh` + self-extracting `.run`**
|
(`rigdoctor install`, GUI Setup tab); **user-local `install.sh` + self-extracting `.run`**
|
||||||
(no-root venv install, handles python3-venv prereq, CI-built). *Pending:* module-selection
|
(no-root venv install, handles python3-venv prereq, CI-built). *Pending:* module-selection
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "rigdoctor"
|
name = "rigdoctor"
|
||||||
version = "0.12.0"
|
version = "0.18.2"
|
||||||
description = "Modular hardware monitoring & crash diagnostics for Linux gamers."
|
description = "Modular hardware monitoring & crash diagnostics for Linux gamers."
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.11"
|
requires-python = ">=3.11"
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
"""RigDoctor — modular hardware monitoring & crash diagnostics for Linux gamers."""
|
"""RigDoctor — modular hardware monitoring & crash diagnostics for Linux gamers."""
|
||||||
|
|
||||||
__version__ = "0.12.0"
|
__version__ = "0.18.2"
|
||||||
|
|||||||
@@ -417,6 +417,12 @@ def cmd_diagnose(args) -> int:
|
|||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
def cmd_wrap(args) -> int:
|
||||||
|
from .core import wrap
|
||||||
|
|
||||||
|
return wrap.run(args.command)
|
||||||
|
|
||||||
|
|
||||||
def cmd_gameenv(args) -> int:
|
def cmd_gameenv(args) -> int:
|
||||||
from dataclasses import asdict
|
from dataclasses import asdict
|
||||||
|
|
||||||
@@ -605,6 +611,12 @@ def build_parser() -> argparse.ArgumentParser:
|
|||||||
diag_finish.add_argument("--last", type=int, default=10, help="recent samples to show")
|
diag_finish.add_argument("--last", type=int, default=10, help="recent samples to show")
|
||||||
diag_finish.set_defaults(func=cmd_diagnose)
|
diag_finish.set_defaults(func=cmd_diagnose)
|
||||||
diag_p.set_defaults(func=cmd_diagnose, diagnose_cmd=None, last=10)
|
diag_p.set_defaults(func=cmd_diagnose, diagnose_cmd=None, last=10)
|
||||||
|
|
||||||
|
wrap_p = sub.add_parser(
|
||||||
|
"wrap", help="run a game with automatic crash-capture (Steam launch option, D12)")
|
||||||
|
wrap_p.add_argument("command", nargs=argparse.REMAINDER,
|
||||||
|
help="the game command — use `rigdoctor wrap %%command%%` in Steam")
|
||||||
|
wrap_p.set_defaults(func=cmd_wrap)
|
||||||
return p
|
return p
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,9 @@ LOG_FILE = LOG_DIR / "capture.jsonl"
|
|||||||
# Guided diagnostic (M6/D12): a focused capture writes here, separate from the always-on
|
# Guided diagnostic (M6/D12): a focused capture writes here, separate from the always-on
|
||||||
# crash log, so its report covers only that session's window.
|
# crash log, so its report covers only that session's window.
|
||||||
DIAG_LOG = LOG_DIR / "diagnostic.jsonl"
|
DIAG_LOG = LOG_DIR / "diagnostic.jsonl"
|
||||||
|
# A crashed (unterminated, unacknowledged) diagnostic is preserved here when a new capture
|
||||||
|
# starts, so auto-capture (the Steam wrapper) relaunching the game doesn't wipe it first.
|
||||||
|
DIAG_CRASH = LOG_DIR / "diagnostic-crash.jsonl"
|
||||||
STATUS_FILE = STATE_DIR / "recorder.json"
|
STATUS_FILE = STATE_DIR / "recorder.json"
|
||||||
PID_FILE = STATE_DIR / "recorder.pid"
|
PID_FILE = STATE_DIR / "recorder.pid"
|
||||||
SPAWN_LOG = STATE_DIR / "recorder.out"
|
SPAWN_LOG = STATE_DIR / "recorder.out"
|
||||||
|
|||||||
@@ -11,13 +11,16 @@ The capture is **manually bracketed** (start/finish) for now; auto start/stop on
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
import time
|
import time
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
|
|
||||||
from .. import config
|
from .. import config
|
||||||
from . import reccontrol
|
from . import reccontrol
|
||||||
from .crashlog import Summary, summarize
|
from .crashlog import Summary, summarize
|
||||||
from .health import Finding
|
from .health import CRITICAL, OK, WARNING, Finding
|
||||||
|
|
||||||
|
_SEV_ORDER = {CRITICAL: 0, WARNING: 1, "info": 2, OK: 3}
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
@@ -27,6 +30,14 @@ class DiagnosticResult:
|
|||||||
findings: list[Finding] # health findings: Xid/SMART/driver/etc. (M4)
|
findings: list[Finding] # health findings: Xid/SMART/driver/etc. (M4)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class CrashInfo:
|
||||||
|
game: str | None
|
||||||
|
samples: int
|
||||||
|
when: float | None # ts of the last captured sample (≈ when the freeze hit)
|
||||||
|
gpu_lost: bool
|
||||||
|
|
||||||
|
|
||||||
def _clear_diag_log() -> None:
|
def _clear_diag_log() -> None:
|
||||||
"""Each diagnostic is a fresh focused capture — drop any previous session + segments."""
|
"""Each diagnostic is a fresh focused capture — drop any previous session + segments."""
|
||||||
base = config.DIAG_LOG
|
base = config.DIAG_LOG
|
||||||
@@ -42,6 +53,11 @@ def start(game: str | None = None, interval: float | None = None) -> int | None:
|
|||||||
Returns the pid, or None if a capture is already running."""
|
Returns the pid, or None if a capture is already running."""
|
||||||
if reccontrol.running_pid():
|
if reccontrol.running_pid():
|
||||||
return None
|
return None
|
||||||
|
if _crash_from_log(config.DIAG_LOG): # preserve an unanalyzed crash before overwriting it
|
||||||
|
try:
|
||||||
|
config.DIAG_LOG.replace(config.DIAG_CRASH)
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
_clear_diag_log()
|
_clear_diag_log()
|
||||||
return reccontrol.start_background(interval=interval, out=str(config.DIAG_LOG), game=game)
|
return reccontrol.start_background(interval=interval, out=str(config.DIAG_LOG), game=game)
|
||||||
|
|
||||||
@@ -82,3 +98,90 @@ def finish(last_n: int = 10, log_path=None) -> DiagnosticResult:
|
|||||||
game = _game_from_summary(summary) or (reccontrol.read_status() or {}).get("game")
|
game = _game_from_summary(summary) or (reccontrol.read_status() or {}).get("game")
|
||||||
findings = run_health_checks()
|
findings = run_health_checks()
|
||||||
return DiagnosticResult(game=game, summary=summary, findings=findings)
|
return DiagnosticResult(game=game, summary=summary, findings=findings)
|
||||||
|
|
||||||
|
|
||||||
|
# --- hard-crash detection & post-crash analysis -----------------------------------
|
||||||
|
|
||||||
|
def _crash_from_log(path) -> CrashInfo | None:
|
||||||
|
"""CrashInfo if `path` holds an abnormally-ended session (start, no stop, not acked)."""
|
||||||
|
if not path.exists():
|
||||||
|
return None
|
||||||
|
summary = summarize(path)
|
||||||
|
kinds = {kind for _ts, kind, _detail in summary.events}
|
||||||
|
if "session-start" not in kinds:
|
||||||
|
return None
|
||||||
|
if "session-stop" in kinds or "diagnostic-acknowledged" in kinds:
|
||||||
|
return None
|
||||||
|
return CrashInfo(
|
||||||
|
game=_game_from_summary(summary),
|
||||||
|
samples=summary.samples,
|
||||||
|
when=summary.end,
|
||||||
|
gpu_lost="gpu-lost" in kinds,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _crash_path():
|
||||||
|
"""Where the pending crash lives: the preserved archive if present, else the live log."""
|
||||||
|
return config.DIAG_CRASH if config.DIAG_CRASH.exists() else config.DIAG_LOG
|
||||||
|
|
||||||
|
|
||||||
|
def pending_crash() -> CrashInfo | None:
|
||||||
|
"""Detect a diagnostic that ended abnormally (no clean stop, no live recorder).
|
||||||
|
|
||||||
|
A focused capture writes `session-start` (+ `game`) and, on a clean stop, `session-stop`.
|
||||||
|
After a hard freeze that block never runs, so the log has a start with no stop and no
|
||||||
|
live recorder — that's our hard-crash signal. A crash preserved across an auto-relaunch
|
||||||
|
(`DIAG_CRASH`) is checked first. Returns None if a capture is running, none is recorded,
|
||||||
|
it stopped cleanly, or the user already acknowledged it.
|
||||||
|
"""
|
||||||
|
info = _crash_from_log(config.DIAG_CRASH) # preserved across a relaunch (wrapper)
|
||||||
|
if info is not None:
|
||||||
|
return info
|
||||||
|
if is_running():
|
||||||
|
return None
|
||||||
|
return _crash_from_log(config.DIAG_LOG)
|
||||||
|
|
||||||
|
|
||||||
|
def acknowledge_crash() -> None:
|
||||||
|
"""Mark the recorded crash as seen so it stops prompting."""
|
||||||
|
try:
|
||||||
|
config.DIAG_CRASH.unlink() # drop the preserved archive, if any
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
try:
|
||||||
|
config.DIAG_LOG.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
with open(config.DIAG_LOG, "a", encoding="utf-8") as fh:
|
||||||
|
fh.write(json.dumps({"ts": time.time(), "event": "diagnostic-acknowledged", "detail": ""}) + "\n")
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def _crash_headline(summary: Summary) -> Finding:
|
||||||
|
gpu_lost = any(kind == "gpu-lost" for _ts, kind, _detail in summary.events)
|
||||||
|
when = time.strftime("%H:%M:%S", time.localtime(summary.end)) if summary.end else "?"
|
||||||
|
detail = (
|
||||||
|
f"The capture stopped abruptly at {when} after {summary.samples} samples, with no clean "
|
||||||
|
"shutdown recorded — consistent with a hard freeze or power loss."
|
||||||
|
)
|
||||||
|
if gpu_lost:
|
||||||
|
detail += " A GPU-lost event was captured during the session."
|
||||||
|
return Finding(
|
||||||
|
CRITICAL if gpu_lost else WARNING,
|
||||||
|
"Diagnostic",
|
||||||
|
"Session ended without a clean stop (likely a hard crash)",
|
||||||
|
detail,
|
||||||
|
"Review the last readings (Capture, above) and the crash-boot findings below.",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def analyze_crash(last_n: int = 15) -> DiagnosticResult:
|
||||||
|
"""Analyze a recorded hard crash: the captured window + the previous boot's kernel log
|
||||||
|
+ the rest of the health report (SMART/driver/persistence/temps)."""
|
||||||
|
from .health import check_previous_boot, run_health_checks
|
||||||
|
|
||||||
|
summary = summarize(_crash_path(), last_n=last_n)
|
||||||
|
findings: list[Finding] = [_crash_headline(summary)]
|
||||||
|
findings += check_previous_boot() # the crashed boot's kernel log
|
||||||
|
findings += run_health_checks(include_journal=False) # SMART/driver/persistence/temps
|
||||||
|
findings.sort(key=lambda f: _SEV_ORDER.get(f.severity, 9))
|
||||||
|
return DiagnosticResult(game=_game_from_summary(summary), summary=summary, findings=findings)
|
||||||
|
|||||||
@@ -146,6 +146,22 @@ def check_journal() -> list[Finding]:
|
|||||||
return findings
|
return findings
|
||||||
|
|
||||||
|
|
||||||
|
def check_previous_boot() -> list[Finding]:
|
||||||
|
"""Scan the previous boot's kernel log — the boot that crashed — for fault signatures.
|
||||||
|
|
||||||
|
Needs persistent journald (else the crashed boot's logs were lost on reboot, which the
|
||||||
|
persistence check flags separately). Findings are framed as coming from that boot.
|
||||||
|
"""
|
||||||
|
out = _journalctl(["-k", "-b", "-1", "--no-pager", "-o", "cat"])
|
||||||
|
if not out or not out.strip():
|
||||||
|
return []
|
||||||
|
tagged = []
|
||||||
|
for f in scan_journal_text(out):
|
||||||
|
detail = ("Logged during the previous (crashed) boot. " + (f.detail or "")).strip()
|
||||||
|
tagged.append(Finding(f.severity, f.category, f.title, detail, f.suggestion))
|
||||||
|
return tagged
|
||||||
|
|
||||||
|
|
||||||
def check_journal_persistence() -> list[Finding]:
|
def check_journal_persistence() -> list[Finding]:
|
||||||
if Path("/var/log/journal").is_dir():
|
if Path("/var/log/journal").is_dir():
|
||||||
return []
|
return []
|
||||||
@@ -235,17 +251,21 @@ def check_live_temps() -> list[Finding]:
|
|||||||
)]
|
)]
|
||||||
|
|
||||||
|
|
||||||
def run_health_checks() -> list[Finding]:
|
def run_health_checks(include_journal: bool = True) -> list[Finding]:
|
||||||
"""Run all checks and return findings sorted by severity (worst first).
|
"""Run all checks and return findings sorted by severity (worst first).
|
||||||
|
|
||||||
SMART needs root; if the session collected it via launch elevation, use that
|
SMART needs root; if the session collected it via launch elevation, use that
|
||||||
instead of re-running smartctl (which would just report "needs root").
|
instead of re-running smartctl (which would just report "needs root").
|
||||||
|
|
||||||
|
`include_journal=False` skips the 7-day kernel-journal scan — used by the crash
|
||||||
|
analysis, which scans the previous (crashed) boot specifically instead.
|
||||||
"""
|
"""
|
||||||
from . import elevation
|
from . import elevation
|
||||||
|
|
||||||
findings: list[Finding] = []
|
findings: list[Finding] = []
|
||||||
findings += check_nvidia_driver()
|
findings += check_nvidia_driver()
|
||||||
findings += check_journal()
|
if include_journal:
|
||||||
|
findings += check_journal()
|
||||||
findings += check_journal_persistence()
|
findings += check_journal_persistence()
|
||||||
priv = elevation.privileged()
|
priv = elevation.privileged()
|
||||||
if priv is not None and priv.get("smart") is not None:
|
if priv is not None and priv.get("smart") is not None:
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ from __future__ import annotations
|
|||||||
|
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
import shutil
|
||||||
|
import subprocess
|
||||||
import time
|
import time
|
||||||
from dataclasses import asdict, dataclass
|
from dataclasses import asdict, dataclass
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
@@ -351,6 +353,24 @@ def acknowledge_new() -> None:
|
|||||||
|
|
||||||
# --- formatting -----------------------------------------------------------------------
|
# --- formatting -----------------------------------------------------------------------
|
||||||
|
|
||||||
|
def launch_game(appid: str) -> bool:
|
||||||
|
"""Best-effort: ask Steam to launch a game by appid (steam:// URL). Non-blocking."""
|
||||||
|
if not appid:
|
||||||
|
return False
|
||||||
|
url = f"steam://rungameid/{appid}"
|
||||||
|
for cmd in (["steam", url], ["xdg-open", url]):
|
||||||
|
if shutil.which(cmd[0]):
|
||||||
|
try:
|
||||||
|
subprocess.Popen(
|
||||||
|
cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
|
||||||
|
stdin=subprocess.DEVNULL, start_new_session=True,
|
||||||
|
)
|
||||||
|
return True
|
||||||
|
except (OSError, subprocess.SubprocessError):
|
||||||
|
continue
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
def human_size(num_bytes: int) -> str:
|
def human_size(num_bytes: int) -> str:
|
||||||
if num_bytes <= 0:
|
if num_bytes <= 0:
|
||||||
return "—"
|
return "—"
|
||||||
|
|||||||
@@ -0,0 +1,78 @@
|
|||||||
|
"""Steam-launch wrapper (D12): auto-bracket a focused diagnostic around a game.
|
||||||
|
|
||||||
|
Set as a per-game Steam launch option — `rigdoctor wrap %command%` — or in Lutris/Heroic's
|
||||||
|
wrapper field. Steam expands `%command%` to the real game command; we start a focused capture
|
||||||
|
(tagged with the game), run the game, and stop the capture cleanly when it exits. A hard
|
||||||
|
freeze means the game (and this wrapper) never returns, so the capture is left without a clean
|
||||||
|
stop — which RigDoctor then flags as a crash on next launch.
|
||||||
|
|
||||||
|
Deterministic and daemonless (D12 "build first"): no polling, and it knows the title.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import os
|
||||||
|
import signal
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
def game_name_from_env() -> str | None:
|
||||||
|
"""The launching game's name, resolved from Steam's SteamAppId env var via the scan."""
|
||||||
|
appid = os.environ.get("SteamAppId") or os.environ.get("SteamGameId")
|
||||||
|
if not appid:
|
||||||
|
return None
|
||||||
|
from . import steam
|
||||||
|
|
||||||
|
games = steam.cached_games() or steam.scan_games(steam.selected_library_paths())
|
||||||
|
for game in games:
|
||||||
|
if game.appid == str(appid):
|
||||||
|
return game.name
|
||||||
|
return f"Steam app {appid}"
|
||||||
|
|
||||||
|
|
||||||
|
def launch_option() -> str:
|
||||||
|
"""The exact string to paste into Steam's Launch Options (absolute path → PATH-proof)."""
|
||||||
|
exe = Path(sys.executable).with_name("rigdoctor")
|
||||||
|
prog = str(exe) if exe.exists() else "rigdoctor"
|
||||||
|
quoted = f'"{prog}"' if " " in prog else prog
|
||||||
|
return f"{quoted} wrap %command%"
|
||||||
|
|
||||||
|
|
||||||
|
def run(command: list[str]) -> int:
|
||||||
|
"""Start a focused capture (unless one's already running), run the game, then stop it.
|
||||||
|
Returns the game's exit code so Steam sees the right status."""
|
||||||
|
from . import diagnostic, reccontrol
|
||||||
|
|
||||||
|
if not command:
|
||||||
|
print("usage: rigdoctor wrap %command% (set as a Steam launch option)", file=sys.stderr)
|
||||||
|
return 2
|
||||||
|
|
||||||
|
game = game_name_from_env() or os.path.basename(command[0])
|
||||||
|
started = False
|
||||||
|
if not reccontrol.running_pid(): # don't disturb an existing capture
|
||||||
|
started = diagnostic.start(game=game) is not None
|
||||||
|
|
||||||
|
proc: subprocess.Popen | None = None
|
||||||
|
|
||||||
|
def _forward(signum, _frame): # pass Steam's stop signal to the game
|
||||||
|
if proc is not None and proc.poll() is None:
|
||||||
|
try:
|
||||||
|
proc.send_signal(signum)
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
previous = {sig: signal.signal(sig, _forward) for sig in (signal.SIGTERM, signal.SIGINT)}
|
||||||
|
try:
|
||||||
|
proc = subprocess.Popen(command)
|
||||||
|
rc = proc.wait()
|
||||||
|
except (OSError, ValueError, subprocess.SubprocessError) as exc:
|
||||||
|
print(f"rigdoctor wrap: couldn't launch the game: {exc}", file=sys.stderr)
|
||||||
|
rc = 1
|
||||||
|
finally:
|
||||||
|
for sig, handler in previous.items():
|
||||||
|
signal.signal(sig, handler)
|
||||||
|
if started:
|
||||||
|
reccontrol.stop_background() # clean stop → no false crash flag
|
||||||
|
return rc
|
||||||
@@ -17,19 +17,19 @@ from PySide6.QtWidgets import (
|
|||||||
|
|
||||||
from ..core.sample import Sample
|
from ..core.sample import Sample
|
||||||
from ..render import metric_label
|
from ..render import metric_label
|
||||||
from .widgets import Card, MetricBar, MetricRow, StatGauge
|
from .widgets import Card, HistoryGraph, MetricBar, MetricRow
|
||||||
|
|
||||||
_GROUP_ORDER = ["gpu", "cpu", "memory", "storage"]
|
_GROUP_ORDER = ["gpu", "cpu", "memory", "storage"]
|
||||||
_GROUP_TITLES = {"gpu": "GPU", "cpu": "CPU", "memory": "Memory", "storage": "Storage"}
|
_GROUP_TITLES = {"gpu": "GPU", "cpu": "CPU", "memory": "Memory", "storage": "Storage"}
|
||||||
_BAR_METRICS = {"util", "mem_util", "fan", "used_pct"}
|
_BAR_METRICS = {"util", "mem_util", "fan", "used_pct"}
|
||||||
|
|
||||||
|
|
||||||
def _gauge_card(gauge: StatGauge) -> QFrame:
|
def _tile_card(widget: QWidget) -> QFrame:
|
||||||
card = QFrame()
|
card = QFrame()
|
||||||
card.setObjectName("Card")
|
card.setObjectName("Card")
|
||||||
layout = QVBoxLayout(card)
|
layout = QVBoxLayout(card)
|
||||||
layout.setContentsMargins(6, 14, 6, 8)
|
layout.setContentsMargins(6, 10, 6, 8)
|
||||||
layout.addWidget(gauge)
|
layout.addWidget(widget)
|
||||||
return card
|
return card
|
||||||
|
|
||||||
|
|
||||||
@@ -54,16 +54,16 @@ class Dashboard(QWidget):
|
|||||||
header.addWidget(self._updated)
|
header.addWidget(self._updated)
|
||||||
root.addLayout(header)
|
root.addLayout(header)
|
||||||
|
|
||||||
# Headline gauges
|
# Headline trend graphs (history over the session, not just the live value)
|
||||||
self._g_gpu_temp = StatGauge("GPU Temp", "°C", 100, "temp")
|
self._g_gpu_temp = HistoryGraph("GPU Temp", "°C", 30, 100, "temp")
|
||||||
self._g_gpu_load = StatGauge("GPU Load", "%", 100, "accent")
|
self._g_gpu_load = HistoryGraph("GPU Load", "%", 0, 100, "accent")
|
||||||
self._g_cpu_temp = StatGauge("CPU Temp", "°C", 100, "temp")
|
self._g_cpu_temp = HistoryGraph("CPU Temp", "°C", 30, 100, "temp")
|
||||||
self._g_mem = StatGauge("Memory", "%", 100, "usage")
|
self._g_mem = HistoryGraph("Memory", "%", 0, 100, "usage")
|
||||||
gauges = QHBoxLayout()
|
graphs = QHBoxLayout()
|
||||||
gauges.setSpacing(14)
|
graphs.setSpacing(14)
|
||||||
for g in (self._g_gpu_temp, self._g_gpu_load, self._g_cpu_temp, self._g_mem):
|
for g in (self._g_gpu_temp, self._g_gpu_load, self._g_cpu_temp, self._g_mem):
|
||||||
gauges.addWidget(_gauge_card(g))
|
graphs.addWidget(_tile_card(g))
|
||||||
root.addLayout(gauges)
|
root.addLayout(graphs)
|
||||||
|
|
||||||
# Per-subsystem cards (scrollable, 2-column grid)
|
# Per-subsystem cards (scrollable, 2-column grid)
|
||||||
scroll = QScrollArea()
|
scroll = QScrollArea()
|
||||||
@@ -81,10 +81,10 @@ class Dashboard(QWidget):
|
|||||||
root.addWidget(scroll, 1)
|
root.addWidget(scroll, 1)
|
||||||
|
|
||||||
def update_sample(self, sample: Sample) -> None:
|
def update_sample(self, sample: Sample) -> None:
|
||||||
self._g_gpu_temp.set_value(self._val(sample, "gpu", "temp", ""))
|
self._g_gpu_temp.add_value(self._val(sample, "gpu", "temp", ""))
|
||||||
self._g_gpu_load.set_value(self._val(sample, "gpu", "util"))
|
self._g_gpu_load.add_value(self._val(sample, "gpu", "util"))
|
||||||
self._g_cpu_temp.set_value(self._cpu_temp(sample))
|
self._g_cpu_temp.add_value(self._cpu_temp(sample))
|
||||||
self._g_mem.set_value(self._val(sample, "memory", "used_pct"))
|
self._g_mem.add_value(self._val(sample, "memory", "used_pct"))
|
||||||
|
|
||||||
keys = [r.key for r in sample.readings]
|
keys = [r.key for r in sample.readings]
|
||||||
if keys != self._built_keys: # sources appeared/disappeared
|
if keys != self._built_keys: # sources appeared/disappeared
|
||||||
|
|||||||
+155
-10
@@ -13,10 +13,13 @@ import time
|
|||||||
|
|
||||||
from PySide6.QtCore import Qt, QTimer, Signal
|
from PySide6.QtCore import Qt, QTimer, Signal
|
||||||
from PySide6.QtWidgets import (
|
from PySide6.QtWidgets import (
|
||||||
|
QApplication,
|
||||||
QCheckBox,
|
QCheckBox,
|
||||||
|
QDialog,
|
||||||
QFrame,
|
QFrame,
|
||||||
QHBoxLayout,
|
QHBoxLayout,
|
||||||
QLabel,
|
QLabel,
|
||||||
|
QLineEdit,
|
||||||
QMessageBox,
|
QMessageBox,
|
||||||
QPushButton,
|
QPushButton,
|
||||||
QScrollArea,
|
QScrollArea,
|
||||||
@@ -26,10 +29,10 @@ from PySide6.QtWidgets import (
|
|||||||
|
|
||||||
from ..config import load_config, update_config
|
from ..config import load_config, update_config
|
||||||
from .diagnostic_dialog import DiagnosticDialog
|
from .diagnostic_dialog import DiagnosticDialog
|
||||||
from .theme import ACCENT, GOOD, MUTED
|
from .theme import ACCENT, GOOD, MUTED, WARN
|
||||||
|
|
||||||
|
|
||||||
def _game_row(name: str, sublabel: str, size: str, is_new: bool, on_diagnose=None) -> QFrame:
|
def _game_row(name: str, sublabel: str, size: str, is_new: bool, appid: str = "", on_diagnose=None) -> QFrame:
|
||||||
card = QFrame()
|
card = QFrame()
|
||||||
card.setObjectName("Card")
|
card.setObjectName("Card")
|
||||||
h = QHBoxLayout(card)
|
h = QHBoxLayout(card)
|
||||||
@@ -66,7 +69,7 @@ def _game_row(name: str, sublabel: str, size: str, is_new: bool, on_diagnose=Non
|
|||||||
diag_btn = QPushButton("Run Diagnostic")
|
diag_btn = QPushButton("Run Diagnostic")
|
||||||
diag_btn.setObjectName("ActionButton")
|
diag_btn.setObjectName("ActionButton")
|
||||||
diag_btn.setCursor(Qt.CursorShape.PointingHandCursor)
|
diag_btn.setCursor(Qt.CursorShape.PointingHandCursor)
|
||||||
diag_btn.clicked.connect(lambda: on_diagnose(name))
|
diag_btn.clicked.connect(lambda: on_diagnose(name, appid))
|
||||||
h.addWidget(diag_btn, 0)
|
h.addWidget(diag_btn, 0)
|
||||||
return card
|
return card
|
||||||
|
|
||||||
@@ -99,6 +102,9 @@ class GamesPage(QWidget):
|
|||||||
self._status = QLabel("")
|
self._status = QLabel("")
|
||||||
self._status.setObjectName("Muted")
|
self._status.setObjectName("Muted")
|
||||||
header.addWidget(self._status)
|
header.addWidget(self._status)
|
||||||
|
self._autocap_btn = QPushButton("Auto-capture…")
|
||||||
|
self._autocap_btn.clicked.connect(self._show_autocapture)
|
||||||
|
header.addWidget(self._autocap_btn)
|
||||||
self._rescan_btn = QPushButton("Rescan")
|
self._rescan_btn = QPushButton("Rescan")
|
||||||
self._rescan_btn.setObjectName("PrimaryButton")
|
self._rescan_btn.setObjectName("PrimaryButton")
|
||||||
self._rescan_btn.clicked.connect(self.refresh)
|
self._rescan_btn.clicked.connect(self.refresh)
|
||||||
@@ -113,9 +119,10 @@ class GamesPage(QWidget):
|
|||||||
banner_h.setContentsMargins(16, 10, 16, 10)
|
banner_h.setContentsMargins(16, 10, 16, 10)
|
||||||
banner_h.setSpacing(10)
|
banner_h.setSpacing(10)
|
||||||
self._banner_label = QLabel("")
|
self._banner_label = QLabel("")
|
||||||
|
self._banner_label.setWordWrap(True)
|
||||||
self._banner_label.setStyleSheet(f"color: {ACCENT}; font-weight: 700; background: transparent;")
|
self._banner_label.setStyleSheet(f"color: {ACCENT}; font-weight: 700; background: transparent;")
|
||||||
banner_h.addWidget(self._banner_label, 1)
|
banner_h.addWidget(self._banner_label, 1)
|
||||||
self._finish_btn = QPushButton("Finish & analyze")
|
self._finish_btn = QPushButton("Finish && analyze") # && → literal & (not a mnemonic)
|
||||||
self._finish_btn.setObjectName("ActionButton")
|
self._finish_btn.setObjectName("ActionButton")
|
||||||
self._finish_btn.clicked.connect(self._finish_diagnostic)
|
self._finish_btn.clicked.connect(self._finish_diagnostic)
|
||||||
banner_h.addWidget(self._finish_btn)
|
banner_h.addWidget(self._finish_btn)
|
||||||
@@ -125,6 +132,27 @@ class GamesPage(QWidget):
|
|||||||
self._banner.hide()
|
self._banner.hide()
|
||||||
root.addWidget(self._banner)
|
root.addWidget(self._banner)
|
||||||
|
|
||||||
|
# Hard-crash banner: a previous diagnostic ended without a clean stop.
|
||||||
|
self._crash_banner = QFrame()
|
||||||
|
self._crash_banner.setObjectName("Card")
|
||||||
|
self._crash_banner.setStyleSheet(f"#Card {{ border: 1px solid {WARN}; }}")
|
||||||
|
crash_h = QHBoxLayout(self._crash_banner)
|
||||||
|
crash_h.setContentsMargins(16, 10, 16, 10)
|
||||||
|
crash_h.setSpacing(10)
|
||||||
|
self._crash_label = QLabel("")
|
||||||
|
self._crash_label.setWordWrap(True)
|
||||||
|
self._crash_label.setStyleSheet(f"color: {WARN}; font-weight: 700; background: transparent;")
|
||||||
|
crash_h.addWidget(self._crash_label, 1)
|
||||||
|
self._analyze_btn = QPushButton("Analyze crash")
|
||||||
|
self._analyze_btn.setObjectName("ActionButton")
|
||||||
|
self._analyze_btn.clicked.connect(self._analyze_crash)
|
||||||
|
crash_h.addWidget(self._analyze_btn)
|
||||||
|
self._dismiss_btn = QPushButton("Dismiss")
|
||||||
|
self._dismiss_btn.clicked.connect(self._dismiss_crash)
|
||||||
|
crash_h.addWidget(self._dismiss_btn)
|
||||||
|
self._crash_banner.hide()
|
||||||
|
root.addWidget(self._crash_banner)
|
||||||
|
|
||||||
self._diag_timer = QTimer(self)
|
self._diag_timer = QTimer(self)
|
||||||
self._diag_timer.setInterval(1000)
|
self._diag_timer.setInterval(1000)
|
||||||
self._diag_timer.timeout.connect(self._poll_diag)
|
self._diag_timer.timeout.connect(self._poll_diag)
|
||||||
@@ -162,6 +190,7 @@ class GamesPage(QWidget):
|
|||||||
|
|
||||||
self._load_cached() # instant display from the last scan
|
self._load_cached() # instant display from the last scan
|
||||||
QTimer.singleShot(400, self.refresh) # then rescan in the background on launch
|
QTimer.singleShot(400, self.refresh) # then rescan in the background on launch
|
||||||
|
self._check_crash() # surface an interrupted (crashed) diagnostic
|
||||||
|
|
||||||
# --- loading ----------------------------------------------------------------------
|
# --- loading ----------------------------------------------------------------------
|
||||||
|
|
||||||
@@ -269,29 +298,59 @@ class GamesPage(QWidget):
|
|||||||
os.path.basename(g.library.rstrip("/")) or g.library,
|
os.path.basename(g.library.rstrip("/")) or g.library,
|
||||||
steam.human_size(g.size_bytes),
|
steam.human_size(g.size_bytes),
|
||||||
g.appid in new_appids,
|
g.appid in new_appids,
|
||||||
|
appid=g.appid,
|
||||||
on_diagnose=self._start_diagnostic,
|
on_diagnose=self._start_diagnostic,
|
||||||
))
|
))
|
||||||
self._list.addStretch(1)
|
self._list.addStretch(1)
|
||||||
|
|
||||||
# --- guided diagnostic (M6/D12) ---------------------------------------------------
|
# --- guided diagnostic (M6/D12) ---------------------------------------------------
|
||||||
|
|
||||||
def _start_diagnostic(self, name: str) -> None:
|
def _start_diagnostic(self, name: str, appid: str = "") -> None:
|
||||||
from ..core import diagnostic
|
from ..core import diagnostic, steam
|
||||||
|
|
||||||
if diagnostic.is_running():
|
if diagnostic.is_running():
|
||||||
QMessageBox.information(
|
QMessageBox.information(
|
||||||
self, "RigDoctor",
|
self, "RigDoctor",
|
||||||
"A capture is already running — finish or discard it first.")
|
"A capture is already running — finish or discard it first.")
|
||||||
return
|
return
|
||||||
|
|
||||||
|
# Tell the user what the flow actually is, and offer to launch the game for them.
|
||||||
|
box = QMessageBox(self)
|
||||||
|
box.setIcon(QMessageBox.Icon.Information)
|
||||||
|
box.setWindowTitle(f"Run Diagnostic — {name}")
|
||||||
|
box.setText(f"Record a focused diagnostic while you play {name}?")
|
||||||
|
box.setInformativeText(
|
||||||
|
"RigDoctor will capture sensors in the background. Then:\n\n"
|
||||||
|
"1. Play the game and try to reproduce the freeze / black screen / crash.\n"
|
||||||
|
"2. When you're done — or after a hard freeze and reboot — come back here and "
|
||||||
|
"click “Finish & analyze”.\n\n"
|
||||||
|
"Your readings are saved continuously, so even a hard lock won't lose them."
|
||||||
|
)
|
||||||
|
launch_btn = box.addButton("Launch game && start", QMessageBox.ButtonRole.AcceptRole)
|
||||||
|
start_btn = box.addButton("Start without launching", QMessageBox.ButtonRole.ActionRole)
|
||||||
|
box.addButton("Cancel", QMessageBox.ButtonRole.RejectRole)
|
||||||
|
if not appid:
|
||||||
|
launch_btn.setEnabled(False) # no appid → can't ask Steam to launch it
|
||||||
|
box.exec()
|
||||||
|
clicked = box.clickedButton()
|
||||||
|
if clicked not in (launch_btn, start_btn):
|
||||||
|
return
|
||||||
|
|
||||||
if diagnostic.start(game=name) is None:
|
if diagnostic.start(game=name) is None:
|
||||||
QMessageBox.warning(self, "RigDoctor", "Couldn't start the capture.")
|
QMessageBox.warning(self, "RigDoctor", "Couldn't start the capture.")
|
||||||
return
|
return
|
||||||
|
launched = steam.launch_game(appid) if clicked is launch_btn else False
|
||||||
self._diag_game = name
|
self._diag_game = name
|
||||||
self._banner_label.setText(f"● Recording — {name} · starting…")
|
|
||||||
self._finish_btn.setEnabled(True)
|
self._finish_btn.setEnabled(True)
|
||||||
self._discard_btn.setEnabled(True)
|
self._discard_btn.setEnabled(True)
|
||||||
self._banner.show()
|
self._banner.show()
|
||||||
self._diag_timer.start()
|
self._diag_timer.start()
|
||||||
|
self._poll_diag()
|
||||||
|
if clicked is launch_btn and not launched:
|
||||||
|
QMessageBox.information(
|
||||||
|
self, "RigDoctor",
|
||||||
|
"Recording started, but couldn't launch the game automatically — "
|
||||||
|
"launch it yourself, then click “Finish & analyze” when you're done.")
|
||||||
|
|
||||||
def _poll_diag(self) -> None:
|
def _poll_diag(self) -> None:
|
||||||
from ..core import diagnostic
|
from ..core import diagnostic
|
||||||
@@ -301,9 +360,12 @@ class GamesPage(QWidget):
|
|||||||
self._diag_timer.stop() # recorder exited on its own
|
self._diag_timer.stop() # recorder exited on its own
|
||||||
return
|
return
|
||||||
samples = status.get("samples", 0)
|
samples = status.get("samples", 0)
|
||||||
lost = " · GPU-lost seen" if status.get("gpu_lost") else ""
|
lost = " · ⚠ GPU-lost detected" if status.get("gpu_lost") else ""
|
||||||
game = status.get("game") or self._diag_game or ""
|
game = status.get("game") or self._diag_game or "your game"
|
||||||
self._banner_label.setText(f"● Recording — {game} · {samples} samples{lost}")
|
self._banner_label.setText(
|
||||||
|
f"● Recording {game} — play it and reproduce the problem, then click "
|
||||||
|
f"“Finish & analyze”. ({samples} samples{lost})"
|
||||||
|
)
|
||||||
|
|
||||||
def _finish_diagnostic(self) -> None:
|
def _finish_diagnostic(self) -> None:
|
||||||
self._diag_timer.stop()
|
self._diag_timer.stop()
|
||||||
@@ -323,8 +385,10 @@ class GamesPage(QWidget):
|
|||||||
|
|
||||||
def _on_diag_done(self, result) -> None:
|
def _on_diag_done(self, result) -> None:
|
||||||
self._banner.hide()
|
self._banner.hide()
|
||||||
|
self._crash_banner.hide()
|
||||||
self._finish_btn.setEnabled(True)
|
self._finish_btn.setEnabled(True)
|
||||||
self._discard_btn.setEnabled(True)
|
self._discard_btn.setEnabled(True)
|
||||||
|
self._analyze_btn.setEnabled(True)
|
||||||
if result is None:
|
if result is None:
|
||||||
QMessageBox.warning(self, "RigDoctor", "The diagnostic couldn't be analyzed.")
|
QMessageBox.warning(self, "RigDoctor", "The diagnostic couldn't be analyzed.")
|
||||||
return
|
return
|
||||||
@@ -337,6 +401,85 @@ class GamesPage(QWidget):
|
|||||||
reccontrol.stop_background()
|
reccontrol.stop_background()
|
||||||
self._banner.hide()
|
self._banner.hide()
|
||||||
|
|
||||||
|
def _show_autocapture(self) -> None:
|
||||||
|
from ..core import wrap
|
||||||
|
|
||||||
|
option = wrap.launch_option()
|
||||||
|
dlg = QDialog(self)
|
||||||
|
dlg.setWindowTitle("Auto-capture in Steam")
|
||||||
|
dlg.resize(580, 250)
|
||||||
|
v = QVBoxLayout(dlg)
|
||||||
|
v.setContentsMargins(20, 18, 20, 16)
|
||||||
|
v.setSpacing(12)
|
||||||
|
info = QLabel(
|
||||||
|
"Capture automatically every time you launch a game — no need to click "
|
||||||
|
"Run Diagnostic.\n\n"
|
||||||
|
"1. In Steam, right-click the game → Properties → Launch Options.\n"
|
||||||
|
"2. Paste the line below.\n\n"
|
||||||
|
"RigDoctor starts a focused capture when the game launches and stops it on exit. "
|
||||||
|
"If the game hard-freezes, you'll get a crash report next time you open RigDoctor."
|
||||||
|
)
|
||||||
|
info.setWordWrap(True)
|
||||||
|
v.addWidget(info)
|
||||||
|
row = QHBoxLayout()
|
||||||
|
field = QLineEdit(option)
|
||||||
|
field.setReadOnly(True)
|
||||||
|
row.addWidget(field, 1)
|
||||||
|
copy = QPushButton("Copy")
|
||||||
|
copy.setObjectName("PrimaryButton")
|
||||||
|
copy.clicked.connect(lambda: QApplication.clipboard().setText(option))
|
||||||
|
row.addWidget(copy)
|
||||||
|
v.addLayout(row)
|
||||||
|
buttons = QHBoxLayout()
|
||||||
|
buttons.addStretch(1)
|
||||||
|
close = QPushButton("Close")
|
||||||
|
close.clicked.connect(dlg.accept)
|
||||||
|
buttons.addWidget(close)
|
||||||
|
v.addLayout(buttons)
|
||||||
|
dlg.exec()
|
||||||
|
|
||||||
|
# --- hard-crash recovery ----------------------------------------------------------
|
||||||
|
|
||||||
|
def _check_crash(self) -> None:
|
||||||
|
from ..core import diagnostic
|
||||||
|
|
||||||
|
info = diagnostic.pending_crash()
|
||||||
|
if info is None:
|
||||||
|
self._crash_banner.hide()
|
||||||
|
return
|
||||||
|
game = info.game or "your last game"
|
||||||
|
extra = " · ⚠ GPU-lost was captured" if info.gpu_lost else ""
|
||||||
|
self._crash_label.setText(
|
||||||
|
f"⚠ Your last diagnostic for {game} ended unexpectedly — likely a hard crash "
|
||||||
|
f"({info.samples} samples{extra}). Analyze it to see the final readings and the "
|
||||||
|
f"likely cause from the system logs."
|
||||||
|
)
|
||||||
|
self._analyze_btn.setEnabled(True)
|
||||||
|
self._crash_banner.show()
|
||||||
|
|
||||||
|
def _analyze_crash(self) -> None:
|
||||||
|
from ..core import diagnostic
|
||||||
|
|
||||||
|
diagnostic.acknowledge_crash() # don't prompt again for this one
|
||||||
|
self._analyze_btn.setEnabled(False)
|
||||||
|
self._crash_label.setText("Analyzing the crash (final readings + system logs)…")
|
||||||
|
threading.Thread(target=self._work_analyze_crash, daemon=True).start()
|
||||||
|
|
||||||
|
def _work_analyze_crash(self) -> None:
|
||||||
|
from ..core import diagnostic
|
||||||
|
|
||||||
|
try:
|
||||||
|
result = diagnostic.analyze_crash()
|
||||||
|
except Exception:
|
||||||
|
result = None
|
||||||
|
self._diag_done.emit(result)
|
||||||
|
|
||||||
|
def _dismiss_crash(self) -> None:
|
||||||
|
from ..core import diagnostic
|
||||||
|
|
||||||
|
diagnostic.acknowledge_crash()
|
||||||
|
self._crash_banner.hide()
|
||||||
|
|
||||||
# --- nav badge integration --------------------------------------------------------
|
# --- nav badge integration --------------------------------------------------------
|
||||||
|
|
||||||
def showEvent(self, event) -> None: # noqa: N802 (Qt override)
|
def showEvent(self, event) -> None: # noqa: N802 (Qt override)
|
||||||
@@ -358,3 +501,5 @@ class GamesPage(QWidget):
|
|||||||
self._banner.show()
|
self._banner.show()
|
||||||
if not self._diag_timer.isActive():
|
if not self._diag_timer.isActive():
|
||||||
self._diag_timer.start()
|
self._diag_timer.start()
|
||||||
|
else:
|
||||||
|
self._check_crash() # re-surface an interrupted diagnostic if one is pending
|
||||||
|
|||||||
@@ -0,0 +1,150 @@
|
|||||||
|
"""Inventory page (M5 in the GUI): system inventory with copy/save + admin re-collect."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import os
|
||||||
|
import threading
|
||||||
|
|
||||||
|
from PySide6.QtCore import Qt, QTimer, Signal
|
||||||
|
from PySide6.QtWidgets import (
|
||||||
|
QApplication,
|
||||||
|
QFileDialog,
|
||||||
|
QFrame,
|
||||||
|
QGridLayout,
|
||||||
|
QHBoxLayout,
|
||||||
|
QLabel,
|
||||||
|
QPushButton,
|
||||||
|
QScrollArea,
|
||||||
|
QVBoxLayout,
|
||||||
|
QWidget,
|
||||||
|
)
|
||||||
|
|
||||||
|
from ..core import inventory
|
||||||
|
|
||||||
|
|
||||||
|
def _section_card(section) -> QFrame:
|
||||||
|
card = QFrame()
|
||||||
|
card.setObjectName("Card")
|
||||||
|
layout = QVBoxLayout(card)
|
||||||
|
layout.setContentsMargins(16, 12, 16, 12)
|
||||||
|
layout.setSpacing(6)
|
||||||
|
title = QLabel(section.title)
|
||||||
|
title.setStyleSheet("font-weight: 700; background: transparent;")
|
||||||
|
layout.addWidget(title)
|
||||||
|
grid = QGridLayout()
|
||||||
|
grid.setColumnStretch(1, 1)
|
||||||
|
grid.setHorizontalSpacing(14)
|
||||||
|
grid.setVerticalSpacing(4)
|
||||||
|
for row, (key, value) in enumerate(section.items):
|
||||||
|
k = QLabel(key)
|
||||||
|
k.setObjectName("Muted")
|
||||||
|
v = QLabel(value)
|
||||||
|
v.setWordWrap(True)
|
||||||
|
v.setStyleSheet("background: transparent;")
|
||||||
|
grid.addWidget(k, row, 0)
|
||||||
|
grid.addWidget(v, row, 1)
|
||||||
|
layout.addLayout(grid)
|
||||||
|
return card
|
||||||
|
|
||||||
|
|
||||||
|
class InventoryPage(QWidget):
|
||||||
|
_result = Signal(object) # list[Section]
|
||||||
|
|
||||||
|
def __init__(self) -> None:
|
||||||
|
super().__init__()
|
||||||
|
self.setObjectName("Page")
|
||||||
|
self._sections: list = []
|
||||||
|
self._result.connect(self._render)
|
||||||
|
|
||||||
|
root = QVBoxLayout(self)
|
||||||
|
root.setContentsMargins(20, 18, 20, 18)
|
||||||
|
root.setSpacing(16)
|
||||||
|
|
||||||
|
header = QHBoxLayout()
|
||||||
|
title = QLabel("Inventory")
|
||||||
|
title.setObjectName("PageTitle")
|
||||||
|
header.addWidget(title)
|
||||||
|
header.addStretch(1)
|
||||||
|
self._status = QLabel("")
|
||||||
|
self._status.setObjectName("Muted")
|
||||||
|
header.addWidget(self._status)
|
||||||
|
self._copy_btn = QPushButton("Copy Markdown")
|
||||||
|
self._copy_btn.clicked.connect(self._copy)
|
||||||
|
header.addWidget(self._copy_btn)
|
||||||
|
self._save_btn = QPushButton("Save…")
|
||||||
|
self._save_btn.clicked.connect(self._save)
|
||||||
|
header.addWidget(self._save_btn)
|
||||||
|
self._refresh_btn = QPushButton("Refresh")
|
||||||
|
self._refresh_btn.setObjectName("PrimaryButton")
|
||||||
|
self._refresh_btn.clicked.connect(self._run)
|
||||||
|
header.addWidget(self._refresh_btn)
|
||||||
|
root.addLayout(header)
|
||||||
|
|
||||||
|
self._scroll = scroll = QScrollArea()
|
||||||
|
scroll.setWidgetResizable(True)
|
||||||
|
scroll.setFrameShape(QFrame.Shape.NoFrame)
|
||||||
|
scroll.setStyleSheet("background: transparent;")
|
||||||
|
self._container = QWidget()
|
||||||
|
self._list = QVBoxLayout(self._container)
|
||||||
|
self._list.setContentsMargins(0, 0, 0, 0)
|
||||||
|
self._list.setSpacing(12)
|
||||||
|
self._list.setAlignment(Qt.AlignmentFlag.AlignTop)
|
||||||
|
scroll.setWidget(self._container)
|
||||||
|
root.addWidget(scroll, 1)
|
||||||
|
|
||||||
|
QTimer.singleShot(300, self._run)
|
||||||
|
|
||||||
|
def _run(self) -> None:
|
||||||
|
self._busy("Collecting…")
|
||||||
|
threading.Thread(target=self._work, daemon=True).start()
|
||||||
|
|
||||||
|
def _work(self) -> None:
|
||||||
|
try:
|
||||||
|
sections = inventory.collect()
|
||||||
|
except Exception:
|
||||||
|
sections = []
|
||||||
|
self._result.emit(sections)
|
||||||
|
|
||||||
|
def _busy(self, text: str) -> None:
|
||||||
|
self._status.setText(text)
|
||||||
|
for b in (self._refresh_btn, self._copy_btn, self._save_btn):
|
||||||
|
b.setEnabled(False)
|
||||||
|
|
||||||
|
def _render(self, sections) -> None:
|
||||||
|
self._refresh_btn.setEnabled(True)
|
||||||
|
self._copy_btn.setEnabled(True)
|
||||||
|
self._save_btn.setEnabled(True)
|
||||||
|
if sections is None: # collection failed — keep current
|
||||||
|
self._status.setText("collection failed")
|
||||||
|
return
|
||||||
|
if sections == self._sections: # unchanged — don't rebuild (would jump scroll)
|
||||||
|
self._status.setText("")
|
||||||
|
return
|
||||||
|
|
||||||
|
scroll_pos = self._scroll.verticalScrollBar().value()
|
||||||
|
self._sections = sections
|
||||||
|
while self._list.count():
|
||||||
|
item = self._list.takeAt(0)
|
||||||
|
w = item.widget()
|
||||||
|
if w is not None:
|
||||||
|
w.deleteLater()
|
||||||
|
for section in sections:
|
||||||
|
self._list.addWidget(_section_card(section))
|
||||||
|
self._list.addStretch(1)
|
||||||
|
self._status.setText("")
|
||||||
|
# restore scroll after the layout settles so re-renders don't yank to the top
|
||||||
|
QTimer.singleShot(0, lambda: self._scroll.verticalScrollBar().setValue(scroll_pos))
|
||||||
|
|
||||||
|
def _copy(self) -> None:
|
||||||
|
if self._sections:
|
||||||
|
QApplication.clipboard().setText(inventory.render_markdown(self._sections))
|
||||||
|
self._status.setText("copied as Markdown")
|
||||||
|
|
||||||
|
def _save(self) -> None:
|
||||||
|
if not self._sections:
|
||||||
|
return
|
||||||
|
path, _ = QFileDialog.getSaveFileName(self, "Save inventory", "rigdoctor-inventory.md", "Markdown (*.md)")
|
||||||
|
if path:
|
||||||
|
with open(path, "w", encoding="utf-8") as f:
|
||||||
|
f.write(inventory.render_markdown(self._sections))
|
||||||
|
self._status.setText(f"saved {os.path.basename(path)}")
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import html
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import threading
|
import threading
|
||||||
@@ -31,14 +32,15 @@ from .dashboard import Dashboard
|
|||||||
from .environment_page import EnvironmentPage
|
from .environment_page import EnvironmentPage
|
||||||
from .games_page import GamesPage
|
from .games_page import GamesPage
|
||||||
from .health_page import HealthPage
|
from .health_page import HealthPage
|
||||||
|
from .inventory_page import InventoryPage
|
||||||
from .notifications_page import NotificationsPage
|
from .notifications_page import NotificationsPage
|
||||||
from .recorder_page import RecorderPage
|
from .recorder_page import RecorderPage
|
||||||
from .setup_page import SetupPage
|
from .setup_page import SetupPage
|
||||||
from .share_page import SharePage
|
from .share_page import SharePage
|
||||||
from .theme import ACCENT, GOOD, MUTED
|
from .theme import ACCENT, CRIT, GOOD, MUTED, TEXT
|
||||||
from .worker import SamplerWorker
|
from .worker import SamplerWorker
|
||||||
|
|
||||||
_NAV_ITEMS = ["Dashboard", "Logs", "Health", "Games", "Environment", "Setup", "Notifications", "Share"]
|
_NAV_ITEMS = ["Dashboard", "Logs", "Health", "Games", "Environment", "Inventory", "Setup", "Notifications", "Share"]
|
||||||
|
|
||||||
|
|
||||||
class MainWindow(QMainWindow):
|
class MainWindow(QMainWindow):
|
||||||
@@ -71,6 +73,7 @@ class MainWindow(QMainWindow):
|
|||||||
self.games_page = GamesPage()
|
self.games_page = GamesPage()
|
||||||
self.games_page.new_count_changed.connect(self._set_games_badge)
|
self.games_page.new_count_changed.connect(self._set_games_badge)
|
||||||
self.environment_page = EnvironmentPage()
|
self.environment_page = EnvironmentPage()
|
||||||
|
self.inventory_page = InventoryPage()
|
||||||
self.setup_page = SetupPage()
|
self.setup_page = SetupPage()
|
||||||
self.notifications_page = NotificationsPage()
|
self.notifications_page = NotificationsPage()
|
||||||
self.notifications_page.changed.connect(self._apply_alert_settings)
|
self.notifications_page.changed.connect(self._apply_alert_settings)
|
||||||
@@ -80,9 +83,10 @@ class MainWindow(QMainWindow):
|
|||||||
self._stack.addWidget(self.health_page) # 2 Health
|
self._stack.addWidget(self.health_page) # 2 Health
|
||||||
self._stack.addWidget(self.games_page) # 3 Games
|
self._stack.addWidget(self.games_page) # 3 Games
|
||||||
self._stack.addWidget(self.environment_page) # 4 Environment
|
self._stack.addWidget(self.environment_page) # 4 Environment
|
||||||
self._stack.addWidget(self.setup_page) # 5 Setup
|
self._stack.addWidget(self.inventory_page) # 5 Inventory
|
||||||
self._stack.addWidget(self.notifications_page) # 6 Notifications
|
self._stack.addWidget(self.setup_page) # 6 Setup
|
||||||
self._stack.addWidget(self.share_page) # 7 Share
|
self._stack.addWidget(self.notifications_page) # 7 Notifications
|
||||||
|
self._stack.addWidget(self.share_page) # 8 Share
|
||||||
content_layout.addWidget(self._stack)
|
content_layout.addWidget(self._stack)
|
||||||
|
|
||||||
layout.addWidget(self._build_sidebar())
|
layout.addWidget(self._build_sidebar())
|
||||||
@@ -124,6 +128,14 @@ class MainWindow(QMainWindow):
|
|||||||
self._update_timer.timeout.connect(self._start_update_check)
|
self._update_timer.timeout.connect(self._start_update_check)
|
||||||
self._update_timer.start()
|
self._update_timer.start()
|
||||||
|
|
||||||
|
# Reflect any capture (manual, diagnostic, or the Steam wrapper) in the sidebar on
|
||||||
|
# every page, so it's always clear when RigDoctor is recording and for which game.
|
||||||
|
self._rec_timer = QTimer(self)
|
||||||
|
self._rec_timer.setInterval(1500)
|
||||||
|
self._rec_timer.timeout.connect(self._update_recording)
|
||||||
|
self._rec_timer.start()
|
||||||
|
self._update_recording()
|
||||||
|
|
||||||
def _build_sidebar(self) -> QFrame:
|
def _build_sidebar(self) -> QFrame:
|
||||||
bar = QFrame()
|
bar = QFrame()
|
||||||
bar.setObjectName("Sidebar")
|
bar.setObjectName("Sidebar")
|
||||||
@@ -138,6 +150,17 @@ class MainWindow(QMainWindow):
|
|||||||
subtitle.setObjectName("AppSubtitle")
|
subtitle.setObjectName("AppSubtitle")
|
||||||
v.addWidget(title)
|
v.addWidget(title)
|
||||||
v.addWidget(subtitle)
|
v.addWidget(subtitle)
|
||||||
|
|
||||||
|
# Global recording indicator — visible on every page while a capture runs.
|
||||||
|
self._rec_indicator = QLabel()
|
||||||
|
self._rec_indicator.setWordWrap(True)
|
||||||
|
self._rec_indicator.setTextFormat(Qt.TextFormat.RichText)
|
||||||
|
self._rec_indicator.setStyleSheet(
|
||||||
|
f"background: #241316; border: 1px solid {CRIT}; border-radius: 8px; padding: 8px 10px;"
|
||||||
|
)
|
||||||
|
self._rec_indicator.hide()
|
||||||
|
v.addSpacing(12)
|
||||||
|
v.addWidget(self._rec_indicator)
|
||||||
v.addSpacing(18)
|
v.addSpacing(18)
|
||||||
|
|
||||||
group = QButtonGroup(self)
|
group = QButtonGroup(self)
|
||||||
@@ -234,9 +257,26 @@ class MainWindow(QMainWindow):
|
|||||||
self._elevated.emit()
|
self._elevated.emit()
|
||||||
|
|
||||||
def _on_elevated(self) -> None:
|
def _on_elevated(self) -> None:
|
||||||
# Re-run Health now that root-only SMART data is available. (dmidecode is still
|
# Re-run Health + Inventory now that root-only data is available (SMART for Health,
|
||||||
# collected and used by the relay guest view + the CLI `rigdoctor inventory`.)
|
# dmidecode motherboard/BIOS/RAM for Inventory).
|
||||||
self.health_page._run()
|
self.health_page._run()
|
||||||
|
self.inventory_page._run()
|
||||||
|
|
||||||
|
def _update_recording(self) -> None:
|
||||||
|
from ..core import diagnostic
|
||||||
|
|
||||||
|
status = diagnostic.active()
|
||||||
|
if not status:
|
||||||
|
self._rec_indicator.hide()
|
||||||
|
return
|
||||||
|
game = status.get("game")
|
||||||
|
lines = [f"<span style='color:{CRIT};'>●</span> <b style='color:{TEXT};'>Recording</b>"]
|
||||||
|
if game:
|
||||||
|
lines.append(f"<span style='color:{TEXT};'>{html.escape(str(game))}</span>")
|
||||||
|
if status.get("gpu_lost"):
|
||||||
|
lines.append(f"<span style='color:{CRIT};'>⚠ GPU-lost</span>")
|
||||||
|
self._rec_indicator.setText("<br>".join(lines))
|
||||||
|
self._rec_indicator.show()
|
||||||
|
|
||||||
def _set_games_badge(self, count: int) -> None:
|
def _set_games_badge(self, count: int) -> None:
|
||||||
btn = self._nav_buttons.get("Games")
|
btn = self._nav_buttons.get("Games")
|
||||||
|
|||||||
@@ -2,8 +2,10 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from PySide6.QtCore import QRectF, Qt
|
from collections import deque
|
||||||
from PySide6.QtGui import QColor, QFont, QPainter, QPen
|
|
||||||
|
from PySide6.QtCore import QPointF, QRectF, Qt
|
||||||
|
from PySide6.QtGui import QColor, QFont, QPainter, QPainterPath, QPen
|
||||||
from PySide6.QtWidgets import (
|
from PySide6.QtWidgets import (
|
||||||
QComboBox,
|
QComboBox,
|
||||||
QFrame,
|
QFrame,
|
||||||
@@ -17,7 +19,19 @@ from PySide6.QtWidgets import (
|
|||||||
|
|
||||||
from ..core.sample import Reading
|
from ..core.sample import Reading
|
||||||
from ..render import format_value
|
from ..render import format_value
|
||||||
from .theme import ACCENT, CRIT, GOOD, MUTED, TEXT, TRACK, WARN, gauge_color, temp_color
|
from .theme import (
|
||||||
|
ACCENT,
|
||||||
|
CRIT,
|
||||||
|
GOOD,
|
||||||
|
MUTED,
|
||||||
|
TEMP_WARN,
|
||||||
|
TEXT,
|
||||||
|
TRACK,
|
||||||
|
USAGE_WARN,
|
||||||
|
WARN,
|
||||||
|
gauge_color,
|
||||||
|
temp_color,
|
||||||
|
)
|
||||||
|
|
||||||
_SEV = {
|
_SEV = {
|
||||||
"critical": ("CRITICAL", CRIT),
|
"critical": ("CRITICAL", CRIT),
|
||||||
@@ -248,6 +262,117 @@ class StatGauge(QWidget):
|
|||||||
p.end()
|
p.end()
|
||||||
|
|
||||||
|
|
||||||
|
class HistoryGraph(QWidget):
|
||||||
|
"""A headline metric as a trend: current value + window min/max + a history line.
|
||||||
|
|
||||||
|
Replaces the at-a-glance gauge with changes-over-time. `kind` drives the color
|
||||||
|
(temp band / usage / accent), matching StatGauge so the dashboard stays consistent.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, title: str, unit: str = "", vmin: float = 0.0, vmax: float = 100.0,
|
||||||
|
kind: str = "accent", history: int = 180) -> None:
|
||||||
|
super().__init__()
|
||||||
|
self._title = title
|
||||||
|
self._unit = unit
|
||||||
|
self._min = vmin
|
||||||
|
self._max = vmax
|
||||||
|
self._kind = kind # "temp" | "usage" | "accent"
|
||||||
|
self._values: deque[float | None] = deque(maxlen=history)
|
||||||
|
self.setMinimumSize(160, 132)
|
||||||
|
|
||||||
|
def add_value(self, value: float | None) -> None:
|
||||||
|
self._values.append(value)
|
||||||
|
self.update()
|
||||||
|
|
||||||
|
def _fmt(self, value: float | None) -> str:
|
||||||
|
if value is None:
|
||||||
|
return "—"
|
||||||
|
if self._unit == "°C":
|
||||||
|
return f"{value:.0f}°"
|
||||||
|
if self._unit == "%":
|
||||||
|
return f"{value:.0f}%"
|
||||||
|
return f"{value:.0f}{self._unit}"
|
||||||
|
|
||||||
|
def paintEvent(self, event) -> None: # noqa: N802 (Qt override)
|
||||||
|
p = QPainter(self)
|
||||||
|
p.setRenderHint(QPainter.RenderHint.Antialiasing)
|
||||||
|
w, h = self.width(), self.height()
|
||||||
|
pad = 10.0
|
||||||
|
present = [v for v in self._values if v is not None]
|
||||||
|
current = next((v for v in reversed(self._values) if v is not None), None)
|
||||||
|
color = QColor(gauge_color(self._kind, current))
|
||||||
|
|
||||||
|
ftitle = QFont()
|
||||||
|
ftitle.setPointSizeF(10.0)
|
||||||
|
ftitle.setBold(True)
|
||||||
|
p.setFont(ftitle)
|
||||||
|
p.setPen(QColor(MUTED))
|
||||||
|
p.drawText(QRectF(pad, 6, w - 2 * pad, 18),
|
||||||
|
Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter, self._title)
|
||||||
|
|
||||||
|
fval = QFont()
|
||||||
|
fval.setPointSizeF(21.0)
|
||||||
|
fval.setBold(True)
|
||||||
|
p.setFont(fval)
|
||||||
|
p.setPen(color if current is not None else QColor(MUTED))
|
||||||
|
p.drawText(QRectF(pad, 2, w - 2 * pad, 28),
|
||||||
|
Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignTop, self._fmt(current))
|
||||||
|
|
||||||
|
if present:
|
||||||
|
fsm = QFont()
|
||||||
|
fsm.setPointSizeF(8.5)
|
||||||
|
p.setFont(fsm)
|
||||||
|
p.setPen(QColor(MUTED))
|
||||||
|
p.drawText(QRectF(pad, 27, w - 2 * pad, 14), Qt.AlignmentFlag.AlignLeft,
|
||||||
|
f"min {self._fmt(min(present))} max {self._fmt(max(present))}")
|
||||||
|
|
||||||
|
g_top, g_bot = 48.0, h - pad
|
||||||
|
g_left, g_right = pad, w - pad
|
||||||
|
span = self._max - self._min
|
||||||
|
if g_bot - g_top < 12 or g_right - g_left < 12 or span <= 0:
|
||||||
|
p.end()
|
||||||
|
return
|
||||||
|
|
||||||
|
def y_of(v: float) -> float:
|
||||||
|
frac = (max(self._min, min(self._max, v)) - self._min) / span
|
||||||
|
return g_bot - frac * (g_bot - g_top)
|
||||||
|
|
||||||
|
warn = TEMP_WARN if self._kind == "temp" else (USAGE_WARN if self._kind == "usage" else None)
|
||||||
|
if warn is not None and self._min <= warn <= self._max:
|
||||||
|
pen = QPen(QColor(TRACK))
|
||||||
|
pen.setWidthF(1.0)
|
||||||
|
pen.setStyle(Qt.PenStyle.DashLine)
|
||||||
|
p.setPen(pen)
|
||||||
|
yw = y_of(warn)
|
||||||
|
p.drawLine(QPointF(g_left, yw), QPointF(g_right, yw))
|
||||||
|
|
||||||
|
maxlen = self._values.maxlen or 1
|
||||||
|
step = (g_right - g_left) / max(1, maxlen - 1)
|
||||||
|
n = len(self._values)
|
||||||
|
# Build the line newest-at-right; break it where readings are missing.
|
||||||
|
path = QPainterPath()
|
||||||
|
drawing = False
|
||||||
|
for i, v in enumerate(self._values):
|
||||||
|
if v is None:
|
||||||
|
drawing = False
|
||||||
|
continue
|
||||||
|
x = g_right - (n - 1 - i) * step
|
||||||
|
y = y_of(v)
|
||||||
|
if drawing:
|
||||||
|
path.lineTo(x, y)
|
||||||
|
else:
|
||||||
|
path.moveTo(x, y)
|
||||||
|
drawing = True
|
||||||
|
if not path.isEmpty():
|
||||||
|
pen = QPen(color)
|
||||||
|
pen.setWidthF(2.0)
|
||||||
|
pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
||||||
|
pen.setJoinStyle(Qt.PenJoinStyle.RoundJoin)
|
||||||
|
p.setPen(pen)
|
||||||
|
p.drawPath(path)
|
||||||
|
p.end()
|
||||||
|
|
||||||
|
|
||||||
class MetricBar(QWidget):
|
class MetricBar(QWidget):
|
||||||
"""A label + value with a thin progress bar (for 0–100% metrics)."""
|
"""A label + value with a thin progress bar (for 0–100% metrics)."""
|
||||||
|
|
||||||
|
|||||||
@@ -57,5 +57,55 @@ class FinishTests(unittest.TestCase):
|
|||||||
self.assertTrue(any(kind == "gpu-lost" for _ts, kind, _d in result.summary.events))
|
self.assertTrue(any(kind == "gpu-lost" for _ts, kind, _d in result.summary.events))
|
||||||
|
|
||||||
|
|
||||||
|
class CrashDetectionTests(unittest.TestCase):
|
||||||
|
def _diag_log(self, d) -> Path:
|
||||||
|
return Path(d) / "diagnostic.jsonl"
|
||||||
|
|
||||||
|
def test_unterminated_session_is_a_pending_crash(self):
|
||||||
|
with tempfile.TemporaryDirectory() as d:
|
||||||
|
log = self._diag_log(d)
|
||||||
|
_write_log(str(log), "Tarkov") # has session-start + game, no session-stop
|
||||||
|
with mock.patch.object(diagnostic.config, "DIAG_LOG", log), \
|
||||||
|
mock.patch.object(diagnostic.config, "DIAG_CRASH", log.with_suffix(".crash")), \
|
||||||
|
mock.patch.object(diagnostic.reccontrol, "running_pid", return_value=None):
|
||||||
|
info = diagnostic.pending_crash()
|
||||||
|
self.assertIsNotNone(info)
|
||||||
|
self.assertEqual(info.game, "Tarkov")
|
||||||
|
self.assertTrue(info.gpu_lost) # _write_log writes a gpu-lost event
|
||||||
|
|
||||||
|
def test_clean_stop_is_not_a_crash(self):
|
||||||
|
with tempfile.TemporaryDirectory() as d:
|
||||||
|
log = self._diag_log(d)
|
||||||
|
w = CrashLogWriter(str(log))
|
||||||
|
w.write_event("session-start"); w.write_event("game", "X")
|
||||||
|
w.write_sample(Sample(time.time(), [Reading("gpu", "temp", 60.0, "°C", "")]))
|
||||||
|
w.write_event("session-stop", "samples=1")
|
||||||
|
w.close()
|
||||||
|
with mock.patch.object(diagnostic.config, "DIAG_LOG", log), \
|
||||||
|
mock.patch.object(diagnostic.config, "DIAG_CRASH", log.with_suffix(".crash")), \
|
||||||
|
mock.patch.object(diagnostic.reccontrol, "running_pid", return_value=None):
|
||||||
|
self.assertIsNone(diagnostic.pending_crash())
|
||||||
|
|
||||||
|
def test_acknowledge_clears_pending_crash(self):
|
||||||
|
with tempfile.TemporaryDirectory() as d:
|
||||||
|
log = self._diag_log(d)
|
||||||
|
_write_log(str(log), "Tarkov")
|
||||||
|
with mock.patch.object(diagnostic.config, "DIAG_LOG", log), \
|
||||||
|
mock.patch.object(diagnostic.config, "DIAG_CRASH", log.with_suffix(".crash")), \
|
||||||
|
mock.patch.object(diagnostic.reccontrol, "running_pid", return_value=None):
|
||||||
|
self.assertIsNotNone(diagnostic.pending_crash())
|
||||||
|
diagnostic.acknowledge_crash()
|
||||||
|
self.assertIsNone(diagnostic.pending_crash())
|
||||||
|
|
||||||
|
def test_running_capture_is_not_a_crash(self):
|
||||||
|
with tempfile.TemporaryDirectory() as d:
|
||||||
|
log = self._diag_log(d)
|
||||||
|
_write_log(str(log), "Tarkov")
|
||||||
|
with mock.patch.object(diagnostic.config, "DIAG_LOG", log), \
|
||||||
|
mock.patch.object(diagnostic.config, "DIAG_CRASH", log.with_suffix(".crash")), \
|
||||||
|
mock.patch.object(diagnostic.reccontrol, "running_pid", return_value=4321):
|
||||||
|
self.assertIsNone(diagnostic.pending_crash()) # it's in-progress, not crashed
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|||||||
@@ -0,0 +1,68 @@
|
|||||||
|
"""Tests for the D12 Steam-launch wrapper (rigdoctor wrap %command%)."""
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
|
from rigdoctor.core import wrap
|
||||||
|
from rigdoctor.core.steam import Game
|
||||||
|
|
||||||
|
|
||||||
|
class LaunchOptionTests(unittest.TestCase):
|
||||||
|
def test_format(self):
|
||||||
|
opt = wrap.launch_option()
|
||||||
|
self.assertTrue(opt.endswith("wrap %command%"))
|
||||||
|
self.assertIn("rigdoctor", opt)
|
||||||
|
|
||||||
|
|
||||||
|
class GameNameTests(unittest.TestCase):
|
||||||
|
def test_resolves_from_steam_appid(self):
|
||||||
|
g = Game(appid="570", name="Dota 2", library="/x", installdir="dota")
|
||||||
|
with mock.patch.dict("os.environ", {"SteamAppId": "570"}), \
|
||||||
|
mock.patch("rigdoctor.core.steam.cached_games", return_value=[g]):
|
||||||
|
self.assertEqual(wrap.game_name_from_env(), "Dota 2")
|
||||||
|
|
||||||
|
def test_unknown_appid_falls_back(self):
|
||||||
|
with mock.patch.dict("os.environ", {"SteamAppId": "999"}), \
|
||||||
|
mock.patch("rigdoctor.core.steam.cached_games", return_value=[]), \
|
||||||
|
mock.patch("rigdoctor.core.steam.scan_games", return_value=[]):
|
||||||
|
self.assertEqual(wrap.game_name_from_env(), "Steam app 999")
|
||||||
|
|
||||||
|
def test_none_without_steam_env(self):
|
||||||
|
with mock.patch.dict("os.environ", {}, clear=True):
|
||||||
|
self.assertIsNone(wrap.game_name_from_env())
|
||||||
|
|
||||||
|
|
||||||
|
class RunTests(unittest.TestCase):
|
||||||
|
def test_brackets_capture_and_returns_exit_code(self):
|
||||||
|
with mock.patch("rigdoctor.core.reccontrol.running_pid", return_value=None), \
|
||||||
|
mock.patch("rigdoctor.core.diagnostic.start", return_value=123) as start, \
|
||||||
|
mock.patch("rigdoctor.core.reccontrol.stop_background") as stop, \
|
||||||
|
mock.patch.dict("os.environ", {}, clear=True):
|
||||||
|
rc = wrap.run(["true"])
|
||||||
|
self.assertEqual(rc, 0)
|
||||||
|
start.assert_called_once()
|
||||||
|
stop.assert_called_once()
|
||||||
|
|
||||||
|
def test_propagates_game_failure(self):
|
||||||
|
with mock.patch("rigdoctor.core.reccontrol.running_pid", return_value=None), \
|
||||||
|
mock.patch("rigdoctor.core.diagnostic.start", return_value=123), \
|
||||||
|
mock.patch("rigdoctor.core.reccontrol.stop_background"), \
|
||||||
|
mock.patch.dict("os.environ", {}, clear=True):
|
||||||
|
self.assertEqual(wrap.run(["false"]), 1)
|
||||||
|
|
||||||
|
def test_does_not_touch_an_existing_capture(self):
|
||||||
|
with mock.patch("rigdoctor.core.reccontrol.running_pid", return_value=999), \
|
||||||
|
mock.patch("rigdoctor.core.diagnostic.start") as start, \
|
||||||
|
mock.patch("rigdoctor.core.reccontrol.stop_background") as stop, \
|
||||||
|
mock.patch.dict("os.environ", {}, clear=True):
|
||||||
|
rc = wrap.run(["true"])
|
||||||
|
self.assertEqual(rc, 0)
|
||||||
|
start.assert_not_called()
|
||||||
|
stop.assert_not_called()
|
||||||
|
|
||||||
|
def test_empty_command_is_usage_error(self):
|
||||||
|
self.assertEqual(wrap.run([]), 2)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
Reference in New Issue
Block a user