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

Huge rewrite

Browse Source 
Auto-refresh and sort are disabled for now
This commit is contained in:
Fehér Roland
2025-10-09 15:42:31 +02:00
parent b2f155c0b4
commit cabc0fbaf1
7 changed files with 350 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
js/trweb.js
View File

@@ -1,7 +1,7 @@
"use strict";
class trweb {
#knownTorrents = {};
/*#knownTorrents = {};*/
#needsSort = false;
@@ -13,6 +13,11 @@ class trweb {
this.#logger(`${module}: ${msg}`);
}
}.bind(this);
#log(loglevel, msg) {
if (this.#logcb !== null) {
this.#logcb('TRWEB', loglevel, msg);
}
}
#timer;
@@ -22,7 +27,7 @@ class trweb {
#dom_menubar = new trdom_menubar();
#dom_servermanager;
#dom_torrentmanagger = new trdom_torrentmanager();
#dom_torrentmanagger;
constructor (container, loadcb, savecb, logger) {
this.#container = container;
@@ -34,9 +39,19 @@ class trweb {
this.#logger = logger;
}
this.#dom_servermanager = new trdom_servermanager(this.#loadcb, this.#savecb, this.#logcb, this.#registerServer);
this.#dom_servermanager = new trdom_servermanager(this.#loadcb, this.#savecb, this.#logcb);
this.#dom_torrentmanagger = new trdom_torrentmanager(this.#logcb);
this.#dom_servermanager.addEventListener('torrent-update', this);
//TODO: these should be handled by trdom_torrentmanager
//this.#dom_servermanager.addEventListener('torrent-updated', this);
//this.#dom_servermanager.addEventListener('torrentserver-added', this);
//this.#dom_servermanager.addEventListener('torrent-updated', this.#dom_torrentmanagger);// for creating torrents when we first get their info
/* trdom_torrentmanager uses this to add its listeners onto servers */
this.#dom_servermanager.addEventListener('torrentserver-added', this.#dom_torrentmanagger);
this.#dom_servermanager.addEventListener('torrent-created', this.#dom_torrentmanagger);
//this.#dom_torrentmanagger.addEventListener('torrent-created', this.#dom_servermanager);// for adding server controls to new torrents
this.#guiFooter = document.createElement('div');
this.#guiFooter.classList.add('trweb_footer');
@@ -52,45 +67,8 @@ class trweb {
}
}
#registerServer = function(name, initdata) {
let torrentCallback = function(hash, torrentInfo) {
let mergedTorrentInfo = this.#knownTorrents[hash];
if (mergedTorrentInfo == null) {
mergedTorrentInfo = this.#createTorrentEntry(hash);
}
mergedTorrentInfo.setStatus(name, torrentInfo);
mergedTorrentInfo.name = torrentInfo.name;
this.#updateTorrentDisplay(mergedTorrentInfo);
}.bind(this);
let newserver = new trserver(initdata, function(msg) {this.#logger(`[Server: ${name}]: ${msg}`);}.bind(this), torrentCallback);
this.#dom_servermanager.getServers()[name] = newserver;
newserver.refreshTorrentList();
}.bind(this);
#createTorrentEntry(hash) {
let torrent = new trtorrent(hash);
this.#knownTorrents[hash] = torrent;
for (const srv of Object.keys(this.#dom_servermanager.getServers())) {
this.#createServerEntryForTorrent(hash, srv);
}
this.#dom_torrentmanagger.getElement().appendChild(torrent.getElement());
this.#updateTorrentDisplay(torrent);
return torrent;
}
#createServerEntryForTorrent(hash, srv) {
this.#needsSort = true;
let control = new trdom_torrentcontrol(hash, this.#dom_servermanager.getServers()[srv], this.#logcb, function() {return this.#knownTorrents}.bind(this));
let torrent = this.#knownTorrents[hash];
torrent.addControl(srv, control);
}
#updateTorrentDisplay(torrent) {
@@ -170,34 +148,39 @@ class trweb {
}
handleEvent(e) {
this.#log(6, `Handling event of type ${e.type}`);
switch (e.type) {
case 'DOMContentLoaded':
this.#logger('Activating TRWEB instance');
this.#container = document.getElementById(this.#container);
this.#container.classList.add('trweb_container');
this.#container.appendChild(this.#dom_menubar.getElement());
this.#container.appendChild(this.#dom_torrentmanagger.getElement());
this.#container.appendChild(this.#guiFooter);
this.#dom_servermanager.loadServers();
this.#dom_servermanager.saveServers();
this.setTimer();
break;
case 'torrent-update':
let mergedTorrentInfo = this.#knownTorrents[e.detail.torrentHash];
if (mergedTorrentInfo == null) {
mergedTorrentInfo = this.#createTorrentEntry(e.detail.torrentHash);
}
mergedTorrentInfo.setStatus(e.detail.serverName, e.detail.torrentInfo);
mergedTorrentInfo.name = e.detail.torrentInfo.name;
case 'DOMContentLoaded':
this.#logger('Activating TRWEB instance');
this.#container = document.getElementById(this.#container);
this.#container.classList.add('trweb_container');
this.#container.appendChild(this.#dom_menubar.getElement());
this.#container.appendChild(this.#dom_torrentmanagger.getElement());
this.#container.appendChild(this.#guiFooter);
this.#dom_servermanager.loadServers();
//this.setTimer();
break;
/*case 'torrent-updated':
this.#log(1, 'making sure');
let mergedTorrentInfo = this.#knownTorrents[e.detail.torrentHash];
if (mergedTorrentInfo == null) {
mergedTorrentInfo = this.#createTorrentEntry(e.detail.torrentHash);
}
mergedTorrentInfo.setStatus(e.detail.serverName, e.detail.torrentInfo);
mergedTorrentInfo.name = e.detail.torrentInfo.name;
this.#updateTorrentDisplay(mergedTorrentInfo);
break;
this.#updateTorrentDisplay(mergedTorrentInfo);
break;*/
default:
this.#log(5, `Event type ${e.type} not supported`);
break;
}
}
refresh() {
this.#log(5,'Refresh');
for (const [key, value] of Object.entries(this.#dom_servermanager.getServers())) {
//value.refreshSession();
value.refreshTorrentList();
@@ -205,16 +188,17 @@ class trweb {
}
sort() {
let list = Object.values(this.#knownTorrents);
let list = Object.values(this.#dom_torrentmanagger.torrents);
list.sort((a, b) => a.name.localeCompare(b.name));
for (const torrent of list) {
this.#dom_torrentmanagger.getElement().appendChild(torrent.getElement());
this.#dom_torrentmanagger.getElement().appendChild(torrent.element);
}
return list;
}
#timercb = function() {
this.#log(5,'Timer tick');
if (this.#needsSort) {
this.#needsSort = false;
this.sort();
@@ -239,16 +223,10 @@ class trweb {
}
addServer(name, url, user, pass) {
this.#registerServer(name, {'rpcurl': url, 'auth': `Basic ${btoa(`${user}:${pass}`)}`});
for (const hash of Object.keys(this.#knownTorrents)) {
this.#createServerEntryForTorrent(hash, name);
}
this.#dom_servermanager.saveServers();
this.#dom_servermanager.addServer(name, url, user, pass);
}
removeServer(name) {
/*removeServer(name) {
delete this.#dom_servermanager.getServers()[name];
for (const [hash, entry] of Object.entries(this.#knownTorrents)) {
@@ -258,7 +236,7 @@ class trweb {
}
this.#dom_servermanager.saveServers();
}
}*/
}
var trinstance = new trweb('trcontainer', null, null, function(msg) {console.info(`TRWEB: ${msg}`)});