RAVMN · RAVMN · Aug 18, 2019 · Jul 10, 2019 · Jul 12, 2019 · Jul 14, 2019
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -11,6 +11,43 @@ issues if you're going to work on something to avoid duplication of effort.
 Submit an issue for new features before submitting a PR.
 
 
-## Compatibility Report
+## Compatibility Reports
 
 Compatibility reports are always helpful. Use the "Compatibility Report" issue template. Ensure you have a working environment and that the site is in the whitelist (check options page).
+
+
+## Localizations
+
+Missing strings:
+
+* `es`
+    * `optionsMediaSyncElementDescription`
+    * `optionsReceiverSelectorCategoryName`
+    * `optionsReceiverSelectorCategoryDescription`
+    * `optionsReceiverSelectorType`
+    * `optionsReceiverSelectorTypeBrowser`
+    * `optionsReceiverSelectorTypeNative`
+    * `optionsReceiverSelectorWaitForConnection`
+    * `optionsReceiverSelectorWaitForConnectionDescription`
+    * `optionsReceiverSelectorCloseIfFocusLost`
+    * `optionsMirroringAppIdDescription`
+* `nl`
+    * `popupMediaTypeApp`
+    * `popupMediaTypeTab`
+    * `popupMediaTypeScreen`
+    * `popupMediaTypeFile`
+    * `popupMediaSelectCastLabel`
+    * `popupMediaSelectToLabel`
+    * `contextAddToWhitelist`
+    * `contextAddToWhitelistRecommended`
+    * `contextAddToWhitelistAdvancedAdd`
+    * `optionsMediaSyncElementDescription`
+    * `optionsReceiverSelectorCategoryName`
+    * `optionsReceiverSelectorCategoryDescription`
+    * `optionsReceiverSelectorType`
+    * `optionsReceiverSelectorTypeBrowser`
+    * `optionsReceiverSelectorTypeNative`
+    * `optionsReceiverSelectorWaitForConnection`
+    * `optionsReceiverSelectorWaitForConnectionDescription`
+    * `optionsReceiverSelectorCloseIfFocusLost`
+    * `optionsMirroringAppIdDescription`
diff --git a/IMPLEMENTATION.md b/IMPLEMENTATION.md
@@ -1,3 +1,5 @@
+# SOMEWHAT OUTDATED (again)!
+
 # Extension Lifetime
 
 A bridge application instance (`statusBridge`) is created to keep track of receivers’ statuses. This is expected to exist throughout the lifetime of the extension and will automatically reconnect if unexpectedly disconnected.

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-<img src="docs/images/preview-fg_macOS@2x.png"
+<img src="docs/images/preview-fg_macOS_dark@2x.png"
      alt="Preview of cast device selection popup"
      align="right"
-     width="396">
+     width="462">
 
 # fx_cast
 
@@ -41,7 +41,6 @@ sudo dnf install fx_cast_bridge-<version>-<arch>.rpm
 
 ### Requirements
 
