cthrace/trweb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separate per-server controls from torrents

Browse Source 
The buttons are still broken, will fix later
This commit is contained in:
Fehér Roland
2025-10-09 10:06:29 +02:00
parent 9d13a71dc1
commit f21bac01f4
5 changed files with 273 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
index.html
View File

@@ -19,9 +19,12 @@
crossorigin="anonymous" /> crossorigin="anonymous" />
<link rel="stylesheet" href="style/trweb.css" /> <link rel="stylesheet" href="style/trweb.css" />
<script type="text/javascript" src="js/helpers.js"></script> <script type="text/javascript" src="js/helpers.js"></script>
<script type="text/javascript" src="js/trserver.js"></script>
<script type="text/javascript" src="js/trdom_menubar.js"></script> <script type="text/javascript" src="js/trdom_menubar.js"></script>
<script type="text/javascript" src="js/trdom_servermanager.js"></script> <script type="text/javascript" src="js/trdom_servermanager.js"></script>
<script type="text/javascript" src="js/trdom_torrentcontrol.js"></script>
<script type="text/javascript" src="js/trdom_torrentmanager.js"></script>
<script type="text/javascript" src="js/trserver.js"></script>
<script type="text/javascript" src="js/trtorrent.js"></script>
<script type="text/javascript" src="js/trweb.js"></script> <script type="text/javascript" src="js/trweb.js"></script>
</head> </head>
<body> <body>

138
js/trdom_torrentcontrol.js Normal file
View File

