From 525abaa44315e8989c01ad4454288ba0f4eb9444 Mon Sep 17 00:00:00 2001
From: Serhiy Mytrovtsiy <mitrovtsiy@ukr.net>
Date: Wed, 29 Apr 2020 15:39:37 +0200
Subject: [PATCH] fix disk module (read freeSize of disk)

---
 Makefile                                    |  4 +--
 Stats.xcodeproj/project.pbxproj             |  4 +--
 Stats/Modules/Disk/DiskCapacityReader.swift | 31 ++++++++++-----------
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index ad4f70e2..9f6bf502 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ DMG_PATH = $(PWD)/$(APP).dmg
 all: clean archive notarize sign build
 
 clean:
-	rm -rf $(BUILD_PATH)
+# 	rm -rf $(BUILD_PATH)
 
 .PHONY: archive
 archive: clean
@@ -70,7 +70,7 @@ build: sign
 	    $(APP_PATH)
 
 	rm -rf ./create-dmg
-	rm -rf $(BUILD_PATH)
+# 	rm -rf $(BUILD_PATH)
 	open $(PWD)
 
 check:
diff --git a/Stats.xcodeproj/project.pbxproj b/Stats.xcodeproj/project.pbxproj
index 2a5bf69b..86dad0bc 100644
--- a/Stats.xcodeproj/project.pbxproj
+++ b/Stats.xcodeproj/project.pbxproj
@@ -758,7 +758,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 1.6.3;
+				MARKETING_VERSION = 1.6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -789,7 +789,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 1.6.3;
+				MARKETING_VERSION = 1.6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Stats/Modules/Disk/DiskCapacityReader.swift b/Stats/Modules/Disk/DiskCapacityReader.swift
index ee9f49d1..0ed6d433 100644
--- a/Stats/Modules/Disk/DiskCapacityReader.swift
+++ b/Stats/Modules/Disk/DiskCapacityReader.swift
@@ -28,33 +28,27 @@ struct disksList {
     var list: [diskInfo] = []
     
     func getDiskByBSDName(_ name: String) -> diskInfo? {
-        let idx = self.list.firstIndex { $0.mediaBSDName == name }
-        
-        if idx == nil {
-            return nil
+        if let idx = self.list.firstIndex(where: { $0.mediaBSDName == name }) {
+            return self.list[idx]
         }
         
-        return self.list[idx!]
+        return nil
     }
     
     func getDiskByName(_ name: String) -> diskInfo? {
-        let idx = self.list.firstIndex { $0.name == name }
-        
-        if idx == nil {
-            return nil
+        if let idx = self.list.firstIndex(where: { $0.name == name }) {
+            return self.list[idx]
         }
         
-        return self.list[idx!]
+        return nil
     }
     
     func getRootDisk() -> diskInfo? {
-        let idx = self.list.firstIndex { $0.root }
-        
-        if idx == nil {
-            return nil
+        if let idx = self.list.firstIndex(where: { $0.root }) {
+            return self.list[idx]
         }
         
-        return self.list[idx!]
+        return nil
     }
 }
 
@@ -91,8 +85,11 @@ class DiskCapacityReader: Reader {
                         let BSDName: String = String(cString: DADiskGetBSDName(disk)!)
                         
                         if let _: diskInfo = self.disks.getDiskByBSDName(BSDName) {
-                            let idx = self.disks.list.firstIndex { $0.mediaBSDName == BSDName }
-                            self.disks.list[idx!].freeSize = freeDiskSpaceInBytes(self.disks.list[idx!].path!.absoluteString)
+                            if let idx = self.disks.list.firstIndex(where: { $0.mediaBSDName == BSDName }) {
+                                if let path = self.disks.list[idx].path {
+                                    self.disks.list[idx].freeSize = freeDiskSpaceInBytes(path.absoluteString)
+                                }
+                            }
                             continue
                         }