From be8b286de81d1401e7bc1aea84e309a82667e5ac Mon Sep 17 00:00:00 2001
From: Dan Barber <github@danbarber.me>
Date: Thu, 7 Feb 2019 20:51:45 -0500
Subject: [PATCH] Refactor setting of highlighted queue song

---
 .../Controllers/QueueViewController.swift     | 57 ++++++++++++-------
 .../Resources/Base.lproj/Main.storyboard      |  2 +-
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/Persephone/Controllers/QueueViewController.swift b/Persephone/Controllers/QueueViewController.swift
index 6d01cf8..4479085 100644
--- a/Persephone/Controllers/QueueViewController.swift
+++ b/Persephone/Controllers/QueueViewController.swift
@@ -13,6 +13,9 @@ class QueueViewController: NSViewController, NSOutlineViewDataSource, NSOutlineV
   var queue: [MPDClient.Song] = []
   var queuePos: Int32 = -1
 
+  let systemFontRegular = NSFont.systemFont(ofSize: 13, weight: .regular)
+  let systemFontBold = NSFont.systemFont(ofSize: 13, weight: .bold)
+
   struct SongItem {
     var song: MPDClient.Song
     var queuePos: Int
@@ -51,29 +54,48 @@ class QueueViewController: NSViewController, NSOutlineViewDataSource, NSOutlineV
     guard let queuePos = notification.userInfo?[MPDClient.queuePosKey] as? Int32
       else { return }
 
-    if self.queuePos > -1 {
-      let oldSongRow = queueView.rowView(atRow: Int(self.queuePos + 1), makeIfNecessary: true)
-      let oldSongTitleCell = oldSongRow?.view(atColumn: 0) as! NSTableCellView
-      let oldSongArtistCell = oldSongRow?.view(atColumn: 1) as! NSTableCellView
-      oldSongTitleCell.textField?.font = NSFont.systemFont(ofSize: 13, weight: .regular)
-      oldSongArtistCell.textField?.font = NSFont.systemFont(ofSize: 13, weight: .regular)
-    }
-
-    let oldQueuePos = self.queuePos
+    let oldSongRowPos = Int(self.queuePos + 1)
+    let newSongRowPos = Int(queuePos + 1)
     self.queuePos = queuePos
 
-    let songRow = queueView.rowView(atRow: Int(self.queuePos + 1), makeIfNecessary: true)
-    let songTitleCell = songRow?.view(atColumn: 0) as! NSTableCellView
-    let songArtistCell = songRow?.view(atColumn: 1) as! NSTableCellView
-    songTitleCell.textField?.font = NSFont.systemFont(ofSize: 13, weight: .bold)
-    songArtistCell.textField?.font = NSFont.systemFont(ofSize: 13, weight: .bold)
+    setQueuePos(oldSongRowPos: oldSongRowPos, newSongRowPos: newSongRowPos)
 
     queueView.reloadData(
-      forRowIndexes: [Int(oldQueuePos + 1), Int(queuePos + 1)],
+      forRowIndexes: [oldSongRowPos, newSongRowPos],
       columnIndexes: [0, 1]
     )
   }
 
+  func setQueuePos(oldSongRowPos: Int, newSongRowPos: Int) {
+    if oldSongRowPos > 0 {
+      guard let oldSongRow = queueView.rowView(atRow: oldSongRowPos, makeIfNecessary: true)
+        else { return }
+      guard let oldSongTitleCell = oldSongRow.view(atColumn: 0) as? NSTableCellView
+        else { return }
+
+      setRowFont(rowView: oldSongRow, font: systemFontRegular)
+      oldSongTitleCell.imageView?.image = nil
+    }
+
+    guard let songRow = queueView.rowView(atRow: newSongRowPos, makeIfNecessary: true)
+      else { return }
+    guard let newSongTitleCell = songRow.view(atColumn: 0) as? NSTableCellView
+      else { return }
+
+    setRowFont(rowView: songRow, font: systemFontBold)
+    newSongTitleCell.imageView?.image = NSImage(named: NSImage.Name("playButton"))
+  }
+
+  func setRowFont(rowView: NSTableRowView, font: NSFont) {
+    guard let songTitleCell = rowView.view(atColumn: 0) as? NSTableCellView
+      else { return }
+    guard let songArtistCell = rowView.view(atColumn: 1) as? NSTableCellView
+      else { return }
+
+    songTitleCell.textField?.font = font
+    songArtistCell.textField?.font = font
+  }
+
   func outlineView(_ outlineView: NSOutlineView, numberOfChildrenOfItem item: Any?) -> Int {
     return queue.count + 1
   }
@@ -100,11 +122,6 @@ class QueueViewController: NSViewController, NSOutlineViewDataSource, NSOutlineV
         ) as! NSTableCellView
 
         cellView.textField?.stringValue = songItem.song.getTag(MPD_TAG_TITLE)
-        if songItem.queuePos == self.queuePos {
-          cellView.imageView?.image = NSImage(named: NSImage.Name("playButton"))
-        } else {
-          cellView.imageView?.image = nil
-        }
 
         return cellView
       case "songArtistColumn":
diff --git a/Persephone/Resources/Base.lproj/Main.storyboard b/Persephone/Resources/Base.lproj/Main.storyboard
index ffb4dec..634fbc1 100644
--- a/Persephone/Resources/Base.lproj/Main.storyboard
+++ b/Persephone/Resources/Base.lproj/Main.storyboard
@@ -815,7 +815,7 @@
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="17" id="UFf-Fg-9Qg"/>
                                                                     </constraints>
-                                                                    <imageCell key="cell" refusesFirstResponder="YES" imageScaling="proportionallyDown" image="playButton" id="ckK-gW-Vhx"/>
+                                                                    <imageCell key="cell" refusesFirstResponder="YES" imageScaling="proportionallyDown" id="ckK-gW-Vhx"/>
                                                                 </imageView>
                                                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="i0h-bn-auJ">
                                                                     <rect key="frame" x="25" y="0.0" width="197" height="17"/>