diff --git a/pytorrent/db.py b/pytorrent/db.py index dfb6d96..3b47879 100644 --- a/pytorrent/db.py +++ b/pytorrent/db.py @@ -113,6 +113,25 @@ CREATE TABLE IF NOT EXISTS rtorrent_profiles ( ); CREATE INDEX IF NOT EXISTS idx_rtorrent_profiles_user_default_name ON rtorrent_profiles(user_id, is_default, name COLLATE NOCASE); + +CREATE TABLE IF NOT EXISTS profile_runtime_stats ( + profile_id INTEGER PRIMARY KEY, + user_id INTEGER NOT NULL, + torrent_count INTEGER DEFAULT 0, + total_size_bytes INTEGER DEFAULT 0, + completed_bytes INTEGER DEFAULT 0, + downloaded_bytes INTEGER DEFAULT 0, + uploaded_bytes INTEGER DEFAULT 0, + active_count INTEGER DEFAULT 0, + seeding_count INTEGER DEFAULT 0, + downloading_count INTEGER DEFAULT 0, + stopped_count INTEGER DEFAULT 0, + updated_at TEXT NOT NULL, + FOREIGN KEY(user_id) REFERENCES users(id), + FOREIGN KEY(profile_id) REFERENCES rtorrent_profiles(id) ON DELETE CASCADE +); +CREATE INDEX IF NOT EXISTS idx_profile_runtime_stats_user ON profile_runtime_stats(user_id, profile_id); + CREATE TABLE IF NOT EXISTS jobs ( id TEXT PRIMARY KEY, user_id INTEGER NOT NULL, diff --git a/pytorrent/migrations.py b/pytorrent/migrations.py index d1bb2c9..ad1ad3e 100644 --- a/pytorrent/migrations.py +++ b/pytorrent/migrations.py @@ -146,11 +146,36 @@ def migrate_profile_speed_limits_table(conn: sqlite3.Connection) -> bool: return existing is None +def migrate_profile_runtime_stats_table(conn: sqlite3.Connection) -> bool: + existing = conn.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='profile_runtime_stats'").fetchone() + conn.execute(""" + CREATE TABLE IF NOT EXISTS profile_runtime_stats ( + profile_id INTEGER PRIMARY KEY, + user_id INTEGER NOT NULL, + torrent_count INTEGER DEFAULT 0, + total_size_bytes INTEGER DEFAULT 0, + completed_bytes INTEGER DEFAULT 0, + downloaded_bytes INTEGER DEFAULT 0, + uploaded_bytes INTEGER DEFAULT 0, + active_count INTEGER DEFAULT 0, + seeding_count INTEGER DEFAULT 0, + downloading_count INTEGER DEFAULT 0, + stopped_count INTEGER DEFAULT 0, + updated_at TEXT NOT NULL, + FOREIGN KEY(user_id) REFERENCES users(id), + FOREIGN KEY(profile_id) REFERENCES rtorrent_profiles(id) ON DELETE CASCADE + ) + """) + conn.execute("CREATE INDEX IF NOT EXISTS idx_profile_runtime_stats_user ON profile_runtime_stats(user_id, profile_id)") + return existing is None + + MIGRATIONS: tuple[Migration, ...] = ( migrate_disk_monitor_preferences_to_profile_scope, migrate_profile_preferences_sidebar_columns, migrate_operation_log_split_retention, migrate_profile_speed_limits_table, + migrate_profile_runtime_stats_table, ) diff --git a/pytorrent/routes/profiles.py b/pytorrent/routes/profiles.py index d1233dd..346517a 100644 --- a/pytorrent/routes/profiles.py +++ b/pytorrent/routes/profiles.py @@ -2,6 +2,7 @@ from __future__ import annotations from ._shared import * from ..services.rtorrent.diagnostics import profile_diagnostics from ..services import auth +from ..utils import human_size @bp.get("/profiles") def profiles_list(): @@ -10,6 +11,13 @@ def profiles_list(): item = dict(row) # Note: Frontend actions can hide write-only operations without trusting this flag; backend still enforces permissions. item["can_write"] = auth.can_write_profile(int(item.get("id") or 0), auth.current_user_id() or default_user_id()) + stats = preferences.get_profile_runtime_stats(int(item.get("id") or 0)) + if stats: + stats["total_size_h"] = human_size(stats.get("total_size_bytes")) + stats["completed_h"] = human_size(stats.get("completed_bytes")) + stats["downloaded_h"] = human_size(stats.get("downloaded_bytes")) + stats["uploaded_h"] = human_size(stats.get("uploaded_bytes")) + item["runtime_stats"] = stats settings = backup_service.get_auto_backup_settings(default_user_id(), "profile", int(item.get("id") or 0)) item["profile_backup_enabled"] = bool(settings.get("enabled")) item["profile_backup_interval_hours"] = settings.get("interval_hours") @@ -46,7 +54,17 @@ def profiles_delete(profile_id: int): @bp.post("/profiles//activate") def profiles_activate(profile_id: int): try: - return ok({"profile": preferences.activate_profile(profile_id)}) + profile = preferences.activate_profile(profile_id) + stats_error = "" + try: + # Note: Profile overview metrics are cached only on user-initiated profile switch, not on every profile list render. + preferences.save_profile_runtime_stats(profile, rtorrent.list_torrents(profile), user_id=auth.current_user_id() or default_user_id()) + except Exception as exc: + stats_error = str(exc) + response = {"profile": profile} + if stats_error: + response["stats_error"] = stats_error + return ok(response) except Exception as exc: return jsonify({"ok": False, "error": str(exc)}), 404 diff --git a/pytorrent/routes/torrents.py b/pytorrent/routes/torrents.py index 6283006..f72447f 100644 --- a/pytorrent/routes/torrents.py +++ b/pytorrent/routes/torrents.py @@ -578,7 +578,9 @@ def _profile_transfer_payload(source_profile: dict, data: dict, *, require_hashe target_path = _clean_remote_transfer_path(requested_target_path or default_target_path) inside_allowed_root = bool(roots and any(_path_inside_root(target_path, root) for root in roots)) if not inside_allowed_root: - # Note: A metadata-only profile transfer does not require source-user write access, but it still uses a safe target default. + # Note: A chosen target path must stay inside the target profile roots even for metadata-only transfers. + if requested_target_path: + raise ValueError("Target path is outside the target profile download roots") target_path = default_target_path inside_allowed_root = bool(roots and any(_path_inside_root(target_path, root) for root in roots)) diff --git a/pytorrent/services/automation_rules.py b/pytorrent/services/automation_rules.py index 8579f2a..08ff3bc 100644 --- a/pytorrent/services/automation_rules.py +++ b/pytorrent/services/automation_rules.py @@ -408,7 +408,8 @@ def _automation_profile_transfer_payload(profile: dict[str, Any], eff: dict[str, if not target_profile: raise ValueError('Automation target profile does not exist') default_path = _safe_remote_path(rtorrent.default_download_path(target_profile)) - target_path = _safe_remote_path(str(eff.get('target_path') or eff.get('path') or default_path)) + requested_target_path = _safe_remote_path(str(eff.get('target_path') or eff.get('path') or '')) + target_path = requested_target_path or default_path roots = [default_path] try: prefs = get_disk_monitor_preferences(target_id, user_id=user_id) @@ -423,6 +424,8 @@ def _automation_profile_transfer_payload(profile: dict[str, Any], eff: dict[str, pass target_roots = [r for r in roots if r] if not any(_path_inside_root(target_path, root) for root in target_roots): + if requested_target_path: + raise ValueError('Automation target path is outside the target profile download roots') target_path = default_path requested_move_data = bool(eff.get('move_data')) move_data = False diff --git a/pytorrent/services/preferences.py b/pytorrent/services/preferences.py index 3328942..18962d8 100644 --- a/pytorrent/services/preferences.py +++ b/pytorrent/services/preferences.py @@ -577,3 +577,77 @@ def save_preferences(data: dict, user_id: int | None = None, profile_id: int | N if disk_payload is not None: save_disk_monitor_preferences(profile_id, disk_payload, user_id) return get_preferences(user_id, profile_id) + + +def _row_int(row: dict, key: str) -> int: + try: + return int(float(row.get(key) or 0)) + except (TypeError, ValueError): + return 0 + + +def profile_runtime_stats_from_rows(profile: dict, rows: list[dict], user_id: int | None = None) -> dict: + # Note: Stored profile stats are intentionally approximate and updated only when the user switches to that profile. + user_id = user_id or auth.current_user_id() or default_user_id() + total_size = completed = downloaded = uploaded = active = seeding = downloading = stopped = 0 + for row in rows or []: + size = _row_int(row, 'size') + total_size += size + completed += min(size, _row_int(row, 'completed_bytes')) if size else _row_int(row, 'completed_bytes') + downloaded += _row_int(row, 'down_total') + uploaded += _row_int(row, 'up_total') + status = str(row.get('status') or '').strip().lower() + state = bool(row.get('state')) + complete = bool(row.get('complete')) + if state: + active += 1 + if complete and state: + seeding += 1 + if not complete and state and status != 'queued': + downloading += 1 + if not state: + stopped += 1 + return { + 'profile_id': int(profile.get('id') or 0), + 'user_id': int(user_id), + 'torrent_count': len(rows or []), + 'total_size_bytes': total_size, + 'completed_bytes': completed, + 'downloaded_bytes': downloaded, + 'uploaded_bytes': uploaded, + 'active_count': active, + 'seeding_count': seeding, + 'downloading_count': downloading, + 'stopped_count': stopped, + 'updated_at': utcnow(), + } + + +def save_profile_runtime_stats(profile: dict, rows: list[dict], user_id: int | None = None) -> dict: + stats = profile_runtime_stats_from_rows(profile, rows, user_id=user_id) + with connect() as conn: + conn.execute( + """ + INSERT INTO profile_runtime_stats( + profile_id,user_id,torrent_count,total_size_bytes,completed_bytes,downloaded_bytes,uploaded_bytes, + active_count,seeding_count,downloading_count,stopped_count,updated_at + ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) + ON CONFLICT(profile_id) DO UPDATE SET + user_id=excluded.user_id, torrent_count=excluded.torrent_count, total_size_bytes=excluded.total_size_bytes, + completed_bytes=excluded.completed_bytes, downloaded_bytes=excluded.downloaded_bytes, uploaded_bytes=excluded.uploaded_bytes, + active_count=excluded.active_count, seeding_count=excluded.seeding_count, downloading_count=excluded.downloading_count, + stopped_count=excluded.stopped_count, updated_at=excluded.updated_at + """, + ( + stats['profile_id'], stats['user_id'], stats['torrent_count'], stats['total_size_bytes'], stats['completed_bytes'], + stats['downloaded_bytes'], stats['uploaded_bytes'], stats['active_count'], stats['seeding_count'], + stats['downloading_count'], stats['stopped_count'], stats['updated_at'], + ), + ) + return stats + + +def get_profile_runtime_stats(profile_id: int) -> dict | None: + with connect() as conn: + row = conn.execute("SELECT * FROM profile_runtime_stats WHERE profile_id=?", (int(profile_id),)).fetchone() + return dict(row) if row else None diff --git a/pytorrent/services/workers.py b/pytorrent/services/workers.py index b7311b6..371ef69 100644 --- a/pytorrent/services/workers.py +++ b/pytorrent/services/workers.py @@ -289,6 +289,12 @@ def _emit_disk_refresh_requested(profile_id: int, action_name: str, payload: dic _schedule_profile_disk_refresh(int(profile_id), len((payload or {}).get("hashes") or [])) def _execute(profile: dict, action_name: str, payload: dict, user_id: int | None = None): + def checkpoint(next_state: dict, current: int, total: int): + # Note: Checkpoint is defined before every action branch so profile-transfer jobs can resume safely. + job_id = payload.get("__job_id") + if job_id: + _checkpoint_job(str(job_id), next_state, current, total) + if action_name == "smart_queue_check": from . import smart_queue return smart_queue.check(profile, user_id=user_id or default_user_id(), force=True) @@ -315,11 +321,6 @@ def _execute(profile: dict, action_name: str, payload: dict, user_id: int | None disk_guard.assert_can_start_download(profile) state = payload.get("__resume_state") or {} - def checkpoint(next_state: dict, current: int, total: int): - job_id = payload.get("__job_id") - if job_id: - _checkpoint_job(str(job_id), next_state, current, total) - return rtorrent.action(profile, hashes, action_name, payload, checkpoint=checkpoint, resume_state=state) diff --git a/pytorrent/static/js/api.js b/pytorrent/static/js/api.js index a8ca136..56db230 100644 --- a/pytorrent/static/js/api.js +++ b/pytorrent/static/js/api.js @@ -1 +1 @@ -export const apiSource = " async function post(url,data,method='POST'){\n const res=await fetch(url,{method,headers:{'Content-Type':'application/json','Accept':'application/json'},body:JSON.stringify(data||{})});\n const text=await res.text();\n let json;\n try{ json=JSON.parse(text); }\n catch(e){\n const clean=(text||'').replace(/<[^>]+>/g,' ').replace(/\\s+/g,' ').trim().slice(0,180);\n throw new Error(clean?`Invalid server response (${res.status}): ${clean}`:`Invalid server response (${res.status})`);\n }\n if(!res.ok || !json.ok) throw new Error(json.error||`Operation failed (${res.status})`);\n return json;\n }\n\n async function runAction(action, extra={}){ const hashes=selectedHashes(); if(!hashes.length) return toastMessage('toast.noTorrentsSelected','warning'); let payload={hashes,...extra}; if(action==='move'){ openPathPicker('move'); return; } if(action==='profile_transfer'){ openProfileTransferModal(); return; } setBusy(true); try{ const j=await post(`/api/torrents/${action}`,payload); markQueuedJobs(j, hashes, action); if(action==='recheck'){ hashes.forEach(h=>{ const t=torrents.get(h); if(t) torrents.set(h,{...t,status:'Checking',hashing:1,message:'Force recheck queued'}); }); scheduleRender(true); } const parts=Number(j.bulk_parts||1); toastMessage('toast.actionQueued','success',{action,parts}); if(action==='set_label') await loadLabels(); }catch(e){toast(e.message,'danger');} finally{setBusy(false);} }\n function profileTransferTargetRow(profile){\n const name=profile.name||('rTorrent '+profile.id);\n return ``;\n }\n function selectedTorrentSummaryRows(hashes){\n const rows=hashes.slice(0,6).map(h=>{\n const t=torrents.get(h)||{};\n return `
${esc(t.name||h)}${esc(t.size_h||'')}
`;\n }).join('');\n const more=hashes.length>6?`+${hashes.length-6} more`:'';\n return rows+more;\n }\n function selectedTorrentBytes(hashes){\n return hashes.reduce((sum,h)=>sum+Number((torrents.get(h)||{}).size||0),0);\n }\n function humanBytes(bytes){\n let value=Number(bytes||0); const units=['B','KB','MB','GB','TB','PB']; let idx=0;\n while(value>=1024 && idx=10||idx===0?0:1)} ${units[idx]}`;\n }\n function setProfileTransferPermission(message, tone='muted'){\n const el=$('profileTransferPermissionNote');\n if(!el) return;\n el.className=`profile-transfer-permission form-text mt-2 text-${tone}`;\n el.textContent=message;\n }\n function setProfileTransferDiskInfo(html){\n const el=$('profileTransferDiskInfo');\n if(el) el.innerHTML=html;\n }\n function profileTransferPayloadBase(){\n return {\n target_profile_id:Number($('profileTransferTargetId')?.value||0),\n move_data:!!($('profileTransferMoveData')?.checked),\n label_mode:$('profileTransferLabelMode')?.value||'none',\n label_value:$('profileTransferLabelValue')?.value||'',\n post_action:$('profileTransferPostAction')?.value||'none'\n };\n }\n async function validateProfileTransferSelection(){\n const payload=profileTransferPayloadBase();\n const selectedSize=selectedTorrentBytes(selectedHashes());\n if(!payload.target_profile_id){\n setProfileTransferPermission('Choose a target profile. Torrent metadata can be moved without data-file write permission.');\n setProfileTransferDiskInfo('Select a target profile to see destination disk space.');\n return null;\n }\n setProfileTransferPermission(payload.move_data?'Checking data-move permissions...':'Only torrent metadata will be moved. Data files stay in the current location.', 'muted');\n try{\n const j=await post('/api/torrents/profile_transfer/validate',payload);\n const disk=j.disk||{};\n const free=Number(disk.free||0);\n const enough=!selectedSize || !free || free>=selectedSize;\n const diskTone=disk.ok?(enough?'success':'warning'):'warning';\n setProfileTransferDiskInfo(`
Destination: ${esc(j.target_path||'-')}
Free: ${esc(disk.free_h||'-')} / ${esc(disk.total_h||'-')} \u00b7 Selected: ${esc(humanBytes(selectedSize))}
${disk.warning?`
${esc(disk.warning)}
`:''}`);\n if(payload.move_data && j.move_data_allowed){\n setProfileTransferPermission(enough?'Data move is allowed for the destination path.':'Data move is allowed, but free space may be lower than selected torrent size.', enough?'success':'warning');\n } else if(payload.move_data){\n setProfileTransferPermission(`Data move is not allowed, so only torrent metadata will be moved. ${j.move_data_downgrade_reason||''}`.trim(), 'warning');\n }\n return j;\n }catch(e){\n setProfileTransferPermission(`Cannot validate data move. Only torrent metadata will be moved. ${e.message}`, 'warning');\n setProfileTransferDiskInfo('Destination disk space unavailable.');\n return {move_data_allowed:false,error:e.message};\n }\n }\n async function openProfileTransferModal(){\n const hashes=selectedHashes();\n if(!hashes.length) return toastMessage('toast.noTorrentsSelected','warning');\n const list=$('profileTransferList');\n const count=$('profileTransferCount');\n const torrentList=$('profileTransferTorrentList');\n if(count) count.textContent=String(hashes.length);\n if(torrentList) torrentList.innerHTML=selectedTorrentSummaryRows(hashes);\n if(list) list.innerHTML='Loading profiles...';\n setProfileTransferPermission('Choose a target profile. Torrent metadata can be moved without data-file write permission.');\n setProfileTransferDiskInfo('Select a target profile to see destination disk space.');\n try{\n const j=await (await fetch('/api/profiles',{cache:'no-store'})).json();\n const activeId=Number(j.active?.id || window.PYTORRENT?.activeProfile || activeProfileId || 0);\n const targets=(j.profiles||[]).filter(p=>Number(p.id)!==activeId && p.can_write!==false);\n if(list) list.innerHTML=targets.map(profileTransferTargetRow).join('') || '
No other writable profile is available.
';\n if($('profileTransferTargetId')) $('profileTransferTargetId').value='';\n if($('profileTransferMoveData')) $('profileTransferMoveData').checked=false;\n if($('profileTransferLabelMode')) $('profileTransferLabelMode').value='none';\n if($('profileTransferLabelValue')) { $('profileTransferLabelValue').value=''; $('profileTransferLabelValue').classList.add('d-none'); }\n if($('profileTransferPostAction')) $('profileTransferPostAction').value='none';\n new bootstrap.Modal($('profileTransferModal')).show();\n }catch(e){\n if(list) list.innerHTML=`
${esc(e.message)}
`;\n new bootstrap.Modal($('profileTransferModal')).show();\n }\n }\n async function submitProfileTransfer(){\n const hashes=selectedHashes();\n const payload={hashes,...profileTransferPayloadBase()};\n if(!hashes.length) return toastMessage('toast.noTorrentsSelected','warning');\n if(!payload.target_profile_id) return toast('Choose target profile.', 'warning');\n const btn=$('profileTransferBtn');\n buttonBusy(btn,true);\n try{\n const j=await post('/api/torrents/profile_transfer',payload);\n markQueuedJobs(j, hashes, 'profile_transfer');\n const parts=Number(j.bulk_parts||1);\n const downgraded=j.transfer_move_data_downgraded?' Data move was not permitted; only torrent metadata will be moved.':'';\n toast(`Move to profile queued (${parts} part${parts===1?'':'s'}).${downgraded}`,'success');\n bootstrap.Modal.getInstance($('profileTransferModal'))?.hide();\n }catch(e){ toast(e.message,'danger'); }\n finally{ buttonBusy(btn,false); }\n }\n $('profileTransferList')?.addEventListener('click',e=>{\n const btn=e.target.closest('.profile-transfer-card');\n if(!btn) return;\n document.querySelectorAll('.profile-transfer-card').forEach(x=>x.classList.remove('active'));\n btn.classList.add('active');\n if($('profileTransferTargetId')) $('profileTransferTargetId').value=btn.dataset.profileId||'';\n validateProfileTransferSelection();\n });\n $('profileTransferMoveData')?.addEventListener('change',validateProfileTransferSelection);\n $('profileTransferPostAction')?.addEventListener('change',validateProfileTransferSelection);\n $('profileTransferLabelMode')?.addEventListener('change',()=>{\n const custom=$('profileTransferLabelMode')?.value==='custom';\n $('profileTransferLabelValue')?.classList.toggle('d-none', !custom);\n });\n $('profileTransferBtn')?.addEventListener('click',submitProfileTransfer);\n\n function flag(iso){ const code=String(iso||'').toLowerCase(); return code?` ${esc(code.toUpperCase())}`:'-'; }\n function table(headers,rows,extraClass=''){ const cls=extraClass?` ${extraClass}`:''; return `${headers.map(h=>``).join('')}${rows.map(r=>`${r.map(c=>``).join('')}`).join('')}
${esc(h)}
${c}
`; }\n function responsiveTable(headers,rows,extraClass=''){ return `
${table(headers,rows,extraClass)}
`; }\n function downloadJson(filename, data){ const blob=new Blob([JSON.stringify(data,null,2)],{type:'application/json'}); const url=URL.createObjectURL(blob); const a=document.createElement('a'); a.href=url; a.download=filename; document.body.appendChild(a); a.click(); a.remove(); setTimeout(()=>URL.revokeObjectURL(url),500); }\n function filenameFromResponse(res, fallback){ const cd=res.headers.get('Content-Disposition')||''; const m=cd.match(/filename\\*=UTF-8''([^;]+)|filename=\"?([^\";]+)\"?/i); try{ return decodeURIComponent(m?.[1]||m?.[2]||fallback); }catch(e){ return m?.[1]||m?.[2]||fallback; } }\n async function openTemporaryDownload(url, data=null, method='POST', label='Preparing download...'){\n // Note: Link creation is intentionally light; real file work starts when the browser opens the temporary /download URL.\n setBusy(true, label);\n try{\n const options = {method, headers:{'Accept':'application/json'}};\n if(data !== null){\n options.headers['Content-Type']='application/json';\n options.body=JSON.stringify(data || {});\n }\n const res = await fetch(url, options);\n const json = await res.json().catch(()=>({}));\n if(!res.ok || !json.ok) throw new Error(json.error || `Download link failed (${res.status})`);\n if(!json.url) throw new Error('Download link response did not include a URL');\n const loader=$('globalLoader');\n const span=loader?.querySelector('span:last-child');\n if(span) span.textContent='Starting browser download...';\n // Note: Do not call setBusy(true) again here; this updates the active loader without increasing the busy counter.\n window.location.href = json.url;\n toastMessage('toast.downloadStarted','success');\n setTimeout(()=>setBusy(false), 1200);\n return json;\n } catch(e) {\n setBusy(false);\n throw e;\n }\n }\n async function downloadResponse(url, options={}, fallback='download.bin', label='Preparing download...'){\n setBusy(true,label);\n try{\n const res=await fetch(url,options);\n if(!res.ok){ const j=await res.json().catch(()=>({})); throw new Error(j.error||`Download failed: HTTP ${res.status}`); }\n const total=Number(res.headers.get('Content-Length')||0);\n const name=filenameFromResponse(res,fallback);\n let blob;\n if(res.body){\n const reader=res.body.getReader();\n const chunks=[]; let received=0;\n while(true){\n const {done,value}=await reader.read();\n if(done) break;\n chunks.push(value); received += value.length;\n const loader=$('globalLoader');\n const span=loader?.querySelector('span:last-child');\n if(span){\n if(total){\n const pct=Math.max(0,Math.min(100,Math.round((received/total)*100)));\n span.textContent=`Downloading ${pct}%`;\n } else {\n span.textContent=`Downloading ${(received/1024/1024).toFixed(1)} MB`;\n }\n }\n }\n blob=new Blob(chunks);\n } else {\n blob=await res.blob();\n }\n const obj=URL.createObjectURL(blob);\n const a=document.createElement('a'); a.href=obj; a.download=name; document.body.appendChild(a); a.click(); a.remove(); setTimeout(()=>URL.revokeObjectURL(obj),1000);\n toastMessage('toast.downloadStarted','success');\n } finally { setBusy(false); }\n }\n async function downloadTorrentFiles(hashes=null){\n const list=hashes||selectedHashes();\n if(!list.length) return toastMessage('toast.noTorrentsSelected','warning');\n if(list.length===1){\n return openTemporaryDownload(\n `/api/torrents/${encodeURIComponent(list[0])}/torrent-file/link`,\n null,\n 'GET',\n 'Preparing .torrent file...'\n ).catch(e=>toast(e.message,'danger'));\n }\n return openTemporaryDownload(\n '/api/torrents/torrent-files.zip/link',\n {hashes:list},\n 'POST',\n `Preparing torrent ZIP (${list.length})...`\n ).catch(e=>toast(e.message,'danger'));\n }\n"; +export const apiSource = " async function post(url,data,method='POST'){\n const res=await fetch(url,{method,headers:{'Content-Type':'application/json','Accept':'application/json'},body:JSON.stringify(data||{})});\n const text=await res.text();\n let json;\n try{ json=JSON.parse(text); }\n catch(e){\n const clean=(text||'').replace(/<[^>]+>/g,' ').replace(/\\s+/g,' ').trim().slice(0,180);\n throw new Error(clean?`Invalid server response (${res.status}): ${clean}`:`Invalid server response (${res.status})`);\n }\n if(!res.ok || !json.ok) throw new Error(json.error||`Operation failed (${res.status})`);\n return json;\n }\n\n async function runAction(action, extra={}){ const hashes=selectedHashes(); if(!hashes.length) return toastMessage('toast.noTorrentsSelected','warning'); let payload={hashes,...extra}; if(action==='move'){ openPathPicker('move'); return; } if(action==='profile_transfer'){ openProfileTransferModal(); return; } setBusy(true); try{ const j=await post(`/api/torrents/${action}`,payload); markQueuedJobs(j, hashes, action); if(action==='recheck'){ hashes.forEach(h=>{ const t=torrents.get(h); if(t) torrents.set(h,{...t,status:'Checking',hashing:1,message:'Force recheck queued'}); }); scheduleRender(true); } const parts=Number(j.bulk_parts||1); toastMessage('toast.actionQueued','success',{action,parts}); if(action==='set_label') await loadLabels(); }catch(e){toast(e.message,'danger');} finally{setBusy(false);} }\n function profileTransferTargetRow(profile){\n const name=profile.name||('rTorrent '+profile.id);\n return ``;\n }\n function selectedTorrentSummaryRows(hashes){\n const rows=hashes.slice(0,6).map(h=>{\n const t=torrents.get(h)||{};\n return `
${esc(t.name||h)}${esc(t.size_h||'')}
`;\n }).join('');\n const more=hashes.length>6?`+${hashes.length-6} more`:'';\n return rows+more;\n }\n function selectedTorrentBytes(hashes){\n return hashes.reduce((sum,h)=>sum+Number((torrents.get(h)||{}).size||0),0);\n }\n function humanBytes(bytes){\n let value=Number(bytes||0); const units=['B','KB','MB','GB','TB','PB']; let idx=0;\n while(value>=1024 && idx=10||idx===0?0:1)} ${units[idx]}`;\n }\n function setProfileTransferPermission(message, tone='muted'){\n const el=$('profileTransferPermissionNote');\n if(!el) return;\n el.className=`profile-transfer-permission form-text mt-2 text-${tone}`;\n el.textContent=message;\n }\n function setProfileTransferDiskInfo(html){\n const el=$('profileTransferDiskInfo');\n if(el) el.innerHTML=html;\n }\n function renderProfileTransferPathHints(paths=[]){\n const box=$('profileTransferPathHints');\n if(!box) return;\n const clean=[...new Set((paths||[]).map(p=>String(p||'').trim()).filter(Boolean))];\n box.innerHTML=clean.length?clean.map(p=>``).join(' '):'No cached target roots.';\n }\n function setProfileTransferTargetPath(path, overwrite=false){\n const input=$('profileTransferTargetPath');\n if(input && (overwrite || !input.value.trim())) input.value=path||'';\n }\n function profileTransferPayloadBase(){\n return {\n target_profile_id:Number($('profileTransferTargetId')?.value||0),\n move_data:!!($('profileTransferMoveData')?.checked),\n label_mode:$('profileTransferLabelMode')?.value||'none',\n label_value:$('profileTransferLabelValue')?.value||'',\n post_action:$('profileTransferPostAction')?.value||'none',\n target_path:($('profileTransferTargetPath')?.value||'').trim()\n };\n }\n async function validateProfileTransferSelection(){\n const payload=profileTransferPayloadBase();\n const selectedSize=selectedTorrentBytes(selectedHashes());\n if(!payload.target_profile_id){\n setProfileTransferPermission('Choose a target profile. Torrent metadata can be moved without data-file write permission.');\n setProfileTransferDiskInfo('Select a target profile to see destination disk space.');\n renderProfileTransferPathHints([]);\n return null;\n }\n setProfileTransferPermission(payload.move_data?'Checking data-move permissions...':'Only torrent metadata will be moved. Data files stay in the current location.', 'muted');\n try{\n const j=await post('/api/torrents/profile_transfer/validate',payload);\n const disk=j.disk||{};\n const free=Number(disk.free||0);\n const enough=!selectedSize || !free || free>=selectedSize;\n const diskTone=disk.ok?(enough?'success':'warning'):'warning';\n setProfileTransferTargetPath(j.target_path||'', false);\n renderProfileTransferPathHints(j.target_allowed_roots||[]);\n setProfileTransferDiskInfo(`
Destination: ${esc(j.target_path||'-')}
Free: ${esc(disk.free_h||'-')} / ${esc(disk.total_h||'-')} \u00b7 Selected: ${esc(humanBytes(selectedSize))}
${disk.warning?`
${esc(disk.warning)}
`:''}`);\n if(payload.move_data && j.move_data_allowed){\n setProfileTransferPermission(enough?'Data move is allowed for the destination path.':'Data move is allowed, but free space may be lower than selected torrent size.', enough?'success':'warning');\n } else if(payload.move_data){\n setProfileTransferPermission(`Data move is not allowed, so only torrent metadata will be moved. ${j.move_data_downgrade_reason||''}`.trim(), 'warning');\n }\n return j;\n }catch(e){\n setProfileTransferPermission(`Cannot validate data move. Only torrent metadata will be moved. ${e.message}`, 'warning');\n setProfileTransferDiskInfo('Destination disk space unavailable.');\n return {move_data_allowed:false,error:e.message};\n }\n }\n async function openProfileTransferModal(){\n const hashes=selectedHashes();\n if(!hashes.length) return toastMessage('toast.noTorrentsSelected','warning');\n const list=$('profileTransferList');\n const count=$('profileTransferCount');\n const torrentList=$('profileTransferTorrentList');\n if(count) count.textContent=String(hashes.length);\n if(torrentList) torrentList.innerHTML=selectedTorrentSummaryRows(hashes);\n if(list) list.innerHTML='Loading profiles...';\n setProfileTransferPermission('Choose a target profile. Torrent metadata can be moved without data-file write permission.');\n setProfileTransferDiskInfo('Select a target profile to see destination disk space.');\n renderProfileTransferPathHints([]);\n try{\n const j=await (await fetch('/api/profiles',{cache:'no-store'})).json();\n const activeId=Number(j.active?.id || window.PYTORRENT?.activeProfile || activeProfileId || 0);\n const targets=(j.profiles||[]).filter(p=>Number(p.id)!==activeId && p.can_write!==false);\n if(list) list.innerHTML=targets.map(profileTransferTargetRow).join('') || '
No other writable profile is available.
';\n if($('profileTransferTargetId')) $('profileTransferTargetId').value='';\n if($('profileTransferTargetPath')) $('profileTransferTargetPath').value='';\n if($('profileTransferMoveData')) $('profileTransferMoveData').checked=false;\n if($('profileTransferLabelMode')) $('profileTransferLabelMode').value='none';\n if($('profileTransferLabelValue')) { $('profileTransferLabelValue').value=''; $('profileTransferLabelValue').classList.add('d-none'); }\n if($('profileTransferPostAction')) $('profileTransferPostAction').value='none';\n new bootstrap.Modal($('profileTransferModal')).show();\n }catch(e){\n if(list) list.innerHTML=`
${esc(e.message)}
`;\n new bootstrap.Modal($('profileTransferModal')).show();\n }\n }\n async function submitProfileTransfer(){\n const hashes=selectedHashes();\n const payload={hashes,...profileTransferPayloadBase()};\n if(!hashes.length) return toastMessage('toast.noTorrentsSelected','warning');\n if(!payload.target_profile_id) return toast('Choose target profile.', 'warning');\n const btn=$('profileTransferBtn');\n buttonBusy(btn,true);\n try{\n const j=await post('/api/torrents/profile_transfer',payload);\n markQueuedJobs(j, hashes, 'profile_transfer');\n const parts=Number(j.bulk_parts||1);\n const downgraded=j.transfer_move_data_downgraded?' Data move was not permitted; only torrent metadata will be moved.':'';\n toast(`Move to profile queued (${parts} part${parts===1?'':'s'}).${downgraded}`,'success');\n bootstrap.Modal.getInstance($('profileTransferModal'))?.hide();\n }catch(e){ toast(e.message,'danger'); }\n finally{ buttonBusy(btn,false); }\n }\n $('profileTransferList')?.addEventListener('click',e=>{\n const btn=e.target.closest('.profile-transfer-card');\n if(!btn) return;\n document.querySelectorAll('.profile-transfer-card').forEach(x=>x.classList.remove('active'));\n btn.classList.add('active');\n if($('profileTransferTargetId')) $('profileTransferTargetId').value=btn.dataset.profileId||'';\n validateProfileTransferSelection();\n });\n $('profileTransferMoveData')?.addEventListener('change',validateProfileTransferSelection);\n $('profileTransferTargetPath')?.addEventListener('input',()=>{ clearTimeout(window.__profileTransferPathTimer); window.__profileTransferPathTimer=setTimeout(validateProfileTransferSelection, 350); });\n $('profileTransferPathHints')?.addEventListener('click',e=>{ const btn=e.target.closest('.profile-transfer-root'); if(!btn) return; setProfileTransferTargetPath(btn.dataset.path||'', true); validateProfileTransferSelection(); });\n $('profileTransferPostAction')?.addEventListener('change',validateProfileTransferSelection);\n $('profileTransferLabelMode')?.addEventListener('change',()=>{\n const custom=$('profileTransferLabelMode')?.value==='custom';\n $('profileTransferLabelValue')?.classList.toggle('d-none', !custom);\n });\n $('profileTransferBtn')?.addEventListener('click',submitProfileTransfer);\n\n function flag(iso){ const code=String(iso||'').toLowerCase(); return code?` ${esc(code.toUpperCase())}`:'-'; }\n function table(headers,rows,extraClass=''){ const cls=extraClass?` ${extraClass}`:''; return `${headers.map(h=>``).join('')}${rows.map(r=>`${r.map(c=>``).join('')}`).join('')}
${esc(h)}
${c}
`; }\n function responsiveTable(headers,rows,extraClass=''){ return `
${table(headers,rows,extraClass)}
`; }\n function downloadJson(filename, data){ const blob=new Blob([JSON.stringify(data,null,2)],{type:'application/json'}); const url=URL.createObjectURL(blob); const a=document.createElement('a'); a.href=url; a.download=filename; document.body.appendChild(a); a.click(); a.remove(); setTimeout(()=>URL.revokeObjectURL(url),500); }\n function filenameFromResponse(res, fallback){ const cd=res.headers.get('Content-Disposition')||''; const m=cd.match(/filename\\*=UTF-8''([^;]+)|filename=\"?([^\";]+)\"?/i); try{ return decodeURIComponent(m?.[1]||m?.[2]||fallback); }catch(e){ return m?.[1]||m?.[2]||fallback; } }\n async function openTemporaryDownload(url, data=null, method='POST', label='Preparing download...'){\n // Note: Link creation is intentionally light; real file work starts when the browser opens the temporary /download URL.\n setBusy(true, label);\n try{\n const options = {method, headers:{'Accept':'application/json'}};\n if(data !== null){\n options.headers['Content-Type']='application/json';\n options.body=JSON.stringify(data || {});\n }\n const res = await fetch(url, options);\n const json = await res.json().catch(()=>({}));\n if(!res.ok || !json.ok) throw new Error(json.error || `Download link failed (${res.status})`);\n if(!json.url) throw new Error('Download link response did not include a URL');\n const loader=$('globalLoader');\n const span=loader?.querySelector('span:last-child');\n if(span) span.textContent='Starting browser download...';\n // Note: Do not call setBusy(true) again here; this updates the active loader without increasing the busy counter.\n window.location.href = json.url;\n toastMessage('toast.downloadStarted','success');\n setTimeout(()=>setBusy(false), 1200);\n return json;\n } catch(e) {\n setBusy(false);\n throw e;\n }\n }\n async function downloadResponse(url, options={}, fallback='download.bin', label='Preparing download...'){\n setBusy(true,label);\n try{\n const res=await fetch(url,options);\n if(!res.ok){ const j=await res.json().catch(()=>({})); throw new Error(j.error||`Download failed: HTTP ${res.status}`); }\n const total=Number(res.headers.get('Content-Length')||0);\n const name=filenameFromResponse(res,fallback);\n let blob;\n if(res.body){\n const reader=res.body.getReader();\n const chunks=[]; let received=0;\n while(true){\n const {done,value}=await reader.read();\n if(done) break;\n chunks.push(value); received += value.length;\n const loader=$('globalLoader');\n const span=loader?.querySelector('span:last-child');\n if(span){\n if(total){\n const pct=Math.max(0,Math.min(100,Math.round((received/total)*100)));\n span.textContent=`Downloading ${pct}%`;\n } else {\n span.textContent=`Downloading ${(received/1024/1024).toFixed(1)} MB`;\n }\n }\n }\n blob=new Blob(chunks);\n } else {\n blob=await res.blob();\n }\n const obj=URL.createObjectURL(blob);\n const a=document.createElement('a'); a.href=obj; a.download=name; document.body.appendChild(a); a.click(); a.remove(); setTimeout(()=>URL.revokeObjectURL(obj),1000);\n toastMessage('toast.downloadStarted','success');\n } finally { setBusy(false); }\n }\n async function downloadTorrentFiles(hashes=null){\n const list=hashes||selectedHashes();\n if(!list.length) return toastMessage('toast.noTorrentsSelected','warning');\n if(list.length===1){\n return openTemporaryDownload(\n `/api/torrents/${encodeURIComponent(list[0])}/torrent-file/link`,\n null,\n 'GET',\n 'Preparing .torrent file...'\n ).catch(e=>toast(e.message,'danger'));\n }\n return openTemporaryDownload(\n '/api/torrents/torrent-files.zip/link',\n {hashes:list},\n 'POST',\n `Preparing torrent ZIP (${list.length})...`\n ).catch(e=>toast(e.message,'danger'));\n }\n"; diff --git a/pytorrent/static/js/automationRules.js b/pytorrent/static/js/automationRules.js index df2305c..799dfda 100644 --- a/pytorrent/static/js/automationRules.js +++ b/pytorrent/static/js/automationRules.js @@ -1 +1 @@ -export const automationRulesSource = " function automationCondition(){\n const type=$('autoConditionType')?.value||'completed';\n const cond={type, negate:!!$('autoCondNegate')?.checked};\n if(type==='no_seeds'){ cond.seeds=Number($('autoCondSeeds')?.value||0); cond.minutes=Number($('autoCondMinutes')?.value||0); }\n if(type==='ratio_gte') cond.ratio=Number($('autoCondRatio')?.value||1);\n // Note: Progress conditions compare the torrent completion percentage stored in the live torrent row.\n if(type==='progress_gte'||type==='progress_lte') cond.progress=Number($('autoCondProgress')?.value||0);\n if(type==='label_missing'||type==='label_has') cond.label=$('autoCondLabel')?.value||'';\n if(type==='status') cond.status=$('autoCondStatus')?.value||'Seeding';\n if(type==='path_contains') cond.text=$('autoCondText')?.value||'';\n return cond;\n }\n\n function automationEffect(){\n const type=$('autoEffectType')?.value||'add_label';\n const eff={type};\n if(type==='move'){\n eff.path=$('autoEffectPath')?.value||'';\n eff.move_data=!!$('autoMoveData')?.checked;\n eff.recheck=!!$('autoMoveRecheck')?.checked;\n eff.keep_seeding=!!$('autoMoveKeepSeeding')?.checked;\n }\n if(type==='profile_transfer'){\n eff.target_profile_id=Number($('autoProfileTransferTargetId')?.value||0);\n eff.move_data=!!$('autoProfileTransferMoveData')?.checked;\n eff.post_action=$('autoProfileTransferPostAction')?.value||'none';\n eff.label_mode=$('autoProfileTransferLabelMode')?.value||'none';\n eff.label_value=$('autoProfileTransferLabelValue')?.value||'';\n }\n if(type==='add_label'||type==='remove_label') eff.label=$('autoEffectLabel')?.value||'';\n if(type==='set_labels') eff.labels=$('autoEffectLabels')?.value||'';\n return eff;\n }\n\n function updateAutomationForm(){\n const ct=$('autoConditionType')?.value||'';\n document.querySelectorAll('[data-auto-cond]').forEach(el=>el.classList.toggle('d-none', !el.dataset.autoCond.split(',').includes(ct)));\n const et=$('autoEffectType')?.value||'';\n document.querySelectorAll('[data-auto-effect]').forEach(el=>el.classList.toggle('d-none', !el.dataset.autoEffect.split(',').includes(et)));\n }\n\n function conditionText(c={}){\n const base=c.type==='no_seeds'?`seeds <= ${c.seeds||0} for ${c.minutes||0} min`:c.type==='ratio_gte'?`ratio >= ${c.ratio}`:c.type==='progress_gte'?`progress >= ${c.progress||0}%`:c.type==='progress_lte'?`progress <= ${c.progress||0}%`:c.type==='label_missing'?`missing label ${c.label||''}`:c.type==='label_has'?`has label ${c.label||''}`:c.type==='status'?`status = ${c.status||''}`:c.type==='path_contains'?`path contains ${c.text||''}`:'completed';\n return c.negate?`NOT (${base})`:base;\n }\n function effectText(e={}){\n if(e.type==='move'){\n const flags=[];\n if(e.move_data) flags.push('move data');\n if(e.recheck) flags.push('recheck');\n if(e.keep_seeding) flags.push('keep seeding');\n return `move to ${e.path||'default path'}${flags.length?` (${flags.join(', ')})`:''}`;\n }\n if(e.type==='profile_transfer'){\n const flags=[];\n if(e.move_data) flags.push('move data if allowed');\n if(e.post_action && e.post_action!=='none') flags.push(e.post_action);\n if(e.label_mode && e.label_mode!=='none') flags.push(`label ${e.label_mode}`);\n return `move to profile #${e.target_profile_id||'?'}${flags.length?` (${flags.join(', ')})`:''}`;\n }\n return e.type==='add_label'?`add label ${e.label||''}`:e.type==='remove_label'?`remove label ${e.label||''}`:e.type==='set_labels'?`set labels ${e.labels||''}`:e.type;\n }\n function ruleSummary(r){\n const cs=(r.conditions||[]).map(conditionText).join(' + ')||'no conditions';\n const es=(r.effects||[]).map(effectText).join(' \u2192 ')||'no actions';\n return `${cs} \u2192 ${es}`;\n }\n\n function renderAutomationBuilder(){\n const cBox=$('automationConditionList');\n if(cBox) cBox.innerHTML=automationConditions.length?automationConditions.map((c,i)=>`IF ${esc(conditionText(c))}`).join(''):'No conditions added yet.';\n const eBox=$('automationEffectList');\n if(eBox) eBox.innerHTML=automationEffects.length?automationEffects.map((e,i)=>`${i+1} ${esc(effectText(e))}`).join(''):'No actions added yet.';\n }\n function resetAutomationForm(){\n if($('autoEditId')) $('autoEditId').value='';\n if($('autoName')) $('autoName').value='';\n if($('autoEnabled')) $('autoEnabled').checked=true;\n if($('autoCooldown')) $('autoCooldown').value='60';\n automationConditions=[]; automationEffects=[];\n $('automationCancelEditBtn')?.classList.add('d-none');\n if($('automationSaveBtn')) $('automationSaveBtn').innerHTML=' Save rule';\n renderAutomationBuilder(); updateAutomationForm();\n }\n function editAutomationRule(rule){\n if(!rule) return;\n if($('autoEditId')) $('autoEditId').value=rule.id||'';\n if($('autoName')) $('autoName').value=rule.name||'';\n if($('autoEnabled')) $('autoEnabled').checked=!!rule.enabled;\n if($('autoCooldown')) $('autoCooldown').value=rule.cooldown_minutes ?? 60;\n automationConditions=Array.isArray(rule.conditions)?JSON.parse(JSON.stringify(rule.conditions)):[];\n automationEffects=Array.isArray(rule.effects)?JSON.parse(JSON.stringify(rule.effects)):[];\n $('automationCancelEditBtn')?.classList.remove('d-none');\n if($('automationSaveBtn')) $('automationSaveBtn').innerHTML=' Update rule';\n renderAutomationBuilder();\n }\n\n function summarizeActionObject(a={}){\n if(a.error) return `${esc(a.error)}`;\n const count=a.count || a.result?.count || a.result?.results?.length || '';\n const parts=[];\n if(a.type) parts.push(a.type);\n if(count) parts.push(`${count} torrent(s)`);\n if(a.path) parts.push(a.path);\n if(a.label) parts.push(`label ${a.label}`);\n if(a.labels) parts.push(`labels ${a.labels}`);\n if(a.move_data) parts.push('move data');\n if(a.recheck) parts.push('recheck');\n if(a.keep_seeding) parts.push('keep seeding');\n return `${esc(parts.join(' \u00b7 ')||'action')}`;\n }\n function automationHistoryActions(raw){\n let actions=[];\n try{ actions=JSON.parse(raw||'[]'); }catch(e){ return `
${esc(raw||'')}
`; }\n if(!Array.isArray(actions)) actions=[actions];\n const summary=actions.map(summarizeActionObject).join(' ');\n const details=esc(JSON.stringify(actions,null,2));\n // Note: Large automation payloads are collapsed so JSON never stretches the modal width.\n return `
${summary||'No actions'}
${details}
`;\n }\n\n function renderAutomationHistory(hist=[]){\n if(!$('automationHistory')) return;\n const toolbar='
';\n const rows=hist.map(h=>[humanDateCell(h.created_at),esc(h.rule_name||''),esc(h.torrent_name||h.torrent_hash||''),automationHistoryActions(h.actions_json||'')]);\n // Note: Automation history uses the shared responsive table wrapper so it stays inside narrow mobile modals.\n const body=hist.length?responsiveTable(['Time','Rule','Torrent / batch','Actions'],rows,'automation-history-table'):'
No automation history yet.
';\n $('automationHistory').innerHTML=toolbar+body;\n }\n\n async function clearAutomationHistory(){\n if(!confirm('Clear automation history?')) return;\n setBusy(true);\n try{ const j=await fetch('/api/automations/history',{method:'DELETE'}).then(r=>r.json()); if(!j.ok) throw new Error(j.error||'Clear automation history failed'); toastMessage('toast.automationLogsDeleted','success',{deleted:j.deleted}); renderAutomationHistory(j.history||[]); }\n catch(e){ toast(e.message,'danger'); }\n finally{ setBusy(false); }\n }\n\n async function exportAutomations(){\n try{ const j=await (await fetch('/api/automations/export')).json(); if(!j.ok) throw new Error(j.error||'Automation export failed'); downloadJson(`pytorrent-automation-rules-${new Date().toISOString().slice(0,10)}.json`, j.export||j); toast(`Exported ${j.count||0} automation rule(s)`,'success'); }\n catch(e){ toast(e.message,'danger'); }\n }\n\n async function importAutomations(file){\n if(!file) return;\n try{ const payload=JSON.parse(await file.text()); const j=await post('/api/automations/import',payload); toast(`Imported ${j.imported||0} automation rule(s)`,'success'); await loadAutomations(); }\n catch(e){ toast(e.message||'Automation import failed','danger'); }\n finally{ if($('automationImportFile')) $('automationImportFile').value=''; }\n }\n\n async function loadAutomations(){\n const j=await fetch('/api/automations').then(r=>r.json());\n const rules=j.rules||[], hist=j.history||[];\n automationRulesCache=rules;\n if($('automationManager')) $('automationManager').innerHTML=rules.length?rules.map(r=>{\n const enabled=!!r.enabled;\n const toggleTitle=enabled?'Disable automation':'Enable automation';\n const toggleIcon=enabled?'fa-toggle-on':'fa-toggle-off';\n const toggleClass=enabled?'btn-outline-warning':'btn-outline-success';\n const owner=r.owner_label?` ${esc(r.owner_label)}`:'';\n return `
${esc(r.name)} ${enabled?'on':'off'} ${owner}
${esc(ruleSummary(r))} \u00b7 cooldown ${esc(r.cooldown_minutes||0)} min
`;\n }).join(''):'
No automation rules.
';\n renderAutomationHistory(hist);\n }\n\n async function toggleAutomationRule(rule){\n if(!rule) return;\n const payload={...rule, enabled:!rule.enabled};\n // Note: Toggle keeps the rule definition unchanged and only switches automatic execution on or off.\n setBusy(true);\n try{ await post('/api/automations',payload); toast(payload.enabled?'Automation enabled':'Automation disabled','success'); await loadAutomations(); }\n catch(e){ toast(e.message,'danger'); }\n finally{ setBusy(false); }\n }\n\n async function saveAutomation(){\n const currentCond=automationCondition();\n const currentEff=automationEffect();\n const conditions=automationConditions.length?automationConditions:[currentCond];\n const effects=automationEffects.length?automationEffects:[currentEff];\n const payload={id:Number($('autoEditId')?.value||0)||undefined,name:$('autoName')?.value||'Automation rule',enabled:!!$('autoEnabled')?.checked,cooldown_minutes:Number($('autoCooldown')?.value||60),conditions,effects};\n setBusy(true);\n try{ await post('/api/automations',payload); toast(payload.id?'Automation rule updated':'Automation rule saved','success'); resetAutomationForm(); await loadAutomations(); }\n catch(e){toast(e.message,'danger');}\n finally{setBusy(false);}\n }\n\n\n"; +export const automationRulesSource = " function automationCondition(){\n const type=$('autoConditionType')?.value||'completed';\n const cond={type, negate:!!$('autoCondNegate')?.checked};\n if(type==='no_seeds'){ cond.seeds=Number($('autoCondSeeds')?.value||0); cond.minutes=Number($('autoCondMinutes')?.value||0); }\n if(type==='ratio_gte') cond.ratio=Number($('autoCondRatio')?.value||1);\n // Note: Progress conditions compare the torrent completion percentage stored in the live torrent row.\n if(type==='progress_gte'||type==='progress_lte') cond.progress=Number($('autoCondProgress')?.value||0);\n if(type==='label_missing'||type==='label_has') cond.label=$('autoCondLabel')?.value||'';\n if(type==='status') cond.status=$('autoCondStatus')?.value||'Seeding';\n if(type==='path_contains') cond.text=$('autoCondText')?.value||'';\n return cond;\n }\n\n function automationEffect(){\n const type=$('autoEffectType')?.value||'add_label';\n const eff={type};\n if(type==='move'){\n eff.path=$('autoEffectPath')?.value||'';\n eff.move_data=!!$('autoMoveData')?.checked;\n eff.recheck=!!$('autoMoveRecheck')?.checked;\n eff.keep_seeding=!!$('autoMoveKeepSeeding')?.checked;\n }\n if(type==='profile_transfer'){\n eff.target_profile_id=Number($('autoProfileTransferTargetId')?.value||0);\n eff.target_path=($('autoProfileTransferTargetPath')?.value||'').trim();\n eff.move_data=!!$('autoProfileTransferMoveData')?.checked;\n eff.post_action=$('autoProfileTransferPostAction')?.value||'none';\n eff.label_mode=$('autoProfileTransferLabelMode')?.value||'none';\n eff.label_value=$('autoProfileTransferLabelValue')?.value||'';\n }\n if(type==='add_label'||type==='remove_label') eff.label=$('autoEffectLabel')?.value||'';\n if(type==='set_labels') eff.labels=$('autoEffectLabels')?.value||'';\n return eff;\n }\n\n function updateAutomationForm(){\n const ct=$('autoConditionType')?.value||'';\n document.querySelectorAll('[data-auto-cond]').forEach(el=>el.classList.toggle('d-none', !el.dataset.autoCond.split(',').includes(ct)));\n const et=$('autoEffectType')?.value||'';\n document.querySelectorAll('[data-auto-effect]').forEach(el=>el.classList.toggle('d-none', !el.dataset.autoEffect.split(',').includes(et)));\n }\n\n function conditionText(c={}){\n const base=c.type==='no_seeds'?`seeds <= ${c.seeds||0} for ${c.minutes||0} min`:c.type==='ratio_gte'?`ratio >= ${c.ratio}`:c.type==='progress_gte'?`progress >= ${c.progress||0}%`:c.type==='progress_lte'?`progress <= ${c.progress||0}%`:c.type==='label_missing'?`missing label ${c.label||''}`:c.type==='label_has'?`has label ${c.label||''}`:c.type==='status'?`status = ${c.status||''}`:c.type==='path_contains'?`path contains ${c.text||''}`:'completed';\n return c.negate?`NOT (${base})`:base;\n }\n function effectText(e={}){\n if(e.type==='move'){\n const flags=[];\n if(e.move_data) flags.push('move data');\n if(e.recheck) flags.push('recheck');\n if(e.keep_seeding) flags.push('keep seeding');\n return `move to ${e.path||'default path'}${flags.length?` (${flags.join(', ')})`:''}`;\n }\n if(e.type==='profile_transfer'){\n const flags=[];\n if(e.move_data) flags.push('move data if allowed');\n if(e.post_action && e.post_action!=='none') flags.push(e.post_action);\n if(e.label_mode && e.label_mode!=='none') flags.push(`label ${e.label_mode}`);\n const path=e.target_path?` \u00b7 ${e.target_path}`:'';\n return `move to profile #${e.target_profile_id||'?'}${path}${flags.length?` (${flags.join(', ')})`:''}`;\n }\n return e.type==='add_label'?`add label ${e.label||''}`:e.type==='remove_label'?`remove label ${e.label||''}`:e.type==='set_labels'?`set labels ${e.labels||''}`:e.type;\n }\n function ruleSummary(r){\n const cs=(r.conditions||[]).map(conditionText).join(' + ')||'no conditions';\n const es=(r.effects||[]).map(effectText).join(' \u2192 ')||'no actions';\n return `${cs} \u2192 ${es}`;\n }\n\n function renderAutomationBuilder(){\n const cBox=$('automationConditionList');\n if(cBox) cBox.innerHTML=automationConditions.length?automationConditions.map((c,i)=>`IF ${esc(conditionText(c))}`).join(''):'No conditions added yet.';\n const eBox=$('automationEffectList');\n if(eBox) eBox.innerHTML=automationEffects.length?automationEffects.map((e,i)=>`${i+1} ${esc(effectText(e))}`).join(''):'No actions added yet.';\n }\n function resetAutomationForm(){\n if($('autoEditId')) $('autoEditId').value='';\n if($('autoName')) $('autoName').value='';\n if($('autoEnabled')) $('autoEnabled').checked=true;\n if($('autoCooldown')) $('autoCooldown').value='60';\n automationConditions=[]; automationEffects=[];\n $('automationCancelEditBtn')?.classList.add('d-none');\n if($('automationSaveBtn')) $('automationSaveBtn').innerHTML=' Save rule';\n renderAutomationBuilder(); updateAutomationForm();\n }\n function editAutomationRule(rule){\n if(!rule) return;\n if($('autoEditId')) $('autoEditId').value=rule.id||'';\n if($('autoName')) $('autoName').value=rule.name||'';\n if($('autoEnabled')) $('autoEnabled').checked=!!rule.enabled;\n if($('autoCooldown')) $('autoCooldown').value=rule.cooldown_minutes ?? 60;\n automationConditions=Array.isArray(rule.conditions)?JSON.parse(JSON.stringify(rule.conditions)):[];\n automationEffects=Array.isArray(rule.effects)?JSON.parse(JSON.stringify(rule.effects)):[];\n $('automationCancelEditBtn')?.classList.remove('d-none');\n if($('automationSaveBtn')) $('automationSaveBtn').innerHTML=' Update rule';\n renderAutomationBuilder();\n }\n\n function summarizeActionObject(a={}){\n if(a.error) return `${esc(a.error)}`;\n const count=a.count || a.result?.count || a.result?.results?.length || '';\n const parts=[];\n if(a.type) parts.push(a.type);\n if(count) parts.push(`${count} torrent(s)`);\n if(a.path) parts.push(a.path);\n if(a.label) parts.push(`label ${a.label}`);\n if(a.labels) parts.push(`labels ${a.labels}`);\n if(a.move_data) parts.push('move data');\n if(a.recheck) parts.push('recheck');\n if(a.keep_seeding) parts.push('keep seeding');\n return `${esc(parts.join(' \u00b7 ')||'action')}`;\n }\n function automationHistoryActions(raw){\n let actions=[];\n try{ actions=JSON.parse(raw||'[]'); }catch(e){ return `
${esc(raw||'')}
`; }\n if(!Array.isArray(actions)) actions=[actions];\n const summary=actions.map(summarizeActionObject).join(' ');\n const details=esc(JSON.stringify(actions,null,2));\n // Note: Large automation payloads are collapsed so JSON never stretches the modal width.\n return `
${summary||'No actions'}
${details}
`;\n }\n\n function renderAutomationHistory(hist=[]){\n if(!$('automationHistory')) return;\n const toolbar='
';\n const rows=hist.map(h=>[humanDateCell(h.created_at),esc(h.rule_name||''),esc(h.torrent_name||h.torrent_hash||''),automationHistoryActions(h.actions_json||'')]);\n // Note: Automation history uses the shared responsive table wrapper so it stays inside narrow mobile modals.\n const body=hist.length?responsiveTable(['Time','Rule','Torrent / batch','Actions'],rows,'automation-history-table'):'
No automation history yet.
';\n $('automationHistory').innerHTML=toolbar+body;\n }\n\n async function clearAutomationHistory(){\n if(!confirm('Clear automation history?')) return;\n setBusy(true);\n try{ const j=await fetch('/api/automations/history',{method:'DELETE'}).then(r=>r.json()); if(!j.ok) throw new Error(j.error||'Clear automation history failed'); toastMessage('toast.automationLogsDeleted','success',{deleted:j.deleted}); renderAutomationHistory(j.history||[]); }\n catch(e){ toast(e.message,'danger'); }\n finally{ setBusy(false); }\n }\n\n async function exportAutomations(){\n try{ const j=await (await fetch('/api/automations/export')).json(); if(!j.ok) throw new Error(j.error||'Automation export failed'); downloadJson(`pytorrent-automation-rules-${new Date().toISOString().slice(0,10)}.json`, j.export||j); toast(`Exported ${j.count||0} automation rule(s)`,'success'); }\n catch(e){ toast(e.message,'danger'); }\n }\n\n async function importAutomations(file){\n if(!file) return;\n try{ const payload=JSON.parse(await file.text()); const j=await post('/api/automations/import',payload); toast(`Imported ${j.imported||0} automation rule(s)`,'success'); await loadAutomations(); }\n catch(e){ toast(e.message||'Automation import failed','danger'); }\n finally{ if($('automationImportFile')) $('automationImportFile').value=''; }\n }\n\n async function loadAutomations(){\n const j=await fetch('/api/automations').then(r=>r.json());\n const rules=j.rules||[], hist=j.history||[];\n automationRulesCache=rules;\n if($('automationManager')) $('automationManager').innerHTML=rules.length?rules.map(r=>{\n const enabled=!!r.enabled;\n const toggleTitle=enabled?'Disable automation':'Enable automation';\n const toggleIcon=enabled?'fa-toggle-on':'fa-toggle-off';\n const toggleClass=enabled?'btn-outline-warning':'btn-outline-success';\n const owner=r.owner_label?` ${esc(r.owner_label)}`:'';\n return `
${esc(r.name)} ${enabled?'on':'off'} ${owner}
${esc(ruleSummary(r))} \u00b7 cooldown ${esc(r.cooldown_minutes||0)} min
`;\n }).join(''):'
No automation rules.
';\n renderAutomationHistory(hist);\n }\n\n async function toggleAutomationRule(rule){\n if(!rule) return;\n const payload={...rule, enabled:!rule.enabled};\n // Note: Toggle keeps the rule definition unchanged and only switches automatic execution on or off.\n setBusy(true);\n try{ await post('/api/automations',payload); toast(payload.enabled?'Automation enabled':'Automation disabled','success'); await loadAutomations(); }\n catch(e){ toast(e.message,'danger'); }\n finally{ setBusy(false); }\n }\n\n async function saveAutomation(){\n const currentCond=automationCondition();\n const currentEff=automationEffect();\n const conditions=automationConditions.length?automationConditions:[currentCond];\n const effects=automationEffects.length?automationEffects:[currentEff];\n const payload={id:Number($('autoEditId')?.value||0)||undefined,name:$('autoName')?.value||'Automation rule',enabled:!!$('autoEnabled')?.checked,cooldown_minutes:Number($('autoCooldown')?.value||60),conditions,effects};\n setBusy(true);\n try{ await post('/api/automations',payload); toast(payload.id?'Automation rule updated':'Automation rule saved','success'); resetAutomationForm(); await loadAutomations(); }\n catch(e){toast(e.message,'danger');}\n finally{setBusy(false);}\n }\n\n\n"; diff --git a/pytorrent/static/js/profileSelection.js b/pytorrent/static/js/profileSelection.js index 1455796..6ff272f 100644 --- a/pytorrent/static/js/profileSelection.js +++ b/pytorrent/static/js/profileSelection.js @@ -1 +1 @@ -export const profileSelectionSource = " function renderProfileSelectionState(count=0){\n hasTorrentSnapshot = false;\n torrentSummary = {filters:{all:{count:0},downloading:{count:0},queued:{count:0},seeding:{count:0},paused:{count:0},checking:{count:0},error:{count:0},stopped:{count:0}}};\n torrents.clear();\n selected.clear();\n renderCounts();\n const body = $('torrentBody');\n if(body){\n body.innerHTML = `
Select an rTorrent profile.${esc(count)} profile(s) are configured for this trusted bypass session. Choose which one to open.
`;\n }\n const list = $('mobileList');\n if(list) list.innerHTML = `
Select an rTorrent profile.Choose a profile to load torrents.
`;\n if($('detailPane')) $('detailPane').innerHTML = 'Choose an rTorrent profile to load details.';\n }\n\n function renderProfilePickerChoices(profiles=[], active=null){\n const list=$('profileChoiceList');\n if(!list) return;\n const activeId=Number(active?.id || window.PYTORRENT?.activeProfile || activeProfileId || 0);\n list.innerHTML=(profiles||[]).map(p=>{\n const id=Number(p.id||0);\n const activeClass=id===activeId?' active':'';\n return ``;\n }).join('') || '
No profiles configured.
';\n }\n\n async function openProfilePicker(){\n try{\n const j=await (await fetch('/api/profiles',{cache:'no-store'})).json();\n renderProfilePickerChoices(j.profiles||[], j.active||null);\n }catch(e){ renderProfilePickerChoices([], null); }\n new bootstrap.Modal($('profilePickerModal')).show();\n }\n\n // Note: On trusted auth-bypass entry, existing profiles are not auto-selected; the visitor must choose the target profile.\n async function showFirstRunSetup(){\n if(hasActiveProfile || firstRunSetupShown) return;\n firstRunSetupShown = true;\n let profiles=[];\n try{\n const j=await (await fetch('/api/profiles',{cache:'no-store'})).json();\n if(j.active?.id){\n activeProfileId=j.active.id;\n hasActiveProfile=true;\n window.PYTORRENT.activeProfile=Number(j.active.id);\n return;\n }\n profiles=j.profiles||[];\n }catch(e){}\n $('connBadge').className='badge text-bg-warning';\n if(profiles.length){\n $('connBadge').textContent='select profile';\n setInitialLoader('Select rTorrent profile','Choose which configured rTorrent profile to open.');\n renderProfileSelectionState(profiles.length);\n hideInitialLoader();\n setTimeout(()=>openProfilePicker(), 120);\n return;\n }\n $('connBadge').textContent='setup required';\n setInitialLoader('Configure rTorrent','Add the first rTorrent profile to start loading torrents.');\n renderNoProfileState();\n hideInitialLoader();\n setTimeout(()=>{ activateToolTab('rtorrents'); new bootstrap.Modal($('toolsModal')).show(); }, 120);\n }\n\n $('profileChoiceList')?.addEventListener('click',async e=>{\n const btn=e.target.closest('.profile-choice-card');\n if(!btn) return;\n const id=btn.dataset.profileId;\n if(!id) return;\n await activateProfileAndRefresh(id, btn.querySelector(\"b\")?.textContent || \"rTorrent\");\n bootstrap.Modal.getInstance($('profilePickerModal'))?.hide();\n });\n"; +export const profileSelectionSource = " function renderProfileSelectionState(count=0){\n hasTorrentSnapshot = false;\n torrentSummary = {filters:{all:{count:0},downloading:{count:0},queued:{count:0},seeding:{count:0},paused:{count:0},checking:{count:0},error:{count:0},stopped:{count:0}}};\n torrents.clear();\n selected.clear();\n renderCounts();\n const body = $('torrentBody');\n if(body){\n body.innerHTML = `
Select an rTorrent profile.${esc(count)} profile(s) are configured for this trusted bypass session. Choose which one to open.
`;\n }\n const list = $('mobileList');\n if(list) list.innerHTML = `
Select an rTorrent profile.Choose a profile to load torrents.
`;\n if($('detailPane')) $('detailPane').innerHTML = 'Choose an rTorrent profile to load details.';\n }\n\n function profileRuntimeStatsHtml(stats){\n if(!stats) return '';\n const parts=[];\n if(stats.torrent_count!==undefined) parts.push(`${stats.torrent_count} torrents`);\n if(stats.total_size_h) parts.push(`total ${stats.total_size_h}`);\n if(stats.seeding_count!==undefined || stats.downloading_count!==undefined) parts.push(`${stats.seeding_count||0} seeding / ${stats.downloading_count||0} downloading`);\n if(stats.updated_at) parts.push(`cached ${formatDateTime(stats.updated_at)}`);\n return parts.length?`
${parts.map(x=>`${esc(x)}`).join('')}
`:'';\n }\n\n function renderProfilePickerChoices(profiles=[], active=null){\n const list=$('profileChoiceList');\n if(!list) return;\n const activeId=Number(active?.id || window.PYTORRENT?.activeProfile || activeProfileId || 0);\n list.innerHTML=(profiles||[]).map(p=>{\n const id=Number(p.id||0);\n const activeClass=id===activeId?' active':'';\n return ``;\n }).join('') || '
No profiles configured.
';\n }\n\n async function openProfilePicker(){\n try{\n const j=await (await fetch('/api/profiles',{cache:'no-store'})).json();\n renderProfilePickerChoices(j.profiles||[], j.active||null);\n }catch(e){ renderProfilePickerChoices([], null); }\n new bootstrap.Modal($('profilePickerModal')).show();\n }\n\n // Note: On trusted auth-bypass entry, existing profiles are not auto-selected; the visitor must choose the target profile.\n async function showFirstRunSetup(){\n if(hasActiveProfile || firstRunSetupShown) return;\n firstRunSetupShown = true;\n let profiles=[];\n try{\n const j=await (await fetch('/api/profiles',{cache:'no-store'})).json();\n if(j.active?.id){\n activeProfileId=j.active.id;\n hasActiveProfile=true;\n window.PYTORRENT.activeProfile=Number(j.active.id);\n return;\n }\n profiles=j.profiles||[];\n }catch(e){}\n $('connBadge').className='badge text-bg-warning';\n if(profiles.length){\n $('connBadge').textContent='select profile';\n setInitialLoader('Select rTorrent profile','Choose which configured rTorrent profile to open.');\n renderProfileSelectionState(profiles.length);\n hideInitialLoader();\n setTimeout(()=>openProfilePicker(), 120);\n return;\n }\n $('connBadge').textContent='setup required';\n setInitialLoader('Configure rTorrent','Add the first rTorrent profile to start loading torrents.');\n renderNoProfileState();\n hideInitialLoader();\n setTimeout(()=>{ activateToolTab('rtorrents'); new bootstrap.Modal($('toolsModal')).show(); }, 120);\n }\n\n $('profileChoiceList')?.addEventListener('click',async e=>{\n const btn=e.target.closest('.profile-choice-card');\n if(!btn) return;\n const id=btn.dataset.profileId;\n if(!id) return;\n await activateProfileAndRefresh(id, btn.querySelector(\"b\")?.textContent || \"rTorrent\");\n bootstrap.Modal.getInstance($('profilePickerModal'))?.hide();\n });\n"; diff --git a/pytorrent/static/styles.css b/pytorrent/static/styles.css index 9211886..2893202 100644 --- a/pytorrent/static/styles.css +++ b/pytorrent/static/styles.css @@ -6010,6 +6010,49 @@ body.compact-torrent-list .mobile-progress .torrent-progress { min-height: 1.2rem; } + +.profile-choice-main { + display: grid; + gap: 0.25rem; + min-width: 0; +} + +.profile-choice-stats { + display: flex; + flex-wrap: wrap; + gap: 0.35rem; + justify-content: flex-end; + margin-left: 1rem; +} + +.profile-choice-stats span { + background: var(--bs-tertiary-bg); + border: 1px solid var(--bs-border-color); + border-radius: 999px; + color: var(--bs-secondary-color); + font-size: 0.75rem; + padding: 0.15rem 0.45rem; +} + +.profile-transfer-path-hints { + display: flex; + flex-wrap: wrap; + gap: 0.35rem; +} + +@media (max-width: 767.98px) { + .profile-choice-card { + align-items: flex-start; + flex-direction: column; + gap: 0.5rem; + } + + .profile-choice-stats { + justify-content: flex-start; + margin-left: 0; + } +} + @media (max-width: 767.98px) { .profile-transfer-grid { grid-template-columns: 1fr; diff --git a/pytorrent/templates/index.html b/pytorrent/templates/index.html index 3d037ef..c6ed0c1 100644 --- a/pytorrent/templates/index.html +++ b/pytorrent/templates/index.html @@ -160,7 +160,7 @@