@@ -0,0 +1,138 @@
"use strict";
class trdom_torrentcontrol {
#logcb;
#log(loglevel, msg) {
if (this.#logcb !== null) {
this.#logcb('trdom_servermanager', loglevel, msg);
}
}
#element = document.createElement('div');
getElement() {
return this.#element;
}
#hash;
#server;
//TODO: remove
#getKnownTorrents;
#handler(e) {
switch (e.type) {
case 'click':
if (e.currentTarget.hasAttributeNS('trweb', 'torrentlistfield')) {
switch (e.currentTarget.getAttributeNS('trweb', 'torrentlistfield')) {
case 'start':
hash = e.currentTarget.getAttributeNS('trweb', 'torrent');
this.#server.torrent_start(hash);
e.stopPropagation();
break;
case 'pause':
hash = e.currentTarget.getAttributeNS('trweb', 'torrent');
this.#server.torrent_pause(hash);
e.stopPropagation();
break;
case 'magnet':
let magneturl;
hash = e.currentTarget.getAttributeNS('trweb', 'torrent');
for (const [srv, data] of Object.entries(this.#getKnownTorrents()[hash].servers)) {
if (data.magnetLink != null) {
magneturl = data.magnetLink;
break;
}
}
if (magneturl != null) {
this.#server.torrent_add_url(magneturl, false, null);
}
else {
this.#log(3, `Couldn't find magnet link! ${JSON.stringify(this.#getKnownTorrents()[hash].servers)}`);
}
e.stopPropagation();
break;
case 'download':
e.stopPropagation();
window.alert('not implemented');
break;
}
}
}
}
constructor(hash, server, logcb, getKnownTorrents) {
this.#hash = hash;
this.#server = server;
this.#logcb = logcb;
this.#getKnownTorrents = getKnownTorrents;
let srv = server.name;
// statusbar
let element_statusbar = document.createElement('div');
element_statusbar.classList.add('trweb_torrentliststatusbar');
// Current status and percentage
let element_status = document.createElement('div');
element_status.classList.add('trweb_torrentliststatus', 'col-12');
element_status.setAttributeNS('trweb', 'server', srv);
element_status.setAttributeNS('trweb', 'torrentlistfield', 'status');
let element_start = document.createElement('div');
element_start.classList.add('trweb_torrentlistcontrol', 'col-4');
element_start.setAttributeNS('trweb', 'server', srv);
element_start.setAttributeNS('trweb', 'torrent', hash);
element_start.setAttributeNS('trweb', 'torrentlistfield', 'start');
element_start.appendChild(document.createTextNode("Start"));
element_start.addEventListener("click", this.#handler.bind(this));
let element_pause = document.createElement('div');
element_pause.classList.add('trweb_torrentlistcontrol', 'col-4');
element_pause.setAttributeNS('trweb', 'server', srv);
element_pause.setAttributeNS('trweb', 'torrent', hash);
element_pause.setAttributeNS('trweb', 'torrentlistfield', 'pause');
element_pause.appendChild(document.createTextNode("Pause"));
element_pause.addEventListener("click", this.#handler.bind(this));
// Download by magnet
let element_magnet = document.createElement('div');
element_magnet.classList.add('trweb_torrentlistmagnet', 'col');
element_magnet.setAttributeNS('trweb', 'server', srv);
element_magnet.setAttributeNS('trweb', 'torrent', hash);
element_magnet.setAttributeNS('trweb', 'torrentlistfield', 'magnet');
element_magnet.appendChild(document.createTextNode(`[${srv}] Magnet`));
element_magnet.addEventListener("click", this.#handler.bind(this));
// Download by torrent file
let element_download = document.createElement('div');
element_download.classList.add('trweb_torrentlistdownload', 'col');
element_download.setAttributeNS('trweb', 'server', srv);
element_download.setAttributeNS('trweb', 'torrent', hash);
element_download.setAttributeNS('trweb', 'torrentlistfield', 'download');
element_download.appendChild(document.createTextNode(`[${srv}] Get torrent`));
element_download.addEventListener("click", this.#handler.bind(this));
// row container
let element_serverrow = document.createElement('div');
element_serverrow.classList.add('trweb_torrentlistserverrow', 'row');
element_serverrow.appendChild(element_status);
element_serverrow.appendChild(element_start);
element_serverrow.appendChild(element_pause);
element_serverrow.appendChild(element_magnet);
element_serverrow.appendChild(element_download);
this.#element.classList.add('trweb_torrentlistserver', 'col-2', 'container');
this.#element.setAttributeNS('trweb', 'torrentlistfield', 'server');
this.#element.setAttributeNS('trweb', 'server', srv);
this.#element.element_statusbar = element_statusbar;
this.#element.appendChild(element_statusbar);
this.#element.element_row = element_serverrow;
this.#element.appendChild(element_serverrow);
this.#element.element_status = element_status;
this.#element.element_start = element_start;
this.#element.element_pause = element_pause;
this.#element.element_magnet = element_magnet;
this.#element.element_download = element_download;
}
}

12
js/trdom_torrentmanager.js Normal file
View File

@@ -0,0 +1,12 @@
"use strict";
class trdom_torrentmanager {
#element = document.createElement('div');
getElement() {
return this.#element;
}
constructor() {
this.#element.classList.add('trweb_torrentlistview', 'container-fluid');
}
}

59
js/trtorrent.js Normal file
View File

@@ -0,0 +1,59 @@
"use strict";
class trtorrent {
#element = document.createElement('div');
getElement() {
return this.#element;
}
#hash;
#name = '## NAME NOT SET ##';
#element_server = {};
addControl(srv, control) {
this.#element_server[srv] = control;
this.#element.appendChild(control.getElement());
}
getControl(srv) {
return this.#element_server[srv];
}
#servers = {};
getStatus(srv) {
return this.#servers[srv];
}
setStatus(srv, status) {
this.#servers[srv] = status;
}
#handler(e) {
switch (e.type) {
case 'click':
if (e.currentTarget.hasAttributeNS('trweb', 'torrentlistfield')) {
switch (e.currentTarget.getAttributeNS('trweb', 'torrentlistfield')) {
case 'entry':
e.currentTarget.classList.toggle('trweb_hide_buttons');
e.stopPropagation();
break;
}
}
break;
}
}
constructor(hash) {
this.#hash = hash;
// set up DOM structure
let element_name = document.createElement('div');
element_name.classList.add('trweb_torrentlistname', 'col');
element_name.setAttributeNS('trweb', 'fieldid', 'displayname');
this.#element.torrent = this;
this.#element.classList.add('trweb_torrentlistentry', 'trweb_hide_buttons', 'row');
this.#element.setAttributeNS('trweb', 'torrentlistfield', 'entry');
this.#element.addEventListener('click', this.#handler.bind(this));
this.#element.element_name = element_name;
this.#element.appendChild(element_name);
}
}

240
js/trweb.js
View File

@@ -8,16 +8,17 @@ class trweb {
#loadcb = function(key) {return localStorage.getItem(`trweb.${key}`)}; #loadcb = function(key) {return localStorage.getItem(`trweb.${key}`)};
#savecb = function(key, value) {localStorage.setItem(`trweb.${key}`, value)}; #savecb = function(key, value) {localStorage.setItem(`trweb.${key}`, value)};
#logger = function(msg) {}; #logger = function(msg) {};
#logcb = function(module, loglevel, msg) {this.#logger(`${module}: ${msg}`)};
#timer; #timer;
#container; #container;
#torrentListView;
#guiFooter; #guiFooter;
#dom_menubar = new trdom_menubar(); #dom_menubar = new trdom_menubar();
#dom_servermanager; #dom_servermanager;
#dom_torrentmanagger = new trdom_torrentmanager();
constructor (container, loadcb, savecb, logger) { constructor (container, loadcb, savecb, logger) {
this.#container = container; this.#container = container;
@@ -29,10 +30,7 @@ class trweb {
this.#logger = logger; this.#logger = logger;
} }
this.#dom_servermanager = new trdom_servermanager(this.#loadcb, this.#savecb, function(module, loglevel, msg) {this.#logger(`${module}: ${msg}`)}.bind(this), this.#registerServer.bind(this)) this.#dom_servermanager = new trdom_servermanager(this.#loadcb, this.#savecb, this.#logcb.bind(this), this.#registerServer.bind(this))
this.#torrentListView = document.createElement('div');
this.#torrentListView.classList.add('trweb_torrentlistview', 'container-fluid');
this.#guiFooter = document.createElement('div'); this.#guiFooter = document.createElement('div');
this.#guiFooter.classList.add('trweb_footer'); this.#guiFooter.classList.add('trweb_footer');
@@ -53,7 +51,7 @@ class trweb {
if (mergedTorrentInfo == null) { if (mergedTorrentInfo == null) {
mergedTorrentInfo = this.#createTorrentEntry(hash); mergedTorrentInfo = this.#createTorrentEntry(hash);
} }
mergedTorrentInfo.servers[name] = torrentInfo; mergedTorrentInfo.setStatus(name, torrentInfo);
mergedTorrentInfo.name = torrentInfo.name; mergedTorrentInfo.name = torrentInfo.name;
this.#updateTorrentDisplay(mergedTorrentInfo); this.#updateTorrentDisplay(mergedTorrentInfo);
@@ -64,120 +62,41 @@ class trweb {
} }
#createTorrentEntry(hash) { #createTorrentEntry(hash) {
let entry = { let torrent = new trtorrent(hash);
'element': document.createElement('div'),
'element_name': document.createElement('div'),
'element_server': {},
'hash': hash,
'name': '## NAME NOT SET ##',
'servers': {}
};
this.#knownTorrents[hash] = entry; this.#knownTorrents[hash] = torrent;
// set up DOM structure
entry.element.torrent = entry;
entry.element.classList.add('trweb_torrentlistentry', 'trweb_hide_buttons', 'row');
entry.element.setAttributeNS('trweb', 'torrentlistfield', 'entry');
entry.element.addEventListener('click', this.#handler.bind(this));
entry.element_name.classList.add('trweb_torrentlistname', 'col');
entry.element_name.setAttributeNS('trweb', 'fieldid', 'displayname');
entry.element.appendChild(entry.element_name);
for (const srv of Object.keys(this.#dom_servermanager.getServers())) { for (const srv of Object.keys(this.#dom_servermanager.getServers())) {
this.#createServerEntryForTorrent(hash, srv); this.#createServerEntryForTorrent(hash, srv);
} }
this.#torrentListView.appendChild(entry.element); this.#dom_torrentmanagger.getElement().appendChild(torrent.getElement());
this.#updateTorrentDisplay(entry); this.#updateTorrentDisplay(torrent);
return entry; return torrent;
} }
#createServerEntryForTorrent(hash, srv) { #createServerEntryForTorrent(hash, srv) {
this.#needsSort = true; this.#needsSort = true;
let entry = this.#knownTorrents[hash]; let control = new trdom_torrentcontrol(hash, this.#dom_servermanager.getServers()[srv], this.#logcb.bind(this), function() {return this.#knownTorrents}.bind(this));
let element_server = document.createElement('div'); let torrent = this.#knownTorrents[hash];
element_server.classList.add('trweb_torrentlistserver', 'col-2', 'container');
element_server.setAttributeNS('trweb', 'torrentlistfield', 'server');
element_server.setAttributeNS('trweb', 'server', srv);
entry.element_server[srv] = element_server;
entry.element.appendChild(entry.element_server[srv]);
// statusbar torrent.addControl(srv, control);
let element_statusbar = document.createElement('div');
element_statusbar.classList.add('trweb_torrentliststatusbar');
element_server.element_statusbar = element_statusbar;
element_server.appendChild(element_statusbar);
// row container
let element_serverrow = document.createElement('div');
element_serverrow.classList.add('trweb_torrentlistserverrow', 'row');
element_server.element_row = element_serverrow;
element_server.appendChild(element_serverrow);
// Current status and percentage
let element_status = document.createElement('div');
element_status.classList.add('trweb_torrentliststatus', 'col-12');
element_status.setAttributeNS('trweb', 'server', srv);
element_status.setAttributeNS('trweb', 'torrentlistfield', 'status');
element_server.element_status = element_status;
element_serverrow.appendChild(element_status);
let element_start = document.createElement('div');
element_start.classList.add('trweb_torrentlistcontrol', 'col-4');
element_start.setAttributeNS('trweb', 'server', srv);
element_start.setAttributeNS('trweb', 'torrent', hash);
element_start.setAttributeNS('trweb', 'torrentlistfield', 'start');
element_start.appendChild(document.createTextNode("Start"));
element_start.addEventListener("click", this.#handler.bind(this));
element_server.element_start = element_start;
element_serverrow.appendChild(element_start);
let element_pause = document.createElement('div');
element_pause.classList.add('trweb_torrentlistcontrol', 'col-4');
element_pause.setAttributeNS('trweb', 'server', srv);
element_pause.setAttributeNS('trweb', 'torrent', hash);
element_pause.setAttributeNS('trweb', 'torrentlistfield', 'pause');
element_pause.appendChild(document.createTextNode("Pause"));
element_pause.addEventListener("click", this.#handler.bind(this));
element_server.element_pause = element_pause;
element_serverrow.appendChild(element_pause);
// Download by magnet
let element_magnet = document.createElement('div');
element_magnet.classList.add('trweb_torrentlistmagnet', 'col');
element_magnet.setAttributeNS('trweb', 'server', srv);
element_magnet.setAttributeNS('trweb', 'torrent', hash);
element_magnet.setAttributeNS('trweb', 'torrentlistfield', 'magnet');
element_magnet.appendChild(document.createTextNode(`[${srv}] Magnet`));
element_magnet.addEventListener("click", this.#handler.bind(this));
element_server.element_magnet = element_magnet;
element_serverrow.appendChild(element_magnet);
// Download by torrent file
let element_download = document.createElement('div');
element_download.classList.add('trweb_torrentlistdownload', 'col');
element_download.setAttributeNS('trweb', 'server', srv);
element_download.setAttributeNS('trweb', 'torrent', hash);
element_download.setAttributeNS('trweb', 'torrentlistfield', 'download');
element_download.appendChild(document.createTextNode(`[${srv}] Get torrent`));
element_download.addEventListener("click", this.#handler.bind(this));
element_server.element_download = element_download;
element_serverrow.appendChild(element_download);
} }
#updateTorrentDisplay(torrent) { #updateTorrentDisplay(torrent) {
let txt_name = torrent.element_name; let txt_name = torrent.getElement().element_name;
nukeChildren(txt_name); nukeChildren(txt_name);
txt_name.appendChild(document.createTextNode(torrent.name)); txt_name.appendChild(document.createTextNode(torrent.name));
for (const srv of Object.keys(this.#dom_servermanager.getServers())) { for (const srv of Object.keys(this.#dom_servermanager.getServers())) {
let server = torrent.element_server[srv]; let control = torrent.getControl(srv);
let status = server.element_status; let control_element = control.getElement();
let status = control_element.element_status;
server.classList.remove( control_element.classList.remove(
'trweb_status_asdf', 'trweb_status_asdf',
'trweb_status_offline', 'trweb_status_offline',
'trweb_status_nonexistent', 'trweb_status_nonexistent',
@@ -198,99 +117,60 @@ class trweb {
statusclass = 'trweb_status_offline'; statusclass = 'trweb_status_offline';
barwidth = 0; barwidth = 0;
} }
else if (torrent.servers[srv] == undefined || torrent.servers[srv].deleted) {
statustext = "Not available";
statusclass = 'trweb_status_nonexistent';
barwidth = 0;
}
else { else {
statustext = `${torrent.servers[srv].status}`; let server_status = torrent.getStatus(srv);
barwidth = torrent.servers[srv].percentDone; if (server_status == undefined || server_status.deleted) {
switch (torrent.servers[srv].status) { statustext = "Not available";
case 0: statusclass = 'trweb_status_nonexistent';
statustext = 'Paused'; barwidth = 0;
statusclass = 'trweb_status_paused';
break;
case 1:
statustext = 'Queued for verification';
statusclass = 'trweb_status_verifqueued';
break;
case 2:
statustext = 'Verifying';
statusclass = 'trweb_status_verifying';
break;
case 3:
statustext = 'Queued';
break;
case 4:
statustext = 'Downloading';
statusclass = 'trweb_status_downloading';
break;
case 6:
statustext = 'Seeding';
statusclass = 'trweb_status_seeding';
break;
} }
else {
statustext = `${server_status.status}`;
barwidth = server_status.percentDone;
switch (server_status.status) {
case 0:
statustext = 'Paused';
statusclass = 'trweb_status_paused';
break;
case 1:
statustext = 'Queued for verification';
statusclass = 'trweb_status_verifqueued';
break;
case 2:
statustext = 'Verifying';
statusclass = 'trweb_status_verifying';
break;
case 3:
statustext = 'Queued';
break;
case 4:
statustext = 'Downloading';
statusclass = 'trweb_status_downloading';
break;
case 6:
statustext = 'Seeding';
statusclass = 'trweb_status_seeding';
break;
}
statustext = `[${srv}]: ${statustext} - ${torrent.servers[srv].percentDone}%`; statustext = `[${srv}]: ${statustext} - ${server_status.percentDone}%`;
}
} }
server.element_statusbar.style.width = `${barwidth}%`; control_element.element_statusbar.style.width = `${barwidth}%`;
server.classList.add(statusclass); control_element.classList.add(statusclass);
status.appendChild(document.createTextNode(statustext)); status.appendChild(document.createTextNode(statustext));
} }
} }
#handler(e) { #handler(e) {
switch (e.type) { switch (e.type) {
case 'click':
if (e.currentTarget.hasAttributeNS('trweb', 'torrentlistfield')) {
let hash;
switch (e.currentTarget.getAttributeNS('trweb', 'torrentlistfield')) {
case 'entry':
e.currentTarget.classList.toggle('trweb_hide_buttons');
e.stopPropagation();
break;
case 'start':
hash = e.currentTarget.getAttributeNS('trweb', 'torrent');
this.#dom_servermanager.getServers()[e.currentTarget.getAttributeNS('trweb', 'server')].torrent_start(hash);
e.stopPropagation();
break;
case 'pause':
hash = e.currentTarget.getAttributeNS('trweb', 'torrent');
this.#dom_servermanager.getServers()[e.currentTarget.getAttributeNS('trweb', 'server')].torrent_pause(hash);
e.stopPropagation();
break;
case 'magnet':
let magneturl;
hash = e.currentTarget.getAttributeNS('trweb', 'torrent');
for (const [srv, data] of Object.entries(this.#knownTorrents[hash].servers)) {
if (data.magnetLink != null) {
magneturl = data.magnetLink;
break;
}
}
if (magneturl != null) {
this.#dom_servermanager.getServers()[e.currentTarget.getAttributeNS('trweb', 'server')].torrent_add_url(magneturl, false, null);
}
else {
this.#logger(`Couldn't find magnet link! ${JSON.stringify(this.#knownTorrents[hash].servers)}`);
}
e.stopPropagation();
break;
case 'download':
e.stopPropagation();
window.alert('not implemented');
break;
}
}
break;
case 'DOMContentLoaded': case 'DOMContentLoaded':
this.#logger('Activating TRWEB instance'); this.#logger('Activating TRWEB instance');
this.#container = document.getElementById(this.#container); this.#container = document.getElementById(this.#container);
this.#container.classList.add('trweb_container'); this.#container.classList.add('trweb_container');
this.#container.appendChild(this.#dom_menubar.getElement()); this.#container.appendChild(this.#dom_menubar.getElement());
this.#container.appendChild(this.#torrentListView); this.#container.appendChild(this.#dom_torrentmanagger.getElement());
this.#container.appendChild(this.#guiFooter); this.#container.appendChild(this.#guiFooter);
this.#dom_servermanager.loadServers(); this.#dom_servermanager.loadServers();
@@ -311,8 +191,8 @@ class trweb {
let list = Object.values(this.#knownTorrents); let list = Object.values(this.#knownTorrents);
list.sort((a, b) => a.name.localeCompare(b.name)); list.sort((a, b) => a.name.localeCompare(b.name));
for (const node of list) { for (const torrent of list) {
this.#torrentListView.appendChild(node.element); this.#dom_torrentmanagger.getElement().appendChild(torrent.getElement());
} }
return list; return list;
} }
@@ -351,8 +231,8 @@ class trweb {
this.#dom_servermanager.saveServers(); this.#dom_servermanager.saveServers();
} }
/*removeServer(name) { removeServer(name) {
delete this.#servers[name]; delete this.#dom_servermanager.getServers()[name];
for (const [hash, entry] of Object.entries(this.#knownTorrents)) { for (const [hash, entry] of Object.entries(this.#knownTorrents)) {
entry.element.removeChild(entry.element_server[name]); entry.element.removeChild(entry.element_server[name]);
@@ -361,7 +241,7 @@ class trweb {
} }
this.#dom_servermanager.saveServers(); this.#dom_servermanager.saveServers();
}*/ }
} }
var trinstance = new trweb('trcontainer', null, null, function(msg) {console.info(`TRWEB: ${msg}`)}); var trinstance = new trweb('trcontainer', null, null, function(msg) {console.info(`TRWEB: ${msg}`)});