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

fix: correct disk path detection (#279). The problem causes space in the disk name.

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2021-01-14 18:11:43 +01:00
parent 8337e5c6e7
commit 81e67e73bf
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Disk/popup.swift
View File

@@ -242,7 +242,7 @@ internal class DiskNameAndBarView: NSView {
override func mouseDown(with: NSEvent) {
if let uri = self.uri {
NSWorkspace.shared.openFile(uri.absoluteString, withApplication: "Finder")
NSWorkspace.shared.openFile(uri.path, withApplication: "Finder")
}
}
}

33
Modules/Disk/readers.swift
View File

@@ -46,7 +46,7 @@ internal class CapacityReader: Reader<DiskList> {
}
if let path = self.disks.list[idx].path {
self.disks.list[idx].free = self.freeDiskSpaceInBytes(path.absoluteString)
self.disks.list[idx].free = self.freeDiskSpaceInBytes(path)
self.driveStats(self.disks.list[idx].parent, &self.disks.list[idx].stats)
}
}
@@ -115,17 +115,17 @@ internal class CapacityReader: Reader<DiskList> {
d.connectionType = deviceProtocol as! String
}
if let volumePath = dict[kDADiskDescriptionVolumePathKey as String] {
let url = volumePath as? NSURL
if url != nil {
if url!.pathComponents!.count > 1 && url!.pathComponents![1] == "Volumes" {
let lastPath: String = (url?.lastPathComponent)!
if lastPath != "" {
d.mediaName = lastPath
d.path = URL(string: "/Volumes/\(lastPath)")
if let url = volumePath as? NSURL {
d.path = url as URL
if let components = url.pathComponents {
d.root = components.count == 1
if components.count > 1 && components[1] == "Volumes" {
if let name: String = url.lastPathComponent, name != "" {
d.mediaName = name
}
}
} else if url!.pathComponents!.count == 1 {
d.path = URL(string: "/")
d.root = true
}
}
}
@@ -139,7 +139,9 @@ internal class CapacityReader: Reader<DiskList> {
return nil
}
d.free = freeDiskSpaceInBytes(d.path!.absoluteString)
if let path = d.path {
d.free = freeDiskSpaceInBytes(path)
}
let partitionLevel = d.BSDName.filter { "0"..."9" ~= $0 }.count
if let parent = self.getDeviceIOParent(DADiskCopyIOMedia(disk), level: Int(partitionLevel)) {
@@ -199,10 +201,9 @@ internal class CapacityReader: Reader<DiskList> {
return
}
private func freeDiskSpaceInBytes(_ path: String) -> Int64 {
let fileURL = URL(fileURLWithPath: path)
private func freeDiskSpaceInBytes(_ path: URL) -> Int64 {
do {
let values = try fileURL.resourceValues(forKeys: [.volumeAvailableCapacityForImportantUsageKey])
let values = try path.resourceValues(forKeys: [.volumeAvailableCapacityForImportantUsageKey])
if let capacity = values.volumeAvailableCapacityForImportantUsage {
return capacity
}
@@ -211,7 +212,7 @@ internal class CapacityReader: Reader<DiskList> {
}
do {
let systemAttributes = try FileManager.default.attributesOfFileSystem(forPath: path)
let systemAttributes = try FileManager.default.attributesOfFileSystem(forPath: path.path)
if let freeSpace = (systemAttributes[FileAttributeKey.systemFreeSize] as? NSNumber)?.int64Value {
return freeSpace
}