From ee41e3ec7ca1b3dbcd9959c96e02012b1a8fa44a Mon Sep 17 00:00:00 2001 From: Serhiy Mytrovtsiy Date: Sat, 6 Jun 2020 12:22:15 +0200 Subject: [PATCH] fix disk module (read disk bsd name) --- Stats.xcodeproj/project.pbxproj | 4 ++-- Stats/Modules/Disk/DiskCapacityReader.swift | 24 +++++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Stats.xcodeproj/project.pbxproj b/Stats.xcodeproj/project.pbxproj index 86dad0bc..40f8964f 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.4; + MARKETING_VERSION = 1.6.5; 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.4; + MARKETING_VERSION = 1.6.5; 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 0ed6d433..b5a821f3 100644 --- a/Stats/Modules/Disk/DiskCapacityReader.swift +++ b/Stats/Modules/Disk/DiskCapacityReader.swift @@ -82,19 +82,21 @@ class DiskCapacityReader: Reader { for url in paths { if url.pathComponents.count == 1 || (url.pathComponents.count > 1 && url.pathComponents[1] == "Volumes") { if let disk = DADiskCreateFromVolumePath(kCFAllocatorDefault, session, url as CFURL) { - let BSDName: String = String(cString: DADiskGetBSDName(disk)!) - - if let _: diskInfo = self.disks.getDiskByBSDName(BSDName) { - 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) + if let diskName = DADiskGetBSDName(disk) { + let BSDName: String = String(cString: diskName) + + if let _: diskInfo = self.disks.getDiskByBSDName(BSDName) { + 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 + } + + if let d = getDisk(disk) { + self.disks.list.append(d) } - continue - } - - if let d = getDisk(disk) { - self.disks.list.append(d) } } }