gru/pyTorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert

Browse Source
This commit is contained in:
Mateusz Gruszczyński
2026-05-06 23:10:53 +02:00
parent 98f155b53a
commit 2691442fc1
9 changed files with 351 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
pytorrent/services/smart_queue.py
View File

@@ -132,39 +132,6 @@ def _excluded_hashes(profile_id: int, user_id: int) -> set[str]:
return {r['torrent_hash'] for r in list_exclusions(profile_id, user_id)}
def _label_names(value: str | None) -> list[str]:
names: list[str] = []
for part in str(value or '').replace(';', ',').replace('|', ',').split(','):
label = part.strip()
if label and label not in names:
names.append(label)
return names
def _label_value(labels: list[str]) -> str:
out: list[str] = []
for label in labels:
label = str(label or '').strip()
if label and label not in out:
out.append(label)
return ', '.join(out)
def _has_smart_queue_label(value: str | None) -> bool:
return SMART_QUEUE_LABEL in _label_names(value)
def _without_smart_queue_label(value: str | None) -> str:
return _label_value([label for label in _label_names(value) if label != SMART_QUEUE_LABEL])
def _with_smart_queue_label(value: str | None) -> str:
labels = _label_names(value)
if SMART_QUEUE_LABEL not in labels:
labels.append(SMART_QUEUE_LABEL)
return _label_value(labels)
def _remember_auto_label(profile_id: int, torrent_hash: str, previous_label: str) -> None:
now = utcnow()
with connect() as conn:
@@ -198,18 +165,21 @@ def _restore_auto_label(client: Any, profile_id: int, torrent_hash: str, current
(profile_id, torrent_hash),
).fetchone()
live_label = _read_label(client, torrent_hash, current_label or '')
if not row and not _has_smart_queue_label(live_label):
return False
restored = _without_smart_queue_label(live_label)
previous = _without_smart_queue_label((row or {}).get('previous_label') or '')
if not restored and previous:
restored = previous
if not row:
if live_label != SMART_QUEUE_LABEL:
return False
try:
# Note: Clear the Smart Queue label even when the torrent was marked earlier but no previous-label entry remains.
client.call('d.custom1.set', torrent_hash, '')
return True
except Exception:
return False
previous = row.get('previous_label') or ''
try:
# Note: Smart Queue now removes only its technical label, preserving labels added manually while the torrent was waiting in the queue.
if _has_smart_queue_label(live_label) or current_label is None:
client.call('d.custom1.set', torrent_hash, restored)
if row:
conn.execute('DELETE FROM smart_queue_auto_labels WHERE profile_id=? AND torrent_hash=?', (profile_id, torrent_hash))
# Note: On resume, Smart Queue restores the previous label only while it still sees its own technical label.
if live_label == SMART_QUEUE_LABEL or current_label is None:
client.call('d.custom1.set', torrent_hash, previous)
conn.execute('DELETE FROM smart_queue_auto_labels WHERE profile_id=? AND torrent_hash=?', (profile_id, torrent_hash))
return True
except Exception:
return False
@@ -312,12 +282,10 @@ def _read_live_start_state(client: Any, torrent_hash: str) -> dict[str, Any]:
result['started'] = bool(int(result.get('active') or 0))
return result
def _set_smart_queue_label(client: Any, torrent_hash: str, current_label: str | None = None, attempts: int = 3) -> bool:
# Note: The queue label is appended as a technical label instead of replacing the user's labels.
target = _with_smart_queue_label(current_label if current_label is not None else _read_label(client, torrent_hash, ''))
def _set_smart_queue_label(client: Any, torrent_hash: str, attempts: int = 3) -> bool:
for attempt in range(max(1, attempts)):
try:
client.call('d.custom1.set', torrent_hash, target)
client.call('d.custom1.set', torrent_hash, SMART_QUEUE_LABEL)
return True
except Exception:
if attempt < attempts - 1:
@@ -330,15 +298,15 @@ def _mark_auto_paused(client: Any, profile_id: int, torrent: dict[str, Any]) ->
if not torrent_hash:
return False
previous = str(torrent.get('label') or '')
if not _has_smart_queue_label(previous):
_remember_auto_label(profile_id, torrent_hash, _without_smart_queue_label(previous))
return _set_smart_queue_label(client, torrent_hash, previous)
if previous != SMART_QUEUE_LABEL:
_remember_auto_label(profile_id, torrent_hash, previous)
return _set_smart_queue_label(client, torrent_hash)
def _is_smart_queue_hold(torrent: dict[str, Any] | None, manage_stopped: bool = True) -> bool:
if not torrent or int(torrent.get('complete') or 0):
return False
if _has_smart_queue_label(torrent.get('label')):
if str(torrent.get('label') or '') == SMART_QUEUE_LABEL:
return True
# Note: Paused in rTorrent usually has state=1 and active=0, so state=0 must not be required.
# This lets Smart Queue treat paused torrents as pending and fill the queue target later.
@@ -351,11 +319,11 @@ def _is_smart_queue_hold(torrent: dict[str, Any] | None, manage_stopped: bool =
def _clear_untracked_smart_queue_label(client: Any, torrent_hash: str, current_label: str) -> bool:
if not _has_smart_queue_label(current_label):
if current_label != SMART_QUEUE_LABEL:
return False
try:
# Note: Orphan cleanup removes only the Smart Queue technical label and keeps manual labels intact.
client.call('d.custom1.set', torrent_hash, _without_smart_queue_label(current_label))
# Note: Clear an orphaned Smart Queue label when no previous-label entry exists in the database.
client.call('d.custom1.set', torrent_hash, '')
return True
except Exception:
return False
@@ -378,7 +346,7 @@ def _cleanup_auto_labels(client: Any, profile_id: int, torrents: list[dict[str,
if _restore_auto_label(client, profile_id, h, None if t is None else current_label):
restored.append(h)
continue
if not _has_smart_queue_label(current_label):
if current_label != SMART_QUEUE_LABEL:
_set_smart_queue_label(client, h)
for h, t in by_hash.items():
@@ -395,7 +363,7 @@ def _is_running_download_slot(t: dict[str, Any]) -> bool:
# Paused can have state=1/open=1, so a slot is counted only after d.is_active=1.
if int(t.get('complete') or 0):
return False
if _has_smart_queue_label(t.get('label')):
if str(t.get('label') or '') == SMART_QUEUE_LABEL:
return False
status = str(t.get('status') or '').lower()
if status == 'checking' or status == 'paused' or bool(t.get('paused')):
@@ -407,7 +375,7 @@ def _is_waiting_download_candidate(t: dict[str, Any], manage_stopped: bool) -> b
"""Return True for paused/held torrents Smart Queue may resume later."""
if int(t.get('complete') or 0):
return False
if _has_smart_queue_label(t.get('label')):
if str(t.get('label') or '') == SMART_QUEUE_LABEL:
return True
# Note: Paused items are the primary source for filling the queue, regardless of manage_stopped.
if bool(t.get('paused')) or str(t.get('status') or '').lower() == 'paused':
@@ -438,7 +406,7 @@ def check(profile: dict | None = None, user_id: int | None = None, force: bool =
excluded = _excluded_hashes(profile_id, user_id)
manage_stopped = bool(settings.get('manage_stopped'))
def is_managed_hold(t: dict[str, Any]) -> bool:
return _has_smart_queue_label(t.get('label'))
return str(t.get('label') or '') == SMART_QUEUE_LABEL
# Note: Count Smart Queue slots by d.is_active because Paused can have state=1/open=1 and must not occupy the limit.
downloading = [
@@ -570,7 +538,7 @@ def check(profile: dict | None = None, user_id: int | None = None, force: bool =
keep_labels = (
set(paused)
| {str(t.get('hash') or '') for t in to_label_waiting}
| {str(t.get('hash') or '') for t in stopped if _has_smart_queue_label(t.get('label')) and str(t.get('hash') or '') not in set(resumed)}
| {str(t.get('hash') or '') for t in stopped if str(t.get('label') or '') == SMART_QUEUE_LABEL and str(t.get('hash') or '') not in set(resumed)}
)
restored = _cleanup_auto_labels(c, profile_id, torrents, keep_labels, manage_stopped)
details = {'excluded': len(excluded), 'enabled': bool(settings.get('enabled')), 'auto_label': SMART_QUEUE_LABEL, 'labels_restored': restored, 'labels_failed': label_failed, 'start_failed': start_failed, 'start_no_effect': start_no_effect, 'start_results': start_results, 'resume_requested': resume_requested, 'active_verified': active_verified, 'waiting_labeled': len(to_label_waiting), 'manage_stopped': manage_stopped, 'max_active_downloads': max_active, 'active_before': len(downloading), 'active_after_expected': active_after_pause + len(resumed), 'paused_planned': len(to_pause), 'resumed_planned': len(to_resume), 'rtorrent_cap': rtorrent_cap}