Merge pull request #31 from appwrite/dev

Fix tvos and watchos

Author: abnegate

Package.resolved

@@ -7,7 +7,7 @@ let package = Package(
     platforms: [
         .iOS("15.0"),
         .macOS("11.0"),
-        .watchOS("6.0"),
+        .watchOS("7.0"),
         .tvOS("13.0"),
     ],
     products: [

Package.swift

@@ -2,7 +2,7 @@
 
 ![Swift Package Manager](https://img.shields.io/github/v/release/appwrite/sdk-for-apple.svg?color=green&style=flat-square)
 ![License](https://img.shields.io/github/license/appwrite/sdk-for-apple.svg?style=flat-square)
-![Version](https://img.shields.io/badge/api%20version-1.2.0-blue.svg?style=flat-square)
+![Version](https://img.shields.io/badge/api%20version-1.2.1-blue.svg?style=flat-square)
 [![Build Status](https://img.shields.io/travis/com/appwrite/sdk-generator?style=flat-square)](https://travis-ci.com/appwrite/sdk-generator)
 [![Twitter Account](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)
 [![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord)
@@ -19,7 +19,7 @@ Appwrite is an open-source backend as a service server that abstract and simplif
 
 The Appwrite Swift SDK is available via Swift Package Manager. In order to use the Appwrite Swift SDK from Xcode, select File > **Add Packages**
 
-In the dialog that appears, enter the Appwrite Swift SDK [package URL](git@github.com:appwrite/sdk-for-apple.git) in the search field. Once found, select `sdk-for-apple`.
+In the dialog that appears, enter the Appwrite Swift SDK [package URL](https://github.com/appwrite/sdk-for-apple.git) in the search field. Once found, select `sdk-for-apple`.
 
 On the right, select your version rules and ensure your desired target is selected in the **Add to Project** field.
 
@@ -31,7 +31,7 @@ Add the package to your `Package.swift` dependencies:
 
 ```swift
     dependencies: [
-        .package(url: "git@github.com:appwrite/sdk-for-apple.git", from: "1.2.2"),
+        .package(url: "https://github.com/appwrite/sdk-for-apple.git", from: "1.2.3"),
     ],
 ```
 

README.md

@@ -23,7 +23,7 @@ open class Client {
         "x-sdk-name": "Apple",
         "x-sdk-platform": "client",
         "x-sdk-language": "apple",
-        "x-sdk-version": "1.2.2",
+        "x-sdk-version": "1.2.3",
         "X-Appwrite-Response-Format": "1.0.0"
     ]
 
@@ -582,10 +582,10 @@ extension Client {
         device = "\(info!.modelIdentifier) iOS/\(info!.systemVersion)"
         #elseif os(watchOS)
         let info = deviceInfo.watchOSInfo
-        device = "\(info!.systemInfo.machine) watchOS/\(info!.systemVersion)"
+        device = "\(info!.modelIdentifier) watchOS/\(info!.systemVersion)"
         #elseif os(tvOS)
-        let info = deviceInfo.tvOSInfo
-        device = "\(info!.systemInfo.machine) tvOS/\(info!.systemVersion)"
+        let info = deviceInfo.iOSInfo
+        device = "\(info!.modelIdentifier) tvOS/\(info!.systemVersion)"
         #elseif os(macOS)
         let info = deviceInfo.macOSInfo
         device = "(Macintosh; \(info!.model))"

Sources/Appwrite/Client.swift

@@ -1,7 +1,7 @@
 #if os(Linux)
 import Foundation
 
-class LinuxDeviceInfo : DeviceInfo {
+class LinuxDeviceInfo {
 
     let name: String
     let version: String
@@ -14,53 +14,24 @@ class LinuxDeviceInfo : DeviceInfo {
     let variant: String
     let variantId: String
     let machineId: String
-    
-    internal init(
-        name: String,
-        version: String,
-        id: String,
-        idLike: [String],
-        versionCodename: String,
-        versionId: String,
-        prettyName: String,
-        buildId: String,
-        variant: String,
-        variantId: String,
-        machineId: String
-    ) {
-        self.name = name
-        self.version = version
-        self.id = id
-        self.idLike = idLike
-        self.versionCodename = versionCodename
-        self.versionId = versionId
-        self.prettyName = prettyName
-        self.buildId = buildId
-        self.variant = variant
-        self.variantId = variantId
-        self.machineId = machineId
-    }
-    
-    public static func get() -> LinuxDeviceInfo {
-        let os = getOsRelease()
-        let lsb = getLsbRelease()
-        let machineId = getMachineId()
-        
-        return LinuxDeviceInfo(
-            name: os["NAME"] ?? "Linux",
-            version: os["VERSION"] ?? lsb["LSB_VERSION"] ?? "",
-            id: os["ID"] ?? lsb["DISTRIB_ID"] ?? "linux",
-            idLike: os["ID_LIKE"]?.split(separator: " ").map { String($0) } ?? [],
-            versionCodename: os["VERSION_CODENAME"] ?? lsb["DISTRIB_CODENAME"] ?? "",
-            versionId: os["VERSION_ID"] ?? lsb["DISTRIB_RELEASE"] ?? "",
-            prettyName: os["PRETTY_NAME"] ?? lsb["DISTRIB_DESCRIPTION"] ?? "Linux",
-            buildId: os["BUILD_ID"] ?? "",
-            variant: os["VARIANT"] ?? "",
-            variantId: os["VARIANT_ID"] ?? "",
-            machineId: machineId
-        )
+
+    public init() {
+        let os = LinuxDeviceInfo.getOsRelease()
+        let lsb = LinuxDeviceInfo.getLsbRelease()
+
+        name = os["NAME"] ?? "Linux"
+        version = os["VERSION"] ?? lsb["LSB_VERSION"] ?? ""
+        id = os["ID"] ?? lsb["DISTRIB_ID"] ?? "linux"
+        idLike = os["ID_LIKE"]?.split(separator: " ").map { String($0) } ?? []
+        versionCodename = os["VERSION_CODENAME"] ?? lsb["DISTRIB_CODENAME"] ?? ""
+        versionId = os["VERSION_ID"] ?? lsb["DISTRIB_RELEASE"] ?? ""
+        prettyName = os["PRETTY_NAME"] ?? lsb["DISTRIB_DESCRIPTION"] ?? "Linux"
+        buildId = os["BUILD_ID"] ?? ""
+        variant = os["VARIANT"] ?? ""
+        variantId = os["VARIANT_ID"] ?? ""
+        machineId = LinuxDeviceInfo.getMachineId()
     }
-    
+
     private static func getOsRelease() -> [String: String] {
         return tryReadKeyValues(path: "/etc/os-release")
     }
@@ -82,19 +53,19 @@ class LinuxDeviceInfo : DeviceInfo {
         let url = URL(fileURLWithPath: path)
         let string = try! String(contentsOf: url, encoding: .utf8)
         let lines = string.components(separatedBy: .newlines)
-        
+
         var dict = [String: String]()
         for line in lines {
             let splits = line.split(separator: "=")
             if splits.count > 1 {
                 let key = String(splits[0])
                 let value = String(splits[1])
-                
+
                 dict[key] = value
             }
         }
-        
+
         return dict
     }
 }
-#endif
+#endif

Sources/Appwrite/DeviceInfo/Linux/LinuxDeviceInfo.swift

@@ -1,11 +1,11 @@
 import Foundation
 
-protocol DeviceInfo {}
-
 class OSDeviceInfo {
 
-    #if os(iOS) || os(watchOS) || os(tvOS)
-    var iOSInfo: iOSDeviceInfo?
+    #if os(iOS) || os(tvOS)
+    var iOSInfo: IOSDeviceInfo?
+    #elseif os(watchOS)
+    var watchOSInfo: WatchOSDeviceInfo?
     #elseif os(macOS)
     var macOSInfo: MacOSDeviceInfo?
     #elseif os(Linux)
@@ -15,14 +15,16 @@ class OSDeviceInfo {
     #endif
 
     init() {
-        #if os(iOS) || os(watchOS) || os(tvOS)
-        self.iOSInfo = iOSDeviceInfo.get()
+        #if os(iOS) || os(tvOS)
+        self.iOSInfo = IOSDeviceInfo()
+        #elseif os(watchOS)
+        self.watchOSInfo = WatchOSDeviceInfo()
         #elseif os(macOS)
-        self.macOSInfo = MacOSDeviceInfo.get()
+        self.macOSInfo = MacOSDeviceInfo()
         #elseif os(Linux)
-        self.linuxInfo = LinuxDeviceInfo.get()
+        self.linuxInfo = LinuxDeviceInfo()
         #elseif os(Windows)
-        self.windowsInfo = LinuxDeviceInfo.get()
+        self.windowsInfo = LinuxDeviceInfo()
         #endif
     }
 }

Sources/Appwrite/DeviceInfo/MacOS/MacOSDeviceInfo.swift

@@ -1,31 +1,16 @@
 #if os(Windows)
 import Foundation
 
-class WindowsDeviceInfo : DeviceInfo {
-    
+class WindowsDeviceInfo {
+
     let numberOfCores: String
     let computerName: String
     let systemMemoryInMegabytes: UInt64
-    
-    public init(
-        numberOfCores: String,
-        computerName: String,
-        systemMemoryInMegabytes: UInt64
-    ) {
-        self.numberOfCores = numberOfCores
-        self.computerName = computerName
-        self.systemMemoryInMegabytes = systemMemoryInMegabytes
-    }
 
-    public static func get() -> WindowsDeviceInfo {
-        let memory = ProcessInfo.processInfo.physicalMemory / 1000 / 1000 // Bytes to MB
-        
-        return WindowsDeviceInfo(
-            numberOfCores: ProcessInfo.processInfo.processorCount.description,
-            computerName: Host.current().localizedName ?? "",
-            systemMemoryInMegabytes: memory
-        )
+    public init() {
+        numberOfCores = ProcessInfo.processInfo.processorCount.description
+        computerName = Host.current().localizedName ?? ""
+        systemMemoryInMegabytes = ProcessInfo.processInfo.physicalMemory / 1000 / 1000 // Bytes to MB
     }
 }
-#endif
- 
+#endif

Sources/Appwrite/DeviceInfo/OSDeviceInfo.swift

@@ -0,0 +1,27 @@
+#if os(iOS) || os(tvOS)
+import Foundation
+import UIKit
+
+class IOSDeviceInfo {
+
+    let name: String
+    let systemName: String
+    let systemVersion: String
+    let model: String
+    let localizedModel: String
+    let identifierForVendor: String
+    let modelIdentifier: String
+
+    public init() {
+        let device = UIDevice.current
+
+        name =  device.name
+        systemName = device.systemName
+        systemVersion = device.systemVersion
+        model = device.model
+        localizedModel = device.localizedModel
+        identifierForVendor = device.identifierForVendor?.uuidString ?? ""
+        modelIdentifier = UIDevice.modelName
+    }
+}
+#endif