Improved code and add all disks option

87kangsw · Feb 4, 2021 · 14f34d8 · 14f34d8
1 parent 25bc621
commit 14f34d8
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 19 deletions.
diff --git a/Resource/ar.lproj/Localizable.strings b/Resource/ar.lproj/Localizable.strings
@@ -121,6 +121,7 @@
 // MARK: Disk
 "disk.eject" = "Eject";
 "disk.select" = "Select disk";
+"disk.all" = "All Disks";
 
 // MARK: Language
 "language" = "اللغة";

diff --git a/Resource/cs.lproj/Localizable.strings b/Resource/cs.lproj/Localizable.strings
@@ -120,6 +120,7 @@
 // MARK: Disk
 "disk.eject" = "Vysunout";
 "disk.select" = "Select disk";
+"disk.all" = "All Disks";
 
 // MARK: Language
 "language" = "Language";

diff --git a/Resource/de.lproj/Localizable.strings b/Resource/de.lproj/Localizable.strings
@@ -121,6 +121,7 @@
 // MARK: Disk
 "disk.eject" = "Eject";
 "disk.select" = "Select disk";
+"disk.all" = "All Disks";
 
 // MARK: Language
 "language" = "Sprache:";

diff --git a/Resource/en.lproj/Localizable.strings b/Resource/en.lproj/Localizable.strings
@@ -121,6 +121,7 @@
 // MARK: Disk
 "disk.eject" = "Eject";
 "disk.select" = "Select disk";
+"disk.all" = "All Disks";
 
 // MARK: Language
 "language" = "Language";

diff --git a/Resource/es.lproj/Localizable.strings b/Resource/es.lproj/Localizable.strings
@@ -121,6 +121,7 @@
 // MARK: Disk
 "disk.eject" = "Eject";
 "disk.select" = "Select disk";
+"disk.all" = "All Disks";
 
 // MARK: Language
 "language" = "Idioma";

diff --git a/Resource/fr.lproj/Localizable.strings b/Resource/fr.lproj/Localizable.strings
@@ -121,6 +121,7 @@
 // MARK: Disk
 "disk.eject" = "Ejecter";
 "disk.select" = "Select disk";
+"disk.all" = "All Disks";
 
 // MARK: Language
 "language" = "Language";

diff --git a/Resource/ja.lproj/Localizable.strings b/Resource/ja.lproj/Localizable.strings
@@ -121,6 +121,7 @@
 // MARK: Disk
 "disk.eject" = "Eject";
 "disk.select" = "Select disk";
+"disk.all" = "All Disks";
 
 // MARK: Language
 "language" = "言語";

diff --git a/Resource/ko.lproj/Localizable.strings b/Resource/ko.lproj/Localizable.strings
@@ -124,6 +124,7 @@
 // MARK: Disk
 "disk.eject" = "Eject";
 "disk.select" = "Select disk";
+"disk.all" = "All Disks";
 
 // MARK: Language
 "language" = "언어";

diff --git a/Resource/mn.lproj/Localizable.strings b/Resource/mn.lproj/Localizable.strings
@@ -121,6 +121,7 @@
 // MARK: Disk
 "disk.eject" = "Eject";
 "disk.select" = "Select disk";
+"disk.all" = "All Disks";
 
 // MARK: Language
 "language" = "Хэл";

diff --git a/Resource/pt.lproj/Localizable.strings b/Resource/pt.lproj/Localizable.strings
@@ -121,6 +121,7 @@
 // MARK: Disk
 "disk.eject" = "Eject";
 "disk.select" = "Select disk";
+"disk.all" = "All Disks";
 
 // MARK: Language
 "language" = "Língua";

diff --git a/Resource/ru.lproj/Localizable.strings b/Resource/ru.lproj/Localizable.strings
@@ -121,6 +121,7 @@
 // MARK: Disk
 "disk.eject" = "Eject";
 "disk.select" = "Select disk";
+"disk.all" = "All Disks";
 
 // MARK: Language
 "language" = "Язык";

