mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2025-06-27 17:09:53 -04:00
WebUI: Cache server stats for statistics window
This change ensures that the WebUI caches relevant server stats for immediate display once the statistics window is opened. Previously, all stats would remain blank until maindata was fetched. This could take a while if e.g. the user was on the search tab. Closes #22764. PR #22817.
This commit is contained in:
Thomas Piccirello
GitHub
parent
8aa1a96d71
commit
78fae0ae76
5 changed files with 93 additions and 15 deletions
|
|
@ -42,6 +42,7 @@
|
|||
<script defer src="scripts/client.js?locale=${LANG}&v=${CACHEID}"></script>
|
||||
<script defer src="scripts/contextmenu.js?locale=${LANG}&v=${CACHEID}"></script>
|
||||
<script defer src="scripts/pathAutofill.js?v=${CACHEID}"></script>
|
||||
<script defer src="scripts/statistics.js?v=${CACHEID}"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -1046,20 +1046,8 @@ window.addEventListener("DOMContentLoaded", (event) => {
|
|||
}
|
||||
|
||||
// Statistics dialog
|
||||
if (document.getElementById("statisticsContent")) {
|
||||
document.getElementById("AlltimeDL").textContent = window.qBittorrent.Misc.friendlyUnit(serverState.alltime_dl, false);
|
||||
document.getElementById("AlltimeUL").textContent = window.qBittorrent.Misc.friendlyUnit(serverState.alltime_ul, false);
|
||||
document.getElementById("TotalWastedSession").textContent = window.qBittorrent.Misc.friendlyUnit(serverState.total_wasted_session, false);
|
||||
document.getElementById("GlobalRatio").textContent = serverState.global_ratio;
|
||||
document.getElementById("TotalPeerConnections").textContent = serverState.total_peer_connections;
|
||||
document.getElementById("ReadCacheHits").textContent = `${serverState.read_cache_hits}%`;
|
||||
document.getElementById("TotalBuffersSize").textContent = window.qBittorrent.Misc.friendlyUnit(serverState.total_buffers_size, false);
|
||||
document.getElementById("WriteCacheOverload").textContent = `${serverState.write_cache_overload}%`;
|
||||
document.getElementById("ReadCacheOverload").textContent = `${serverState.read_cache_overload}%`;
|
||||
document.getElementById("QueuedIOJobs").textContent = serverState.queued_io_jobs;
|
||||
document.getElementById("AverageTimeInQueue").textContent = `${serverState.average_time_queue} ms`;
|
||||
document.getElementById("TotalQueuedSize").textContent = window.qBittorrent.Misc.friendlyUnit(serverState.total_queued_size, false);
|
||||
}
|
||||
window.qBittorrent.Statistics.save(serverState);
|
||||
window.qBittorrent.Statistics.render();
|
||||
|
||||
switch (serverState.connection_status) {
|
||||
case "connected":
|
||||
|
|
|
|||
|
|
@ -492,7 +492,10 @@ const initializeWindows = () => {
|
|||
height: loadWindowHeight(id, 415),
|
||||
onResize: window.qBittorrent.Misc.createDebounceHandler(500, (e) => {
|
||||
saveWindowSize(id);
|
||||
})
|
||||
}),
|
||||
onContentLoaded: () => {
|
||||
window.qBittorrent.Statistics.render();
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
|||
85
src/webui/www/private/scripts/statistics.js
Normal file
85
src/webui/www/private/scripts/statistics.js
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
/*
|
||||
* MIT License
|
||||
* Copyright (C) 2025 Thomas Piccirello <thomas@piccirello.com>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
"use strict";
|
||||
|
||||
window.qBittorrent ??= {};
|
||||
window.qBittorrent.Statistics ??= (() => {
|
||||
const exports = () => {
|
||||
return {
|
||||
save: save,
|
||||
render: render,
|
||||
};
|
||||
};
|
||||
|
||||
const statistics = {
|
||||
alltimeDL: 0,
|
||||
alltimeUL: 0,
|
||||
totalWastedSession: 0,
|
||||
globalRatio: 0,
|
||||
totalPeerConnections: 0,
|
||||
readCacheHits: 0,
|
||||
totalBuffersSize: 0,
|
||||
writeCacheOverload: 0,
|
||||
readCacheOverload: 0,
|
||||
queuedIOJobs: 0,
|
||||
averageTimeInQueue: 0,
|
||||
totalQueuedSize: 0,
|
||||
};
|
||||
|
||||
const save = (serverState) => {
|
||||
statistics.alltimeDL = serverState.alltime_dl;
|
||||
statistics.alltimeUL = serverState.alltime_ul;
|
||||
statistics.totalWastedSession = serverState.total_wasted_session;
|
||||
statistics.globalRatio = serverState.global_ratio;
|
||||
statistics.totalPeerConnections = serverState.total_peer_connections;
|
||||
statistics.readCacheHits = serverState.read_cache_hits;
|
||||
statistics.totalBuffersSize = serverState.total_buffers_size;
|
||||
statistics.writeCacheOverload = serverState.write_cache_overload;
|
||||
statistics.readCacheOverload = serverState.read_cache_overload;
|
||||
statistics.queuedIOJobs = serverState.queued_io_jobs;
|
||||
statistics.averageTimeInQueue = serverState.average_time_queue;
|
||||
statistics.totalQueuedSize = serverState.total_queued_size;
|
||||
};
|
||||
|
||||
const render = () => {
|
||||
if (!document.getElementById("statisticsContent"))
|
||||
return;
|
||||
|
||||
document.getElementById("AlltimeDL").textContent = window.qBittorrent.Misc.friendlyUnit(statistics.alltimeDL, false);
|
||||
document.getElementById("AlltimeUL").textContent = window.qBittorrent.Misc.friendlyUnit(statistics.alltimeUL, false);
|
||||
document.getElementById("TotalWastedSession").textContent = window.qBittorrent.Misc.friendlyUnit(statistics.totalWastedSession, false);
|
||||
document.getElementById("GlobalRatio").textContent = statistics.globalRatio;
|
||||
document.getElementById("TotalPeerConnections").textContent = statistics.totalPeerConnections;
|
||||
document.getElementById("ReadCacheHits").textContent = `${statistics.readCacheHits}%`;
|
||||
document.getElementById("TotalBuffersSize").textContent = window.qBittorrent.Misc.friendlyUnit(statistics.totalBuffersSize, false);
|
||||
document.getElementById("WriteCacheOverload").textContent = `${statistics.writeCacheOverload}%`;
|
||||
document.getElementById("ReadCacheOverload").textContent = `${statistics.readCacheOverload}%`;
|
||||
document.getElementById("QueuedIOJobs").textContent = statistics.queuedIOJobs;
|
||||
document.getElementById("AverageTimeInQueue").textContent = `${statistics.averageTimeInQueue} ms`;
|
||||
document.getElementById("TotalQueuedSize").textContent = window.qBittorrent.Misc.friendlyUnit(statistics.totalQueuedSize, false);
|
||||
};
|
||||
|
||||
return exports();
|
||||
})();
|
||||
Object.freeze(window.qBittorrent.Statistics);
|
||||
|
|
@ -419,6 +419,7 @@
|
|||
<file>private/scripts/prop-webseeds.js</file>
|
||||
<file>private/scripts/rename-files.js</file>
|
||||
<file>private/scripts/search.js</file>
|
||||
<file>private/scripts/statistics.js</file>
|
||||
<file>private/setlocation.html</file>
|
||||
<file>private/shareratio.html</file>
|
||||
<file>private/speedlimit.html</file>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue