diff --git a/js/trserver.js b/js/trserver.js index 100fdff..2ac6112 100644 --- a/js/trserver.js +++ b/js/trserver.js @@ -150,11 +150,6 @@ class trserver extends EventTarget { } } - refreshSession (){ - //let tag = this.#rpccall_prepare('session-get', null); - //this.#rpccall(tag); - } - #parseTorrents(response) { let updatedHashes = []; // Update torrent data diff --git a/js/trweb.js b/js/trweb.js index 85d64cc..77811dc 100644 --- a/js/trweb.js +++ b/js/trweb.js @@ -1,8 +1,6 @@ "use strict"; class trweb { - /*#knownTorrents = {};*/ - #needsSort = false; #loadcb = function(key) {return localStorage.getItem(`trweb.${key}`)}; @@ -42,16 +40,9 @@ class trweb { this.#dom_servermanager = new trdom_servermanager(this.#loadcb, this.#savecb, this.#logcb); this.#dom_torrentmanagger = new trdom_torrentmanager(this.#logcb); - //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 */ + /* trdom_torrentmanager uses this to add new server controls to existing torrents */ 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'); @@ -67,86 +58,6 @@ class trweb { } } - #createTorrentEntry(hash) { - this.#updateTorrentDisplay(torrent); - } - - #updateTorrentDisplay(torrent) { - let txt_name = torrent.element.element_name; - nukeChildren(txt_name); - txt_name.appendChild(document.createTextNode(torrent.name)); - - for (const srv of Object.keys(this.#dom_servermanager.getServers())) { - let control = torrent.getControl(srv); - let control_element = control.element; - let status = control_element.element_status; - - control_element.classList.remove( - 'trweb_status_asdf', - 'trweb_status_offline', - 'trweb_status_nonexistent', - 'trweb_status_paused', - 'trweb_status_verifqueued', - 'trweb_status_verifying', - 'trweb_status_downloading', - 'trweb_status_seeding' - ); - - nukeChildren(status); - - let statustext = 'Nothing to see here'; - let statusclass = 'trweb_status_asdf' - let barwidth = 50; - if (!this.#dom_servermanager.getServers()[srv].isOnline()) { - statustext = "Server offline"; - statusclass = 'trweb_status_offline'; - barwidth = 0; - } - else { - let server_status = torrent.getStatus(srv); - if (server_status == undefined || server_status.deleted) { - statustext = "Not available"; - statusclass = 'trweb_status_nonexistent'; - barwidth = 0; - } - 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} - ${server_status.percentDone}%`; - } - } - control_element.element_statusbar.style.width = `${barwidth}%`; - control_element.classList.add(statusclass); - status.appendChild(document.createTextNode(statustext)); - } - } - handleEvent(e) { this.#log(6, `Handling event of type ${e.type}`); switch (e.type) { @@ -162,17 +73,6 @@ class trweb { 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;*/ default: this.#log(5, `Event type ${e.type} not supported`); break; @@ -182,27 +82,12 @@ class trweb { refresh() { this.#log(5,'Refresh'); for (const [key, value] of Object.entries(this.#dom_servermanager.getServers())) { - //value.refreshSession(); value.refreshTorrentList(); } } - sort() { - 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.element.appendChild(torrent.element); - } - return list; - } - #timercb = function() { this.#log(5,'Timer tick'); - if (this.#needsSort) { - this.#needsSort = false; - this.sort(); - } this.refresh(); }.bind(this);