PiBar for iOS Beta #1

.swift-version

@@ -1 +1 @@
-5.0
+5.3

.swiftlint.yml

@@ -1,5 +1,6 @@
 disabled_rules:
-  - trailing_comma
+  - trailing_comma # swiftformat is not copacetic
+  - opening_brace # swiftformat is not copacetic
 opt_in_rules:
   - empty_count
   - empty_string

Carthage/Checkouts/LaunchAtLogin/LaunchAtLogin/LaunchAtLogin.swift

@@ -1,7 +1,7 @@
 import Foundation
 import ServiceManagement
 
-public struct LaunchAtLogin {
+public enum LaunchAtLogin {
     private static let id = "\(Bundle.main.bundleIdentifier!)-LaunchAtLoginHelper"
 
     public static var isEnabled: Bool {

PiBar/Data Sources/PiholeAPI.swift → PiBar Shared/Data Sources/PiholeAPI.swift

@@ -9,13 +9,17 @@
 //  License, v. 2.0. If a copy of the MPL was not distributed with this
 //  file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-import Cocoa
+#if os(macOS)
+    import Cocoa
+#elseif os(iOS)
+    import UIKit
+#endif
 
-class PiholeAPI: NSObject {
+final class PiholeAPI {
     let connection: PiholeConnectionV2
 
     var identifier: String {
-        return "\(connection.hostname)"
+        "\(connection.hostname)"
     }
 
     private let path: String = "/admin/api.php"
@@ -29,9 +33,11 @@ class PiholeAPI: NSObject {
         static let enable = PiholeAPIEndpoint(queryParameter: "enable", authorizationRequired: true)
         static let disable = PiholeAPIEndpoint(queryParameter: "disable", authorizationRequired: true)
         static let recentBlocked = PiholeAPIEndpoint(queryParameter: "recentBlocked", authorizationRequired: false)
+        static let getAllQueries = PiholeAPIEndpoint(queryParameter: "getAllQueries", authorizationRequired: true)
+
     }
 
-    override init() {
+    init() {
         connection = PiholeConnectionV2(
             hostname: "pi.hole",
             port: 80,
@@ -40,12 +46,10 @@ class PiholeAPI: NSObject {
             passwordProtected: true,
             adminPanelURL: "http://pi.hole/admin/"
         )
-        super.init()
     }
 
     init(connection: PiholeConnectionV2) {
         self.connection = connection
-        super.init()
     }
 
     private func get(_ endpoint: PiholeAPIEndpoint, argument: String? = nil, completion: @escaping (String?) -> Void) {
@@ -98,6 +102,7 @@ class PiholeAPI: NSObject {
             let object = try jsonDecoder.decode(T.self, from: jsonData)
             return object
         } catch {
+            Log.debug(error.localizedDescription)
             return nil
         }
     }
@@ -110,7 +115,7 @@ class PiholeAPI: NSObject {
     }
 
     var admin: URL {
-        return URL(string: "http://\(connection.hostname):\(connection.port)/admin")!
+        URL(string: "http://\(connection.hostname):\(connection.port)/admin")!
     }
 
     // MARK: - Testing
@@ -137,7 +142,7 @@ class PiholeAPI: NSObject {
         DispatchQueue.global(qos: .background).async {
             self.get(Endpoints.summary) { string in
                 guard let jsonString = string,
-                    let summary: PiholeAPISummary = self.decodeJSON(jsonString) else { return completion(nil) }
+                      let summary: PiholeAPISummary = self.decodeJSON(jsonString) else { return completion(nil) }
                 completion(summary)
             }
         }
@@ -153,6 +158,27 @@ class PiholeAPI: NSObject {
         }
     }
 
+    func fetchOverTimeData(completion: @escaping (PiholeOverTimeData?) -> Void) {
+        DispatchQueue.global(qos: .background).async {
+            self.get(Endpoints.overTimeData10mins) { string in
+                guard let jsonString = string,
+                      let overTimeData: PiholeOverTimeData = self.decodeJSON(jsonString) else { return completion(nil) }
+                completion(overTimeData)
+            }
+        }
+    }
+
+    func fetchQueries(count: Int = 100, completion: @escaping (PiholeQueriesData?) -> Void) {
+        DispatchQueue.global(qos: .background).async {
+            let countString = String(count)
+            self.get(Endpoints.getAllQueries, argument: countString) { (string) in
+                guard let jsonString = string,
+                      let allQueriesData: PiholeQueriesData = self.decodeJSON(jsonString) else { return completion(nil) }
+                completion(allQueriesData)
+            }
+        }
+    }
+
     func disable(seconds: Int? = nil, completion: @escaping (Bool) -> Void) {
         DispatchQueue.global(qos: .background).async {
             var secondsString: String?
@@ -161,7 +187,7 @@ class PiholeAPI: NSObject {
             }
             self.get(Endpoints.disable, argument: secondsString) { string in
                 guard let jsonString = string,
-                    let _: PiholeAPIStatus = self.decodeJSON(jsonString) else { return completion(false) }
+                      let _: PiholeAPIStatus = self.decodeJSON(jsonString) else { return completion(false) }
                 completion(true)
             }
         }
@@ -171,7 +197,7 @@ class PiholeAPI: NSObject {
         DispatchQueue.global(qos: .background).async {
             self.get(Endpoints.enable) { string in
                 guard let jsonString = string,
-                    let _: PiholeAPIStatus = self.decodeJSON(jsonString) else { return completion(false) }
+                      let _: PiholeAPIStatus = self.decodeJSON(jsonString) else { return completion(false) }
                 completion(true)
             }
         }

PiBar/Data Sources/Preferences.swift → PiBar Shared/Data Sources/Preferences.swift

@@ -22,6 +22,9 @@ struct Preferences {
         static let verboseLabels = "verboseLabels"
         static let shortcutEnabled = "shortcutEnabled"
         static let pollingRate = "pollingRate"
+        static let interfaceColor = "interfaceColor"
+        static let normalizeCharts = "normalizeCharts"
+        static let defaultDisableDuration = "defaultDisableDuration"
     }
 
     static var standard: UserDefaults {
@@ -36,6 +39,9 @@ struct Preferences {
             Key.verboseLabels: false,
             Key.shortcutEnabled: true,
             Key.pollingRate: 3,
+            Key.interfaceColor: "red",
+            Key.normalizeCharts: true,
+            Key.defaultDisableDuration: -1,
         ])
 
         return database
@@ -94,47 +100,47 @@ extension UserDefaults {
     }
 
     var showBlocked: Bool {
-        return bool(forKey: Preferences.Key.showBlocked)
+        bool(forKey: Preferences.Key.showBlocked)
     }
 
     func set(showBlocked: Bool) {
         set(showBlocked, for: Preferences.Key.showBlocked)
     }
 
     var showQueries: Bool {
-        return bool(forKey: Preferences.Key.showQueries)
+        bool(forKey: Preferences.Key.showQueries)
     }
 
     func set(showQueries: Bool) {
         set(showQueries, for: Preferences.Key.showQueries)
     }
 
     var showPercentage: Bool {
-        return bool(forKey: Preferences.Key.showPercentage)
+        bool(forKey: Preferences.Key.showPercentage)
     }
 
     func set(showPercentage: Bool) {
         set(showPercentage, for: Preferences.Key.showPercentage)
     }
 
     var showLabels: Bool {
-        return bool(forKey: Preferences.Key.showLabels)
+        bool(forKey: Preferences.Key.showLabels)
     }
 
     func set(showLabels: Bool) {
         set(showLabels, for: Preferences.Key.showLabels)
     }
 
     var verboseLabels: Bool {
-        return bool(forKey: Preferences.Key.verboseLabels)
+        bool(forKey: Preferences.Key.verboseLabels)
     }
 
     func set(verboseLabels: Bool) {
         set(verboseLabels, for: Preferences.Key.verboseLabels)
     }
 
     var shortcutEnabled: Bool {
-        return bool(forKey: Preferences.Key.shortcutEnabled)
+        bool(forKey: Preferences.Key.shortcutEnabled)
     }
 
     func set(shortcutEnabled: Bool) {
@@ -154,15 +160,40 @@ extension UserDefaults {
         set(pollingRate, for: Preferences.Key.pollingRate)
     }
 
+    var interfaceColor: String {
+        string(forKey: Preferences.Key.interfaceColor) ?? "red"
+    }
+
+    func set(interfaceColor: String) {
+        set(interfaceColor, for: Preferences.Key.interfaceColor)
+    }
+
+    var normalizeCharts: Bool {
+        bool(forKey: Preferences.Key.normalizeCharts)
+    }
+
+    func set(normalizeCharts: Bool) {
+        set(normalizeCharts, for: Preferences.Key.normalizeCharts)
+    }
+
+    var defaultDisableDuration: Int {
+        integer(forKey: Preferences.Key.defaultDisableDuration)
+    }
+
+    func set(defaultDisableDuration: Int) {
+        set(defaultDisableDuration, for: Preferences.Key.defaultDisableDuration)
+    }
+
     // Helpers
 
     var showTitle: Bool {
-        return showQueries || showBlocked || showPercentage
+        showQueries || showBlocked || showPercentage
     }
 }
 
 private extension UserDefaults {
     func set(_ object: Any?, for key: String) {
+        Log.debug("Saving \(String(describing: object)) to \(key)")
         set(object, forKey: key)
         synchronize()
     }

PiBar/Data Sources/Structs.swift → PiBar Shared/Data Sources/Structs.swift

@@ -110,6 +110,15 @@ struct PiholeAPIStatus: Decodable {
     let status: String
 }
 
+struct PiholeOverTimeData: Decodable {
+    let domainsOverTime: [String: Int]
+    let adsOverTime: [String: Int]
+}
+
+struct PiholeQueriesData: Decodable {
+    let data: [[String]]
+}
+
 // MARK: - Pi-hole Network
 
 enum PiholeNetworkStatus: String {
@@ -127,6 +136,7 @@ struct Pihole {
     let identifier: String
     let online: Bool
     let summary: PiholeAPISummary?
+    let overTimeData: PiholeOverTimeData?
     let canBeManaged: Bool?
     let enabled: Bool?
 
@@ -152,5 +162,13 @@ struct PiholeNetworkOverview {
     let adsPercentageToday: Double
     let averageBlocklist: Int
 
+    let overTimeData: PiholeNetworkOverTimeData?
+
     let piholes: [String: Pihole]
 }
+
+struct PiholeNetworkOverTimeData {
+    let overview: [Double: (Double, Double)]
+    let maximumValue: Double
+    let piholes: [String: [Double: (Double, Double)]]
+}

PiBar/Manager/Operations/AsyncOperation.swift → PiBar Shared/Manager/Operations/AsyncOperation.swift

@@ -17,7 +17,7 @@ class AsyncOperation: Operation {
     }
 
     override var isAsynchronous: Bool {
-        return true
+        true
     }
 
     var state = State.isReady {
@@ -32,11 +32,11 @@ class AsyncOperation: Operation {
     }
 
     override var isExecuting: Bool {
-        return state == .isExecuting
+        state == .isExecuting
     }
 
     override var isFinished: Bool {
-        return state == .isFinished
+        state == .isFinished
     }
 
     override func start() {

PiBar Shared/Manager/Operations/UpdatePiholeOperation.swift

@@ -0,0 +1,76 @@
+//
+//  UpdatePiholeOperation.swift
+//  PiBar
+//
+//  Created by Brad Root on 5/26/20.
+//  Copyright © 2020 Brad Root. All rights reserved.
+//
+//  This Source Code Form is subject to the terms of the Mozilla Public
+//  License, v. 2.0. If a copy of the MPL was not distributed with this
+//  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import Foundation
+
+final class UpdatePiholeOperation: AsyncOperation {
+    private(set) var pihole: Pihole
+
+    init(_ pihole: Pihole) {
+        self.pihole = pihole
+    }
+
+    override func main() {
+        Log.debug("Updating Pi-hole: \(pihole.identifier)")
+
+        var enabled: Bool? = true
+        var online = true
+        var canBeManaged: Bool = false
+
+        var receivedSummary: PiholeAPISummary?
+        var receivedOverTimeData: PiholeOverTimeData?
+
+        let group = DispatchGroup()
+
+        group.enter()
+        pihole.api.fetchSummary { summary in
+            Log.debug("Received Summary for \(self.pihole.identifier)")
+            receivedSummary = summary
+            group.leave()
+        }
+
+        group.enter()
+        pihole.api.fetchOverTimeData { overTimeData in
+            Log.debug("Received Over Time Data for \(self.pihole.identifier)")
+            receivedOverTimeData = overTimeData
+            group.leave()
+        }
+
+        group.wait()
+
+        if let summary = receivedSummary {
+            if summary.status != "enabled" {
+                enabled = false
+            }
+            if !pihole.api.connection.token.isEmpty || !pihole.api.connection.passwordProtected {
+                canBeManaged = true
+            }
+        } else {
+            enabled = nil
+            online = false
+            canBeManaged = false
+        }
+
+        let updatedPihole = Pihole(
+            api: pihole.api,
+            identifier: pihole.api.identifier,
+            online: online,
+            summary: receivedSummary,
+            overTimeData: receivedOverTimeData,
+            canBeManaged: canBeManaged,
+            enabled: enabled
+        )
+
+        pihole = updatedPihole
+
+        state = .isFinished
+    }
+}