Merge develop into master. v0.1-build3.

Author: xjbeta

iina+/AppDelegate.swift

@@ -7,11 +7,16 @@
 //
 
 import Cocoa
+import SwiftHTTP
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
+        HTTP.globalRequest { req in
+            req.timeoutInterval = 1.5
+            req.allHTTPHeaderFields = ["User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1.2 Safari/605.1.15"]
+        }
 
     }
 

iina+/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.1</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>3</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.video</string>
 	<key>LSMinimumSystemVersion</key>

iina+/Processes.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import Marshal
+import SwiftHTTP
 
 class Processes: NSObject {
 
@@ -82,6 +83,11 @@ class Processes: NSObject {
         task.standardOutput = pipe
         var mpvArgs = ["\(MPVOption.Miscellaneous.forceMediaTitle)=\(title)"]
 
+        if url.contains("douyu") {
+            mpvArgs.append(contentsOf: [MPVOption.Network.cookies,
+                                        "\(MPVOption.Network.cookiesFile)=\(getCookies(for: .douyu))"])
+        }
+        
         switch Preferences.shared.livePlayer {
         case .iina:
             task.launchPath = Preferences.shared.livePlayer.rawValue
@@ -103,3 +109,42 @@ class Processes: NSObject {
 
 
 }
+
+private extension Processes {
+    
+    func getCookies(for website: LiveSupportList) -> String {
+        switch website {
+        case .douyu:
+            let douyuCookie = "https://passport.douyu.com/lapi/did/api/get"
+            let time = UInt32(NSDate().timeIntervalSinceReferenceDate)
+            srand48(Int(time))
+            let random = "\(drand48())"
+            let parameters = ["client_id": "1",
+                              "callback": ("jsonp_" + random).replacingOccurrences(of: ".", with: "")]
+            let headers = ["Referer": "http://www.douyu.com"]
+            
+            let httpSemaphore = DispatchSemaphore(value: 0)
+            var cookiesString = ""
+            
+            HTTP.GET(douyuCookie, parameters: parameters, headers: headers) { response in
+                do {
+                    var str = response.text
+                    str = str?.subString(from: "(", to: ")")
+                    let json = try JSONParser.JSONObjectWithData(str?.data(using: .utf8) ?? Data())
+                    let didStr: String = try json.value(for: "data.did")
+                    cookiesString = """
+                    ..douyu.com    TRUE    /    FALSE    1535865698    dy_did    \(didStr)
+                    .www.douyu.com    TRUE    /    FALSE    1535865771    acf_did    \(didStr)
+                    """
+                } catch let error {
+                    print(error)
+                }
+                httpSemaphore.signal()
+            }
+            httpSemaphore.wait()
+            return cookiesString
+        default:
+            return ""
+        }
+    }
+}