zoriya/flood
1
0
Fork 0
mirror of https://github.com/zoriya/flood.git synced 2026-06-06 20:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feat/diskuse (#808)

Browse Source 
* Show disk usage in sidebar (#308)

* Clean up

* Fix linting, DiskUsageService as singleton

* node 8

* missing scope

* prettier

* Tooltip prefer top position

* tweaky

* Configure diskUsageSerivce.watchMountPoints option

  - filters mountpoints to include in the sidebar
  - omitting this field gives all mounted filesystems

* use connectStores

* activity stream unsubscribe from events on res 'close' event

* remove nbsp; use css

* prettier format

* Return empty array on win32 and darwin platforms

* Use 1K blocks, add (untested) macos support

* prettier

* config.template typo

* rename var fs -> mountpoint

* Filter wrong output, use df -l in macos

  - macos df return map -hosts and map auto_home in the first column
  which breaks splitting in awk. They are anyway not real

* Changed my mind about filter. just -l

* Apply jfurrow's patch

* Remove unnecessary defaultProp

* Use FormattedMessage

* Fix formatting
This commit is contained in:
Johannes Wikner
2019-08-31 19:42:00 +02:00
committed by John Furrow
parent 06089c46a0
commit 86008d5ffb
15 changed files with 367 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/middleware/clientActivityStream.js
+32 -11
View File
@@ -7,6 +7,8 @@ const serverEventTypes = require('../../shared/constants/serverEventTypes');
const services = require('../services');
const taxonomyServiceEvents = require('../constants/taxonomyServiceEvents');
const torrentServiceEvents = require('../constants/torrentServiceEvents');
const diskUsageServiceEvents = require('../constants/diskUsageServiceEvents');
const DiskUsageService = require('../services/diskUsageService');
module.exports = (req, res) => {
const {
@@ -20,11 +22,13 @@ module.exports = (req, res) => {
const torrentList = serviceInstances.torrentService.getTorrentList();
const transferSummary = serviceInstances.historyService.getTransferSummary();
// Remove all previous event listeners.
serviceInstances.historyService.removeAllListeners();
serviceInstances.notificationService.removeAllListeners();
serviceInstances.taxonomyService.removeAllListeners();
serviceInstances.torrentService.removeAllListeners();
// Hook into events and stop listening when connection is closed
const handleEvents = (emitter, event, handler) => {
emitter.on(event, handler);
res.on('close', () => {
emitter.removeListener(event, handler);
});
};
// Emit current state immediately on connection.
serverEvent.setID(Date.now());
@@ -32,6 +36,22 @@ module.exports = (req, res) => {
serverEvent.addData({isConnected: !serviceInstances.clientGatewayService.hasError});
serverEvent.emit();
const handleDiskUsageChange = diskUsageChange => {
serverEvent.setID(diskUsageChange.id);
serverEvent.setType(serverEventTypes.DISK_USAGE_CHANGE);
serverEvent.addData(diskUsageChange.disks);
serverEvent.emit();
};
DiskUsageService.updateDisks().then(() => {
const diskUsage = DiskUsageService.getDiskUsage();
serverEvent.setID(diskUsage.id);
serverEvent.setType(serverEventTypes.DISK_USAGE_CHANGE);
serverEvent.addData(diskUsage.disks);
serverEvent.emit();
handleEvents(DiskUsageService, diskUsageServiceEvents.DISK_USAGE_CHANGE, handleDiskUsageChange);
});
serverEvent.setID(torrentList.id);
serverEvent.setType(serverEventTypes.TORRENT_LIST_FULL_UPDATE);
serverEvent.addData(torrentList.torrents);
@@ -52,7 +72,7 @@ module.exports = (req, res) => {
serverEvent.addData(serviceInstances.notificationService.getNotificationCount());
serverEvent.emit();
serviceInstances.clientGatewayService.on(clientGatewayServiceEvents.CLIENT_CONNECTION_STATE_CHANGE, () => {
handleEvents(serviceInstances.clientGatewayService, clientGatewayServiceEvents.CLIENT_CONNECTION_STATE_CHANGE, () => {
serverEvent.setID(Date.now());
serverEvent.setType(serverEventTypes.CLIENT_CONNECTIVITY_STATUS_CHANGE);
serverEvent.addData({isConnected: !serviceInstances.clientGatewayService.hasError});
@@ -78,7 +98,8 @@ module.exports = (req, res) => {
});
// Add user's specified history snapshot change event listener.
serviceInstances.historyService.on(
handleEvents(
serviceInstances.historyService,
historyServiceEvents[`${historySnapshotTypes[historySnapshot]}_SNAPSHOT_FULL_UPDATE`],
payload => {
const {data, id} = payload;
@@ -90,7 +111,7 @@ module.exports = (req, res) => {
},
);
serviceInstances.notificationService.on(notificationServiceEvents.NOTIFICATION_COUNT_CHANGE, payload => {
handleEvents(serviceInstances.notificationService, notificationServiceEvents.NOTIFICATION_COUNT_CHANGE, payload => {
const {data, id} = payload;
serverEvent.setID(id);
@@ -100,7 +121,7 @@ module.exports = (req, res) => {
});
// Add diff event listeners.
serviceInstances.historyService.on(historyServiceEvents.TRANSFER_SUMMARY_DIFF_CHANGE, payload => {
handleEvents(serviceInstances.historyService, historyServiceEvents.TRANSFER_SUMMARY_DIFF_CHANGE, payload => {
const {diff, id} = payload;
serverEvent.setID(id);
@@ -109,7 +130,7 @@ module.exports = (req, res) => {
serverEvent.emit();
});
serviceInstances.taxonomyService.on(taxonomyServiceEvents.TAXONOMY_DIFF_CHANGE, payload => {
handleEvents(serviceInstances.taxonomyService, taxonomyServiceEvents.TAXONOMY_DIFF_CHANGE, payload => {
const {diff, id} = payload;
serverEvent.setID(id);
@@ -118,7 +139,7 @@ module.exports = (req, res) => {
serverEvent.emit();
});
serviceInstances.torrentService.on(torrentServiceEvents.TORRENT_LIST_DIFF_CHANGE, payload => {
handleEvents(serviceInstances.torrentService, torrentServiceEvents.TORRENT_LIST_DIFF_CHANGE, payload => {
const {diff, id} = payload;
serverEvent.setID(id);