Merge pull request #1169 from SebastianOsinski/diskstation_volume

Add option to specify volume in Diskstation widget
This commit is contained in:
shamoon 2023-04-03 14:35:21 -07:00 committed by GitHub
commit 2ab8e63df2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions

View File

@ -249,7 +249,8 @@ export function cleanServiceGroups(groups) {
podSelector, podSelector,
wan, // opnsense widget, wan, // opnsense widget,
enableBlocks, // emby/jellyfin enableBlocks, // emby/jellyfin
enableNowPlaying enableNowPlaying,
volume // diskstation widget
} = cleanedService.widget; } = cleanedService.widget;
const fieldsList = typeof fields === 'string' ? JSON.parse(fields) : fields; const fieldsList = typeof fields === 'string' ? JSON.parse(fields) : fields;
@ -284,6 +285,9 @@ export function cleanServiceGroups(groups) {
if (enableBlocks) cleanedService.widget.enableBlocks = enableBlocks === 'true'; if (enableBlocks) cleanedService.widget.enableBlocks = enableBlocks === 'true';
if (enableNowPlaying) cleanedService.widget.enableNowPlaying = enableNowPlaying === 'true'; if (enableNowPlaying) cleanedService.widget.enableNowPlaying = enableNowPlaying === 'true';
} }
if (type === "diskstation") {
if (volume) cleanedService.widget.volume = volume;
}
} }
return cleanedService; return cleanedService;

View File

@ -33,8 +33,7 @@ export default function Component({ service }) {
const uptime = `${ t("common.number", { value: days }) } ${ t("diskstation.days") }`; const uptime = `${ t("common.number", { value: days }) } ${ t("diskstation.days") }`;
// storage info // storage info
// TODO: figure out how to display info for more than one volume const volume = widget.volume ? storageData.data.vol_info?.find(vol => vol.name === widget.volume) : storageData.data.vol_info?.[0];
const volume = storageData.data.vol_info?.[0];
const usedBytes = parseFloat(volume?.used_size); const usedBytes = parseFloat(volume?.used_size);
const totalBytes = parseFloat(volume?.total_size); const totalBytes = parseFloat(volume?.total_size);
const freeBytes = totalBytes - usedBytes; const freeBytes = totalBytes - usedBytes;