Improve header setting

Author: abnegate

templates/swift/Sources/Client.swift.twig

@@ -45,10 +45,8 @@ open class Client {
 
     public init() {
         http = Client.createHTTP()
-
-        #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
-        addHeaders()
-        #endif
+        addUserAgentHeader()
+        addOriginHeader()
     }
 
     private static func createHTTP(
@@ -540,51 +538,73 @@ open class Client {
         request.body = .byteBuffer(bodyBuffer)
     }
 
-    private func addHeaders() {
+    private func addUserAgentHeader() {
         let packageInfo = OSPackageInfo.get()
-        let deviceInfo = OSDeviceInfo()
-        var device = "";
-        var operatingSystem = ""
-
-        #if os(iOS)
-        let iosinfo = deviceInfo.iOSInfo
-        device = "\(iosinfo!.modelIdentifier) iOS/\(iosinfo!.systemVersion)";
-        operatingSystem = "ios"
-        #elseif os(tvOS)
-        let iosinfo = deviceInfo.iOSInfo
-        device = "\(iosinfo!.systemInfo.machine) tvOS/\(iosinfo!.systemVersion)";
-        operatingSystem = "tvos"
-        #elseif os(watchOS)
-        let iosinfo = deviceInfo.iOSInfo
-        device = "\(iosinfo!.systemInfo.machine) watchOS/\(iosinfo!.systemVersion)";
-        operatingSystem = "watchos"
-        #elseif os(macOS)
-        let macinfo = deviceInfo.macOSInfo
-        device = "(Macintosh; \(macinfo!.model))"
-        operatingSystem = "macos"
-        #elseif os(Linux)
-        let lininfo = deviceInfo.linuxInfo
-        device = "(Linux; U; \(lininfo!.id) \(lininfo!.version))"
-        operatingSystem = "linux"
-        #elseif os(Windows)
-        let wininfo = deviceInfo.windowsInfo
-        device = "(Windows NT; \(wininfo!.computerName))"
-        operatingSystem = "windows"
-        #endif
+        let device = Client.getDevice()
 
         #if !os(Linux) && !os(Windows)
         _ = addHeader(
             key: "user-agent",
             value: "\(packageInfo.packageName)/\(packageInfo.version) \(device)"
         )
         #endif
+    }
+
+    private func addOriginHeader() {
+        let packageInfo = OSPackageInfo.get()
+        let operatingSystem = Client.getOperatingSystem()
         _ = addHeader(
             key: "origin",
             value: "{{ spec.title | caseLower }}-\(operatingSystem)://\(packageInfo.packageName)"
         )
     }
 }
 
+extension Client {
+    private static func getOperatingSystem() -> String {
+        #if os(iOS)
+        return "ios"
+        #elseif os(watchOS)
+        return "watchos"
+        #elseif os(tvOS)
+        return "tvos"
+        #elseif os(macOS)
+        return "macos"
+        #elseif os(Linux)
+        return "linux"
+        #elseif os(Windows)
+        return "windows"
+        #endif
+    }
+
+    private static func getDevice() -> String {
+        let deviceInfo = OSDeviceInfo()
+        var device = ""
+
+        #if os(iOS)
+        let info = deviceInfo.iOSInfo
+        device = "\(info!.modelIdentifier) iOS/\(info!.systemVersion)"
+        #elseif os(watchOS)
+        let info = deviceInfo.watchOSInfo
+        device = "\(info!.systemInfo.machine) watchOS/\(info!.systemVersion)"
+        #elseif os(tvOS)
+        let info = deviceInfo.tvOSInfo
+        device = "\(info!.systemInfo.machine) tvOS/\(info!.systemVersion)"
+        #elseif os(macOS)
+        let info = deviceInfo.macOSInfo
+        device = "(Macintosh; \(info!.model))"
+        #elseif os(Linux)
+        let info = deviceInfo.linuxInfo
+        device = "(Linux; U; \(info!.id) \(info!.version))"
+        #elseif os(Windows)
+        let info = deviceInfo.windowsInfo
+        device = "(Windows NT; \(info!.computerName))"
+        #endif
+
+        return device
+    }
+}
+
 extension Client {
 
     public enum HTTPStatus: Int {