morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-14 00:04:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix disk module (read disk bsd name)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2020-06-06 12:22:15 +02:00
parent 525abaa443
commit ee41e3ec7c
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Stats.xcodeproj/project.pbxproj
View File

@@ -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 = "";

24
Stats/Modules/Disk/DiskCapacityReader.swift
View File

@@ -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)
}
}
}