-* Node.js 10.x (https://git.io/fjmgL)
 * dpkg (for building deb packages)
 * rpm (for building rpm packages)
 * macOS (for building macOS installer packages)

diff --git a/app/NativeMacReceiverSelector/AppDelegate.swift b/app/NativeMacReceiverSelector/AppDelegate.swift
@@ -2,21 +2,47 @@ import Cocoa
 
 
 class AppDelegate : NSObject, NSApplicationDelegate {
+    var initData: InitData!
+
     var mainWindow: NSWindow?
     var mainWindowController: NSWindowController?
     var mainWindowViewController: ViewController?
 
 
     func applicationDidFinishLaunching (_ aNotification: Notification) {
+        if CommandLine.argc < 2 {
+            fputs("Error: Not enough args\n", stderr)
+            exit(1)
+        }
+
+        guard let data = CommandLine.arguments[1].data(using: .utf8) else {
+            fputs("Error: Failed to convert input to data\n", stderr)
+            exit(1)
+        }
+
+        do {
+            // Decode and store initialization JSON data
+            self.initData = try JSONDecoder().decode(InitData.self, from: data)
+        } catch {
+            fputs("Error: Failed to parse input data\n (\(error))", stderr)
+            exit(1)
+        }
+
+
         let window = NSWindow(
                 contentRect: NSZeroRect
               , styleMask: [ .titled, .closable ]
               , backing: .buffered
               , defer: false)
 
+        let screenHeight = NSScreen.main!.frame.height
+
        window.titleVisibility = .hidden
+        window.isMovableByWindowBackground = true
         window.orderFrontRegardless()
-        window.center()
+        window.setFrameTopLeftPoint(NSPoint(
+                x: self.initData.windowPositionX
+              , y: Int(screenHeight - CGFloat(self.initData.windowPositionY))))
 
         let windowController = NSWindowController(window: window)
         windowController.showWindow(window)
@@ -33,7 +59,9 @@ class AppDelegate : NSObject, NSApplicationDelegate {
     }
 
     func applicationDidResignActive (_ aNotification: Notification) {
-        self.mainWindow?.performClose(aNotification)
+        if self.initData.closeIfFocusLost {
+            self.mainWindow?.performClose(aNotification)
+        }
     }
 
     func applicationShouldTerminateAfterLastWindowClosed (

diff --git a/app/NativeMacReceiverSelector/ReceiverView.swift b/app/NativeMacReceiverSelector/ReceiverView.swift
@@ -37,11 +37,24 @@ class ReceiverView : NSStackView {
 
         self.receiver = receiver
 
+
+        let statusText = receiver.status.application.isIdleScreen
+            ? "\(receiver.host):\(receiver.port)"
+            : receiver.status.application.statusText
+
+        let addressLabel = makeLabel(statusText
+              , size: NSFont.smallSystemFontSize
+              , color: .secondaryLabelColor)
+
+        // Truncate long status text
+        addressLabel.toolTip = statusText
+        addressLabel.cell?.lineBreakMode = .byTruncatingTail
+        addressLabel.setContentCompressionResistancePriority(
+                .defaultLow, for: .horizontal)
+
         let metaStackView = NSStackView(views: [
             makeLabel(receiver.friendlyName, size: 14)
-          , makeLabel("\(receiver.host):\(receiver.port)"
-                  , size: NSFont.smallSystemFontSize
-                  , color: .secondaryLabelColor)
+          , addressLabel
         ])
 
         metaStackView.alignment = .leading

diff --git a/app/NativeMacReceiverSelector/ViewController.swift b/app/NativeMacReceiverSelector/ViewController.swift
@@ -21,24 +21,7 @@ class ViewController : NSViewController {
     override func viewDidLoad () {
         super.viewDidLoad()
 
-        if (CommandLine.argc < 2) {
-            fputs("Error: Not enough args\n", stderr)
-            exit(1)
-        }
-
-        guard let data = CommandLine.arguments[1].data(using: .utf8) else {
-            fputs("Error: Failed to convert input to data\n", stderr)
-            exit(1)
-        }
-
-        do {
-            // Decode and store initialization JSON data
-            self.initData = try JSONDecoder().decode(InitData.self, from: data)
-        } catch {
-            fputs("Error: Failed to parse input data\n", stderr)
-            exit(1)
-        }
-
+        self.initData = (NSApplication.shared.delegate as! AppDelegate).initData
 
         /**
          * View Hierarchy
@@ -136,6 +119,12 @@ class ViewController : NSViewController {
 
             receiverView.receiverViewDelegate = self
 
+            if UInt(initData!.availableMediaTypes) == 0
+                    || (initData!.availableMediaTypes
+                            & initData!.defaultMediaType.rawValue) == 0 {
+                receiverView.isEnabled = false
+            }
+
 
             self.receiverViews.append(receiverView)
 
@@ -163,6 +152,12 @@ extension ViewController : NSMenuDelegate {
         let mediaType = MediaType(
                 rawValue: self.mediaTypePopUpButton.selectedItem!.tag)!
 
+        if self.initData.availableMediaTypes & mediaType.rawValue != 0 {
+            for receiverView in self.receiverViews {
+                receiverView.isEnabled = true
+            }
+        }
+
         let fileItem = self.mediaTypePopUpButton
                 .item(at: self.mediaTypePopUpButton.indexOfItem(
                         withTag: MediaType.file.rawValue))!

diff --git a/app/NativeMacReceiverSelector/models/InitData.swift b/app/NativeMacReceiverSelector/models/InitData.swift
@@ -3,6 +3,11 @@ struct InitData : Codable {
     let defaultMediaType: MediaType
     let availableMediaTypes: Int
 
+    let closeIfFocusLost: Bool
+
+    let windowPositionX: Int
+    let windowPositionY: Int
+
     let i18n_extensionName: String
     let i18n_castButtonTitle: String
     let i18n_mediaTypeApp: String

diff --git a/app/NativeMacReceiverSelector/models/Receiver.swift b/app/NativeMacReceiverSelector/models/Receiver.swift
@@ -1,6 +1,23 @@
 struct Receiver : Codable {
+    struct Status: Codable {
+        let application: Application
+        let volume: Volume
+    }
+
+    struct Application: Codable {
+        let displayName: String
+        let isIdleScreen: Bool
+        let statusText: String
+    }
+
+    struct Volume: Codable {
+        let level: Double
+        let muted: Bool
+    }
+
     let friendlyName: String
     let host: String
     let id: String
     let port: Int
+    let status: Status
 }
diff --git a/app/bin/build.js b/app/bin/build.js
@@ -180,17 +180,11 @@ async function build () {
     fs.writeFileSync(path.join(BUILD_PATH, "package.json")
           , JSON.stringify(pkgManifest))
 
-    /**
-     * With the BUILD_PATH/bridge dir, cannot build to
-     * BUILD_PATH/bridge file.
-     */
-    const tempExecutableName = `_${executableName[argv.platform]}`;
-
     // Run pkg to create a single executable
     await pkg.exec([
         BUILD_PATH
       , "--target", `${pkgPlatform[argv.platform]}-${argv.arch}`
-      , "--output", path.join(BUILD_PATH, tempExecutableName)
+      , "--output", path.join(BUILD_PATH, executableName[argv.platform])
     ]);
 
     // Build NativeMacReceiverSelector
@@ -238,7 +232,7 @@ async function build () {
               , path.join(DIST_PATH, manifestName)
               , { overwrite: true });
         fs.moveSync(
-                path.join(BUILD_PATH, tempExecutableName)
+                path.join(BUILD_PATH, executableName[argv.platform])
               , path.join(DIST_PATH, executableName[argv.platform])
               , { overwrite: true });
 
@@ -329,7 +323,7 @@ function packageDarwin (
     fs.ensureDirSync(rootManifestPath, { recursive: true });
 
     // Move files to root
-    fs.moveSync(path.join(BUILD_PATH, `_${platformExecutableName}`)
+    fs.moveSync(path.join(BUILD_PATH, platformExecutableName)
           , path.join(rootExecutablePath, platformExecutableName));
     fs.moveSync(path.join(BUILD_PATH, manifestName)
           , path.join(rootManifestPath, manifestName));