diff --git a/Resource/uk.lproj/Localizable.strings b/Resource/uk.lproj/Localizable.strings
@@ -121,6 +121,7 @@
 // MARK: Disk
 "disk.eject" = "Eject";
 "disk.select" = "Select disk";
+"disk.all" = "All Disks";
 
 // MARK: Language
 "language" = "Мова";

diff --git a/Resource/zh-Hans.lproj/Localizable.strings b/Resource/zh-Hans.lproj/Localizable.strings
@@ -120,7 +120,8 @@
 
 // MARK: Disk
 "disk.eject" = "推出";
-"disk.select" = "Select disk";
+"disk.select" = "选择存储";
+"disk.all" = "所有存储";
 
 // MARK: Language
 "language" = "语言";

diff --git a/eul/Schema/EulComponent.swift b/eul/Schema/EulComponent.swift
@@ -27,10 +27,7 @@ enum EulComponent: String, CaseIterable, Identifiable, Codable, JSONCodabble, Lo
     }
 
     var isDiskSelectionAvailable: Bool {
-        guard [.Disk].contains(self) else {
-            return false
-        }
-        return true
+        self == .Disk
     }
 
     func getView() -> AnyView {

diff --git a/eul/Schema/EulComponentConfig.swift b/eul/Schema/EulComponentConfig.swift
@@ -13,7 +13,7 @@ struct EulComponentConfig: Codable {
     var component: EulComponent
     var showIcon: Bool = true
     var showGraph: Bool = false
-    var diskSelection: String = SharedStore.disk.list?.disks.first?.name ?? "N/A"
+    var diskSelection: String = ""
 
     var json: JSON {
         JSON([

diff --git a/eul/Store/DiskStore.swift b/eul/Store/DiskStore.swift
@@ -21,16 +21,20 @@ class DiskStore: ObservableObject, Refreshable {
     }
 
     @Published var list: DiskList?
-    @Published var selectedDisk: DiskList.Disk?
+
+    var selectedDisk: DiskList.Disk? {
+        guard config.diskSelection != "" else {
+            return nil
+        }
+        return list?.disks.filter { $0.name == config.diskSelection }.first
+    }
 
     var ceilingBytes: UInt64? {
-        // list?.disks.reduce(0) { $0 + $1.size }
-        selectedDisk?.size
+        selectedDisk?.size ?? list?.disks.reduce(0) { $0 + $1.size }
     }
 
     var freeBytes: UInt64? {
-        // list?.disks.reduce(0) { $0 + $1.freeSize }
-        selectedDisk?.freeSize
+        selectedDisk?.freeSize ?? list?.disks.reduce(0) { $0 + $1.freeSize }
     }
 
     var usageString: String {
@@ -95,9 +99,6 @@ class DiskStore: ObservableObject, Refreshable {
                 isEjectable: isEjectable
             )
         })
-        if config.diskSelection != "", let list = list {
-            selectedDisk = list.disks.filter { $0.name == config.diskSelection }.first
-        }
     }
 
     init() {

diff --git a/eul/Views/Preference/PreferenceComponentConfigView.swift b/eul/Views/Preference/PreferenceComponentConfigView.swift
@@ -57,15 +57,23 @@ extension Preference {
                                     .inlineSection()
                             }
                         }
-                        if config.wrappedValue.component.isDiskSelectionAvailable {
-                            let disks = diskStore.list?.disks ?? []
-                            Picker(selection: config.diskSelection, label: Text("disk.select".localized()).inlineSection(), content: {
+                        if
+                            config.wrappedValue.component.isDiskSelectionAvailable,
+                            let disks = diskStore.list?.disks
+                        {
+                            Picker(
+                                "disk.select".localized(),
+                                selection: config.diskSelection
+                            ) {
+                                Text("disk.all".localized())
+                                    .inlineSection()
+                                    .tag("")
                                 ForEach(disks) {
                                     Text($0.name)
                                         .inlineSection()
                                 }
-                            })
-                                .frame(width: 200)
+                            }
+                            .frame(width: 200)
                         }
                     }
                     if component == .CPU {