From a88d55d1a416f62cda0104e2ec334c177c04b80c Mon Sep 17 00:00:00 2001
From: Daniel Barber <github@danbarber.me>
Date: Sat, 8 Jun 2019 13:25:36 -0400
Subject: [PATCH] Add queue play/remove menu

---
 Persephone/Controllers/QueueViewController.swift | 13 ++++++++++---
 Persephone/Resources/Base.lproj/Main.storyboard  |  8 +++++++-
 Persephone/State/Reducers/QueueReducer.swift     |  4 +++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Persephone/Controllers/QueueViewController.swift b/Persephone/Controllers/QueueViewController.swift
index 8c8b066..ec3cb90 100644
--- a/Persephone/Controllers/QueueViewController.swift
+++ b/Persephone/Controllers/QueueViewController.swift
@@ -43,13 +43,20 @@ class QueueViewController: NSViewController,
   }
 
   @IBAction func playTrack(_ sender: Any) {
-    let newQueuePos = queueView.selectedRow - 1
+    let queuePos = queueView.selectedRow - 1
 
-    if newQueuePos >= 0 {
-      App.store.dispatch(MPDPlayTrack(queuePos: newQueuePos))
+    if queuePos >= 0 {
+      App.store.dispatch(MPDPlayTrack(queuePos: queuePos))
     }
   }
   
+  @IBAction func playSongMenuAction(_ sender: NSMenuItem) {
+    let queuePos = queueView.clickedRow - 1
+
+    if queuePos >= 0 {
+      App.store.dispatch(MPDPlayTrack(queuePos: queuePos))
+    }
+  }
   @IBAction func removeSongMenuAction(_ sender: NSMenuItem) {
     let queuePos = queueView.clickedRow - 1
 
diff --git a/Persephone/Resources/Base.lproj/Main.storyboard b/Persephone/Resources/Base.lproj/Main.storyboard
index 650d657..b11f160 100644
--- a/Persephone/Resources/Base.lproj/Main.storyboard
+++ b/Persephone/Resources/Base.lproj/Main.storyboard
@@ -575,7 +575,7 @@
                                     <rect key="frame" x="0.0" y="0.0" width="328" height="219"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" outlineTableColumn="0Co-uF-CCB" id="jEJ-jg-fll">
+                                        <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" outlineTableColumn="0Co-uF-CCB" id="jEJ-jg-fll" customClass="QueueView" customModule="Persephone" customModuleProvider="target">
                                             <rect key="frame" x="0.0" y="0.0" width="328" height="219"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <size key="intercellSpacing" width="3" height="2"/>
@@ -757,6 +757,12 @@
                 <customObject id="du4-e9-TfX" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <menu id="dYA-Jm-eOa">
                     <items>
+                        <menuItem title="Play" id="kp1-XJ-9CL">
+                            <modifierMask key="keyEquivalentModifierMask"/>
+                            <connections>
+                                <action selector="playSongMenuAction:" target="KIP-rq-4dM" id="1nO-8z-LT2"/>
+                            </connections>
+                        </menuItem>
                         <menuItem title="Remove" id="GaJ-qk-Cg4">
                             <modifierMask key="keyEquivalentModifierMask"/>
                             <connections>
diff --git a/Persephone/State/Reducers/QueueReducer.swift b/Persephone/State/Reducers/QueueReducer.swift
index 6e1432e..0a09e06 100644
--- a/Persephone/State/Reducers/QueueReducer.swift
+++ b/Persephone/State/Reducers/QueueReducer.swift
@@ -14,7 +14,9 @@ func queueReducer(action: Action, state: QueueState?) -> QueueState {
 
   switch action {
   case let action as UpdateQueueAction:
-    state.queuePos = -1
+    if state.queuePos >= action.queue.count {
+      state.queuePos = -1
+    }
 
     state.queue = action.queue.enumerated().map { index, mpdSong in
       let song = Song(mpdSong: mpdSong)