diff --git a/files/src/main/java/de/nbscloud/files/FileSystemService.java b/files/src/main/java/de/nbscloud/files/FileSystemService.java index 422221a..d698d75 100644 --- a/files/src/main/java/de/nbscloud/files/FileSystemService.java +++ b/files/src/main/java/de/nbscloud/files/FileSystemService.java @@ -227,17 +227,17 @@ public class FileSystemService { } } - public long getSpaceOnDevice(String device) { + public long getDiskSize(String device) { try { final Process process = Runtime.getRuntime() .exec(new String[]{"lsblk", "-b", "-o", "SIZE", "-n", device}); - final String space = new BufferedReader(new InputStreamReader(process.getInputStream())).readLine(); + final String size = new BufferedReader(new InputStreamReader(process.getInputStream())).readLine(); process.destroy(); - return Long.parseLong(space); + return Long.parseLong(size); } catch (IOException e) { - throw new FileSystemServiceException("Could not get file", e); + throw new FileSystemServiceException("Could not get disk size", e); } } diff --git a/files/src/main/java/de/nbscloud/files/controller/WidgetController.java b/files/src/main/java/de/nbscloud/files/controller/WidgetController.java index 0bc7aa3..f2a02d1 100644 --- a/files/src/main/java/de/nbscloud/files/controller/WidgetController.java +++ b/files/src/main/java/de/nbscloud/files/controller/WidgetController.java @@ -32,11 +32,15 @@ public class WidgetController { @GetMapping("files/widgets/diskUsage") public String getDiskUsage(HttpServletRequest request, HttpServletResponse response, Model model) { final String device = this.fileSystemService.getDevice(); + final long diskSize = this.fileSystemService.getDiskSize(device); + final long used = FileUtils.sizeOfDirectory(Paths.get(this.filesConfig.getBaseDir()).toFile()); + final long available = diskSize - used; model.addAttribute("baseDir", this.filesConfig.getBaseDir()); model.addAttribute("device", device); - model.addAttribute("available", this.fileSystemService.getSpaceOnDevice(device)); - model.addAttribute("used", FileUtils.sizeOfDirectory(Paths.get(this.filesConfig.getBaseDir()).toFile())); + model.addAttribute("available", available); + model.addAttribute("used", used); + model.addAttribute("diskSize", diskSize); return "files/widgets/diskUsage :: file-disk-usage"; } diff --git a/files/src/main/resources/i18n/files_messages.properties b/files/src/main/resources/i18n/files_messages.properties index b6a010f..9d15bc7 100644 --- a/files/src/main/resources/i18n/files_messages.properties +++ b/files/src/main/resources/i18n/files_messages.properties @@ -29,6 +29,7 @@ nbscloud.files.file-disk-usage-widget-table.basedir=Base dir\: nbscloud.files.file-disk-usage-widget-table.device=Host device\: nbscloud.files.file-disk-usage-widget-table.available=Available\: nbscloud.files.file-disk-usage-widget-table.used=Used\: +nbscloud.files.file-disk-usage-widget-table.disksize=Disk size\: nbscloud.files.delete.success=File deleted nbscloud.files.rename.success=File renamed diff --git a/files/src/main/resources/i18n/files_messages_de_DE.properties b/files/src/main/resources/i18n/files_messages_de_DE.properties index 481b34e..ebee3b3 100644 --- a/files/src/main/resources/i18n/files_messages_de_DE.properties +++ b/files/src/main/resources/i18n/files_messages_de_DE.properties @@ -29,6 +29,7 @@ nbscloud.files.file-disk-usage-widget-table.basedir=Verzeichnis\: nbscloud.files.file-disk-usage-widget-table.device=Ger\u00E4t\: nbscloud.files.file-disk-usage-widget-table.available=Verf\u00FCgbar\: nbscloud.files.file-disk-usage-widget-table.used=Belegt\: +nbscloud.files.file-disk-usage-widget-table.disksize=Gr\u00F6\u00DFe\: nbscloud.files.delete.success=Datei gel\u00F6scht nbscloud.files.rename.success=Datei verschoben/umbenannt diff --git a/files/src/main/resources/templates/files/widgets/diskUsage.html b/files/src/main/resources/templates/files/widgets/diskUsage.html index 4cc86ad..8610c2f 100644 --- a/files/src/main/resources/templates/files/widgets/diskUsage.html +++ b/files/src/main/resources/templates/files/widgets/diskUsage.html @@ -10,12 +10,16 @@ - - + + + + + + \ No newline at end of file