Merge remote-tracking branch 'origin/master'

# Conflicts:
#	kplayer.xcodeproj/project.pbxproj

kplayer/AppDelegate.swift

@@ -46,12 +46,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
 
         let web = MediaItem(name: "web", path:"", root: "/srv/samba/ren/web", type: ItemType.WEBROOT)
         web.loaded = true
-        let google = MediaItem(name: "google", path:"www.google.de", root: "", type: ItemType.FOLDER)
-        let a = MediaItem(name: "www.google.de", path:"www.google.de", root: "", type: ItemType.WEB)
-        google.children = [ a ]
-        web.children = [
-google
-        ]
+        let google = MediaItem(name: "google", path:"www.google.de", root: "", type: ItemType.DETAILS)
+        google.loaded = true
+        web.children = [ google ]
+        let urlPath = Bundle.main.url(forResource: "links", withExtension: "html")
+        let parser = HtmlParser(url: urlPath)
+        parser.parse()
+
+        google.children = parser.items
 
         roots.append(NetworkManager.sharedInstance.favorites)
         roots.append(web)

kplayer/core/HtmlParser.swift

@@ -27,6 +27,7 @@ class HtmlParser : NSObject, XMLParserDelegate {
 
             if let value = attributeDict["href"] {
                 currentItem = MediaItem(name: value, path: value, root: "", type: ItemType.WEB)
+                currentItem!.loaded = true
                 items.append(currentItem!)
             }
         default:       break

kplayer/core/NetworkManager.swift

@@ -32,6 +32,14 @@ class NetworkManager {
 
     internal typealias Weiter = ([MediaItem]) -> Void
 
+    func getDownloadJs() -> URL {
+        if offline {
+            let url = Bundle.main.url(forResource: "download.js", withExtension: nil)!
+            return url
+        }
+        return URL(string: "http://l inkstation:8089/ren/web/download.js")!
+    }
+
     func saveFavDir(name: String, item: MediaItem) -> Void {
         let json = item.toJSON()
         let url = FileHelper.getDocumentsDirectory().appendingPathComponent(name)

kplayer/detail/BrowserController.swift

@@ -250,7 +250,8 @@ print(url?.absoluteString)
     private func executeDocumentDownloadScript(webView: WKWebView, forAbsoluteUrl absoluteUrl : String) {
         // TODO: Add more supported mime-types for missing content-disposition headers
         do {
-            let js = try String(contentsOf: URL(string: "http://linkstation:8089/ren/web/download.js")!, encoding: .utf8)
+            let url = NetworkManager.sharedInstance.getDownloadJs()
+            let js = try String(contentsOf: url, encoding: .utf8)
             let j = js.replacingOccurrences(of: "(absoluteUrl)", with: absoluteUrl)
             webView.evaluateJavaScript(j) { (result, err) in
                 if (err != nil) {