From 630521778d2860429c0a595dd8b2add623163005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Sat, 13 Jun 2026 10:28:16 +0200 Subject: [PATCH] jobs logs --- pytorrent/static/js/jobTools.js | 2 +- pytorrent/static/styles.css | 25 ++++++++++++ pytorrent/templates/index.html | 18 ++++++--- scripts/mock | 71 +++++++++++++++++++++++++++++---- 4 files changed, 103 insertions(+), 13 deletions(-) diff --git a/pytorrent/static/js/jobTools.js b/pytorrent/static/js/jobTools.js index afdb8fe..fec1a69 100644 --- a/pytorrent/static/js/jobTools.js +++ b/pytorrent/static/js/jobTools.js @@ -1 +1 @@ -export const jobToolsSource = " function jobActions(r){ const id=esc(r.id); const status=String(r.status||''); const actions=[]; if(status==='failed'||status==='cancelled') actions.push(``); if(status==='pending') actions.push(``); if(status==='pending'||status==='running') actions.push(``); return actions.join(' ') || '-'; }\n function jobStatusBadgeClass(status){\n // Note: Running means active work, so it uses primary instead of danger; danger stays reserved for failed.\n const classes={done:'success',failed:'danger',running:'primary',cancelled:'secondary',pending:'warning'};\n return classes[String(status||'')] || 'warning';\n }\n async function loadJobs(page=jobsPage){\n const box=$('jobsTable');\n // Note: Finished shows only a real finished_at value; running/pending do not receive a date from updated_at.\n if(!box) return;\n jobsPage=Math.max(0,page|0);\n box.innerHTML=' Loading jobs...';\n const offset=jobsPage*jobsLimit;\n const j=await (await fetch(`/api/jobs?limit=${jobsLimit}&offset=${offset}`)).json();\n const rows=j.jobs||[];\n jobsTotal=Number(j.total||rows.length);\n const details=r=>{\n const count=Number(r.hash_count||0);\n if(r.is_bulk || count>1) return `bulk
${esc(count)} torrent(s), details hidden`;\n const bits=[];\n if(count) bits.push(`${esc(count)} torrent`);\n if(r.summary) bits.push(esc(r.summary));\n return bits.join('
') || '-';\n };\n box.innerHTML=responsiveTable(\n ['Status','Source','Action','Profile','Count','Details','Attempts','Started','Finished','Error','Actions'],\n rows.map(r=>[\n `${esc(r.status)}`,\n r.source==='automation'?` automation`:(r.is_forced?' forced':'user'),\n esc(r.action),\n esc(r.profile_id),\n esc(r.hash_count||0),\n details(r),\n esc(r.attempts||0),\n humanDateCell(r.started_at||r.created_at),\n humanDateCell(r.finished_at),\n compactCell(r.error||'',140),\n jobActions(r),\n ]),\n 'jobs-table'\n );\n renderJobsPager();\n }\n function renderJobsPager(){ const p=$('jobsPager'); if(!p)return; const pages=Math.max(1,Math.ceil(jobsTotal/jobsLimit)); p.innerHTML=`
Page ${jobsPage+1} / ${pages} ${jobsTotal} jobs
`; $('jobsPrev')?.addEventListener('click',()=>loadJobs(jobsPage-1)); $('jobsNext')?.addEventListener('click',()=>loadJobs(jobsPage+1)); }\n // Note: Job log buttons are separated so normal cleanup cannot accidentally trigger emergency cleanup.\n $('jobsModal')?.addEventListener('show.bs.modal',loadJobs); $('refreshJobsBtn')?.addEventListener('click',loadJobs); $('jobsTable')?.addEventListener('click',async e=>{ const btn=e.target.closest('.job-retry,.job-cancel,.job-force'); if(!btn)return; const id=btn.dataset.id; if(!id)return; if(btn.classList.contains('job-retry')) await post(`/api/jobs/${id}/retry`,{}).catch(x=>toast(x.message,'danger')); if(btn.classList.contains('job-force')){ if(!confirm('Force this pending job now in a separate worker? This can break normal queue ordering.')) return; await post(`/api/jobs/${id}/force`,{}).catch(x=>toast(x.message,'danger')); } if(btn.classList.contains('job-cancel')){ const st=btn.dataset.status||''; if((st==='pending'||st==='running') && !confirm('Emergency cancel this unfinished job?')) return; await post(`/api/jobs/${id}/cancel`,{}).catch(x=>toast(x.message,'danger')); } loadJobs(); });\n $('clearJobsBtn')?.addEventListener('click',async()=>{ if(!confirm('Clear finished job logs? Pending and running jobs will stay.')) return; try{ const j=await post('/api/jobs/clear',{}); toastMessage('toast.jobLogsCleared','success',{deleted:j.deleted}); jobsPage=0; loadJobs(0); }catch(e){ toast(e.message,'danger'); } });\n $('emergencyClearJobsBtn')?.addEventListener('click',async()=>{ if(!confirm('Emergency clean ALL job logs, including unfinished jobs?')) return; try{ const j=await post('/api/jobs/clear?force=1',{}); toastMessage('toast.emergencyJobLogsCleared','success',{deleted:j.deleted}); jobsPage=0; loadJobs(0); }catch(e){ toast(e.message,'danger'); } });\n\n"; +export const jobToolsSource = " const JOB_DETAILS_STORAGE_KEY = 'pytorrent.jobs.showDetails.v1';\n\n function readJobDetailsPreference(){\n try{ return localStorage.getItem(JOB_DETAILS_STORAGE_KEY) === '1'; }\n catch(e){ return false; }\n }\n\n function saveJobDetailsPreference(showDetails){\n try{ localStorage.setItem(JOB_DETAILS_STORAGE_KEY, showDetails ? '1' : '0'); }\n catch(e){}\n }\n\n function syncJobDetailsControl(){\n if($('jobsShowDetails')) $('jobsShowDetails').checked = readJobDetailsPreference();\n }\n\n function jobActions(r){ const id=esc(r.id); const status=String(r.status||''); const actions=[]; if(status==='failed'||status==='cancelled') actions.push(``); if(status==='pending') actions.push(``); if(status==='pending'||status==='running') actions.push(``); return actions.join(' ') || '-'; }\n function jobStatusBadgeClass(status){\n // Note: Running means active work, so it uses primary instead of danger; danger stays reserved for failed.\n const classes={done:'success',failed:'danger',running:'primary',cancelled:'secondary',pending:'warning'};\n return classes[String(status||'')] || 'warning';\n }\n async function loadJobs(page=jobsPage){\n const box=$('jobsTable');\n // Note: Finished shows only a real finished_at value; running/pending do not receive a date from updated_at.\n if(!box) return;\n jobsPage=Math.max(0,page|0);\n syncJobDetailsControl();\n box.innerHTML=' Loading jobs...';\n const offset=jobsPage*jobsLimit;\n const j=await (await fetch(`/api/jobs?limit=${jobsLimit}&offset=${offset}`, {cache:'no-store'})).json();\n const rows=j.jobs||[];\n jobsTotal=Number(j.total||rows.length);\n const showDetails = readJobDetailsPreference();\n const details=r=>{\n const count=Number(r.hash_count||0);\n if(!showDetails) return 'Details hidden';\n const bits=[];\n if(r.is_bulk || count>1) bits.push('bulk');\n if(count) bits.push(`${esc(count)} torrent${count === 1 ? '' : 's'}`);\n if(r.summary) bits.push(esc(r.summary));\n return bits.join('
') || '-';\n };\n box.innerHTML=responsiveTable(\n ['Status','Source','Action','Profile','Count','Details','Attempts','Started','Finished','Error','Actions'],\n rows.map(r=>[\n `${esc(r.status)}`,\n r.source==='automation'?` automation`:(r.is_forced?' forced':'user'),\n esc(r.action),\n esc(r.profile_id),\n esc(r.hash_count||0),\n details(r),\n esc(r.attempts||0),\n humanDateCell(r.started_at||r.created_at),\n humanDateCell(r.finished_at),\n compactCell(r.error||'',140),\n jobActions(r),\n ]),\n 'jobs-table'\n );\n renderJobsPager();\n }\n function renderJobsPager(){ const p=$('jobsPager'); if(!p)return; const pages=Math.max(1,Math.ceil(jobsTotal/jobsLimit)); p.innerHTML=`
Page ${jobsPage+1} / ${pages} ${jobsTotal} jobs
`; $('jobsPrev')?.addEventListener('click',()=>loadJobs(jobsPage-1)); $('jobsNext')?.addEventListener('click',()=>loadJobs(jobsPage+1)); }\n // Note: Job details now use the same opt-in visibility pattern as Logs, so large/bulk rows stay compact by default.\n $('jobsModal')?.addEventListener('show.bs.modal',()=>{ syncJobDetailsControl(); loadJobs(); }); $('refreshJobsBtn')?.addEventListener('click',()=>loadJobs()); $('jobsShowDetails')?.addEventListener('change',()=>{ saveJobDetailsPreference($('jobsShowDetails')?.checked === true); loadJobs(jobsPage); }); $('jobsTable')?.addEventListener('click',async e=>{ const btn=e.target.closest('.job-retry,.job-cancel,.job-force'); if(!btn)return; const id=btn.dataset.id; if(!id)return; if(btn.classList.contains('job-retry')) await post(`/api/jobs/${id}/retry`,{}).catch(x=>toast(x.message,'danger')); if(btn.classList.contains('job-force')){ if(!confirm('Force this pending job now in a separate worker? This can break normal queue ordering.')) return; await post(`/api/jobs/${id}/force`,{}).catch(x=>toast(x.message,'danger')); } if(btn.classList.contains('job-cancel')){ const st=btn.dataset.status||''; if((st==='pending'||st==='running') && !confirm('Emergency cancel this unfinished job?')) return; await post(`/api/jobs/${id}/cancel`,{}).catch(x=>toast(x.message,'danger')); } loadJobs(); });\n $('clearJobsBtn')?.addEventListener('click',async()=>{ if(!confirm('Clear finished job logs? Pending and running jobs will stay.')) return; try{ const j=await post('/api/jobs/clear',{}); toastMessage('toast.jobLogsCleared','success',{deleted:j.deleted}); jobsPage=0; loadJobs(0); }catch(e){ toast(e.message,'danger'); } });\n $('emergencyClearJobsBtn')?.addEventListener('click',async()=>{ if(!confirm('Emergency clean ALL job logs, including unfinished jobs?')) return; try{ const j=await post('/api/jobs/clear?force=1',{}); toastMessage('toast.emergencyJobLogsCleared','success',{deleted:j.deleted}); jobsPage=0; loadJobs(0); }catch(e){ toast(e.message,'danger'); } });\n\n"; diff --git a/pytorrent/static/styles.css b/pytorrent/static/styles.css index f241d86..22b17b9 100644 --- a/pytorrent/static/styles.css +++ b/pytorrent/static/styles.css @@ -3069,6 +3069,31 @@ body.mobile-mode .mobile-filter-bar { outline: 0; } + +.jobs-toolbar, +.jobs-toolbar-actions, +.jobs-toolbar-toggle { + display: flex; + flex-wrap: wrap; + gap: 0.5rem; +} + +.jobs-toolbar { + align-items: center; + justify-content: space-between; + margin-bottom: 0.5rem; +} + +.jobs-toolbar-actions, +.jobs-toolbar-toggle { + align-items: center; +} + +.jobs-show-details { + align-items: center; + margin-bottom: 0; +} + .jobs-table { min-width: 1080px; white-space: normal; diff --git a/pytorrent/templates/index.html b/pytorrent/templates/index.html index d533b9d..d134c99 100644 --- a/pytorrent/templates/index.html +++ b/pytorrent/templates/index.html @@ -190,11 +190,19 @@
-
- - - - Pending, running, done, failed, retry and cancel history. +
+
+ + + + Pending, running, done, failed, retry and cancel history. +
+
+ +
Loading jobs...
diff --git a/scripts/mock b/scripts/mock index bfc4533..c60e869 100755 --- a/scripts/mock +++ b/scripts/mock @@ -27,6 +27,8 @@ TRACKERS = [ "https://tracker.example.dev/announce", ] CLIENTS = ["qBittorrent/4.6", "Transmission/4.0", "libtorrent/2.0", "Deluge/2.1", "rtorrent/0.9"] +LARGE_TORRENT_DETAIL_THRESHOLD = 50_000 +LARGE_TORRENT_TICK_BATCH = 5_000 def xmlrpc_safe(value: Any) -> Any: @@ -54,6 +56,10 @@ class MockRtorrentState: def __init__(self, count: int, seed: int, state_file: Path | None = None, persist: bool = False, disk_total_gb: int = 4096, disk_used_percent: float = 68.0): self.lock = threading.RLock() self.started_at = time.time() + self.seed = seed + self.large_mode = count >= LARGE_TORRENT_DETAIL_THRESHOLD + self.last_tick_at = 0.0 + self.tick_cursor = 0 self.state_file = state_file self.persist = persist self.disk_total_bytes = max(1, int(disk_total_gb)) * 1024 * 1024 * 1024 @@ -96,6 +102,7 @@ class MockRtorrentState: down_rate = 0 if complete or not active else rng.randint(50_000, 8_000_000) up_rate = 0 if not active else rng.randint(5_000, 2_000_000) torrent = { + "mock_index": index, "hash": torrent_hash, "name": f"Mock Torrent {index + 1:05d} - {label}", "state": state, @@ -122,8 +129,8 @@ class MockRtorrentState: "last_activity": now - rng.randint(0, 7 * 86400), "completed_at": now - rng.randint(0, 180 * 86400) if complete else 0, "trackers": rng.sample(TRACKERS, k=rng.randint(1, len(TRACKERS))), - "files": self.make_files(index, size, completed, rng), - "peers_list": self.make_peers(rng), + "files": [] if self.large_mode else self.make_files(index, size, completed, rng), + "peers_list": [] if self.large_mode else self.make_peers(rng), } self.torrents.append(torrent) self.reindex() @@ -171,6 +178,34 @@ class MockRtorrentState: ]) return rows + + def detail_rng(self, torrent: dict[str, Any] | None, kind: str) -> random.Random: + """Create deterministic detail RNGs without storing large nested lists.""" + index = int((torrent or {}).get("mock_index") or 0) + return random.Random(f"{self.seed}:{kind}:{index}") + + def file_rows(self, torrent: dict[str, Any] | None) -> list[dict[str, Any]]: + """Return stored files or lazily generated files for high-volume mocks.""" + if not torrent: + return [] + files = torrent.get("files") or [] + if files: + return files + if not self.large_mode: + return [] + return self.make_files(int(torrent.get("mock_index") or 0), int(torrent.get("size") or 1), int(torrent.get("completed") or 0), self.detail_rng(torrent, "files")) + + def peer_rows(self, torrent: dict[str, Any] | None) -> list[list[Any]]: + """Return stored peers or lazily generated peers for high-volume mocks.""" + if not torrent: + return [] + peers = torrent.get("peers_list") or [] + if peers: + return peers + if not self.large_mode: + return [] + return self.make_peers(self.detail_rng(torrent, "peers")) + def reindex(self) -> None: self.by_hash = {str(t["hash"]): t for t in self.torrents} @@ -178,7 +213,14 @@ class MockRtorrentState: """Load optional persisted mock state for repeatable development sessions.""" data = json.loads(self.state_file.read_text(encoding="utf-8")) self.config.update(data.get("config") or {}) + self.seed = int(data.get("seed") or self.seed) self.torrents = list(data.get("torrents") or []) + self.large_mode = len(self.torrents) >= LARGE_TORRENT_DETAIL_THRESHOLD + for index, torrent in enumerate(self.torrents): + torrent.setdefault("mock_index", index) + if self.large_mode: + torrent.setdefault("files", []) + torrent.setdefault("peers_list", []) self.reindex() def save(self) -> None: @@ -187,13 +229,27 @@ class MockRtorrentState: return self.state_file.parent.mkdir(parents=True, exist_ok=True) tmp = self.state_file.with_suffix(".tmp") - tmp.write_text(json.dumps({"updated_at": human_now(), "config": self.config, "torrents": self.torrents}), encoding="utf-8") + tmp.write_text(json.dumps({"updated_at": human_now(), "seed": self.seed, "config": self.config, "torrents": self.torrents}), encoding="utf-8") tmp.replace(self.state_file) def tick(self) -> None: - """Advance speeds, totals and progress on each RPC request.""" + """Advance a bounded number of torrents so large mock sets stay responsive.""" now = int(time.time()) - for index, torrent in enumerate(self.torrents): + if now == int(self.last_tick_at): + return + self.last_tick_at = float(now) + total = len(self.torrents) + if not total: + return + if total <= LARGE_TORRENT_DETAIL_THRESHOLD: + indices = range(total) + else: + batch = min(LARGE_TORRENT_TICK_BATCH, total) + start = self.tick_cursor % total + self.tick_cursor = (start + batch) % total + indices = [(start + offset) % total for offset in range(batch)] + for index in indices: + torrent = self.torrents[index] if not torrent.get("state") or not torrent.get("is_active"): torrent["down_rate"] = 0 torrent["up_rate"] = 0 @@ -247,11 +303,11 @@ class MockRtorrentState: return [[self.torrent_row_value(t, f) for f in fields] for t in self.torrents] if method == "p.multicall": torrent = self.by_hash.get(str(args[0])) - return torrent.get("peers_list", []) if torrent else [] + return self.peer_rows(torrent) if torrent else [] if method == "f.multicall": torrent = self.by_hash.get(str(args[0])) fields = args[2:] - return [self.file_row(file, fields) for file in (torrent or {}).get("files", [])] + return [self.file_row(file, fields) for file in self.file_rows(torrent)] if method == "t.multicall": torrent = self.by_hash.get(str(args[0]) or str(args[1] if len(args) > 1 else "")) return [[tracker, 1, 120 + i, 30 + i, 5000 + i] for i, tracker in enumerate((torrent or {}).get("trackers", []))] @@ -458,6 +514,7 @@ class ScgiXmlRpcHandler(socketserver.BaseRequestHandler): class ThreadingScgiServer(socketserver.ThreadingTCPServer): allow_reuse_address = True daemon_threads = True + request_queue_size = 128 def fallback_db_path() -> Path: