Merge pull request #35 from dteoh/window-subtitle

Split document title display

Author: dteoh

devdocs-macos/DocumentationViewController.swift

@@ -4,6 +4,8 @@ import WebKit
 public extension Notification.Name {
     static let DocumentTitleDidChange = Notification.Name(
         rawValue: "DocumentationViewControllerDocumentTitleDidChangeNotification")
+    static let DocumentCategoryDidChange = Notification.Name(
+        rawValue: "DocumentationViewControllerDocumentCategoryDidChangeNotification")
     static let DocumentURLDidChange = Notification.Name(
         rawValue: "DocumentationViewControllerDocumentURLDidChangeNotification")
     static let DocumentViewerStateDidChange = Notification.Name(
@@ -26,6 +28,11 @@ class DocumentationViewController: NSViewController {
             NotificationCenter.default.post(name: .DocumentTitleDidChange, object: self)
         }
     }
+    private(set) var documentCategory: String? {
+        didSet {
+            NotificationCenter.default.post(name: .DocumentCategoryDidChange, object: self)
+        }
+    }
     var documentURL: URL? {
         didSet {
             NotificationCenter.default.post(name: .DocumentURLDidChange, object: self)
@@ -149,15 +156,18 @@ class DocumentationViewController: NSViewController {
     }
 
     private func handleTitleNotification(_ args: [AnyHashable: Any]) {
-        guard let title = args["title"] as! String? else {
-            return
-        }
-        let suffix = " — DevDocs"
-        if title.hasSuffix(suffix) {
-            self.documentTitle = title.replacingOccurrences(of: suffix, with: "")
-        } else {
-            self.documentTitle = title
+        if let topic = args["topic"] as! String? {
+            self.documentTitle = topic
+        } else if let title = args["title"] as! String? {
+            let suffix = " — DevDocs"
+            if title.hasSuffix(suffix) {
+                self.documentTitle = title.replacingOccurrences(of: suffix, with: "")
+            } else {
+                self.documentTitle = title
+            }
         }
+
+        self.documentCategory = args["doc"] as! String?
     }
 
     private func handleLocationNotification(_ args: [AnyHashable: Any]) {

devdocs-macos/DocumentationWindowController.swift

@@ -36,6 +36,11 @@ class DocumentationWindowController: NSWindowController {
                                                name: .DocumentTitleDidChange,
                                                object: dvc)
 
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(observeDocumentCategory),
+                                               name: .DocumentCategoryDidChange,
+                                               object: dvc)
+
         NotificationCenter.default.addObserver(self,
                                                selector: #selector(observeDocumentURL),
                                                name: .DocumentURLDidChange,
@@ -65,6 +70,13 @@ class DocumentationWindowController: NSWindowController {
         self.window?.title = dvc.documentTitle ?? "DevDocs"
     }
 
+    @objc private func observeDocumentCategory() {
+        guard let dvc = documentationViewController else { return }
+        if #available(OSX 11.0, *) {
+            self.window?.subtitle = dvc.documentCategory ?? ""
+        }
+    }
+
     @objc private func observeDocumentURL() {
         guard let dvc = documentationViewController else { return }
         self.documentation.url = dvc.documentURL

devdocs-macos/user-scripts/page-observer.js

@@ -1,10 +1,22 @@
 /* global $ */
 (function () {
+  const findTitleComponents = function () {
+    const { entry } = window.app.document.content.view
+    if (!entry) {
+      return {}
+    }
+    return {
+      doc: entry.doc.name,
+      topic: entry.name
+    }
+  }
+
   const observer = new MutationObserver((mutations) => {
     window.webkit.messageHandlers.vcBus.postMessage({
       type: 'titleNotification',
       args: {
-        title: $('head title').innerText
+        title: $('head title').innerText,
+        ...findTitleComponents()
       }
     })
     window.webkit.messageHandlers.vcBus.postMessage({