Persephone/AppDelegate.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2018 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import ReSwift
 import MediaKeyTap
 

Persephone/Controllers/AlbumViewController.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import ReSwift
 import Differ
 
@@ -28,6 +28,15 @@ class AlbumViewController: NSViewController,
     albumScrollView.postsBoundsChangedNotifications = true
 
     albumCollectionView.dataSource = dataSource
+
+//    preferences.addObserver(self, forKeyPath: "mpdLibraryDir")
+//    preferences.addObserver(self, forKeyPath: "fetchMissingArtworkFromInternet")
+  }
+
+  override func viewWillDisappear() {
+    super.viewWillDisappear()
+
+    AppDelegate.store.unsubscribe(self)
   }
 
   override func viewWillLayout() {
@@ -59,7 +68,7 @@ class AlbumViewController: NSViewController,
     case "mpdLibraryDir":
       albumCollectionView.reloadData()
     case "fetchMissingArtworkFromInternet":
-      AppDelegate.store.dispatch(ResetAlbumListCoverArtAction())
+      AppDelegate.store.dispatch(ResetAlbumListCoverArt())
     default:
       break
     }
@@ -73,11 +82,16 @@ extension AlbumViewController: StoreSubscriber {
   typealias StoreSubscriberStateType = AlbumListState
 
   func newState(state: StoreSubscriberStateType) {
-    let oldAlbums = dataSource.albums
+    if dataSource.albums == [] {
-    dataSource.albums = state.albums
+      dataSource.albums = state.albums
-    albumCollectionView.animateItemChanges(
+      albumCollectionView.reloadData()
-      oldData: oldAlbums,
+    } else {
-      newData: dataSource.albums
+      let oldAlbums = dataSource.albums
-    )
+      dataSource.albums = state.albums
+      albumCollectionView.animateItemChanges(
+        oldData: oldAlbums,
+        newData: dataSource.albums
+      )
+    }
   }
 }

Persephone/Controllers/AlbumViewItem.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 class AlbumViewItem: NSCollectionViewItem {
   var observer: NSKeyValueObservation?

Persephone/Controllers/MainSplitViewController.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 class MainSplitViewController: NSSplitViewController {
   override func keyDown(with event: NSEvent) {

Persephone/Controllers/NotificationsController.swift

@@ -30,13 +30,13 @@ class NotificationsController: MPDClientDelegate {
 
   func willStartDatabaseUpdate(mpdClient: MPDClient) {
     DispatchQueue.main.async {
-      AppDelegate.store.dispatch(StartedDatabaseUpdateAction())
+      AppDelegate.store.dispatch(StartedDatabaseUpdate())
     }
   }
 
   func didFinishDatabaseUpdate(mpdClient: MPDClient) {
     DispatchQueue.main.async {
-      AppDelegate.store.dispatch(FinishedDatabaseUpdateAction())
+      AppDelegate.store.dispatch(FinishedDatabaseUpdate())
     }
   }
 

Persephone/Controllers/QueueViewController.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import ReSwift
 
 class QueueViewController: NSViewController,
@@ -27,6 +27,12 @@ class QueueViewController: NSViewController,
     queueView.columnAutoresizingStyle = .sequentialColumnAutoresizingStyle
   }
 
+  override func viewWillDisappear() {
+    super.viewWillDisappear()
+
+    AppDelegate.store.unsubscribe(self)
+  }
+
   override func keyDown(with event: NSEvent) {
     switch event.keyCode {
     case NSEvent.keyCodeSpace:
@@ -122,8 +128,7 @@ extension QueueViewController: StoreSubscriber {
   typealias StoreSubscriberStateType = QueueState
 
   func newState(state: StoreSubscriberStateType) {
-    dataSource.queue = state.queue
+    dataSource.setQueueIcon()
-    dataSource.setQueueIcon(state)
     queueView.reloadData()
   }
 }

Persephone/Controllers/WindowController.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import ReSwift
 
 class WindowController: NSWindowController {

Persephone/DataSources/AlbumDataSource.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import PromiseKit
 
 class AlbumDataSource: NSObject, NSCollectionViewDataSource {
@@ -33,7 +33,7 @@ class AlbumDataSource: NSObject, NSCollectionViewDataSource {
           .done { image in
             DispatchQueue.main.async {
               AppDelegate.store.dispatch(
-                UpdateCoverArtAction(coverArt: image, albumIndex: indexPath.item)
+                UpdateCoverArt(coverArt: image, albumIndex: indexPath.item)
               )
             }
           }

Persephone/DataSources/QueueDataSource.swift

@@ -6,14 +6,13 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 class QueueDataSource: NSObject, NSOutlineViewDataSource {
-  var queue: [QueueItem] = []
   var queueIcon: NSImage? = nil
 
-  func setQueueIcon(_ state: QueueState) {
+  func setQueueIcon() {
-    switch state.state {
+    switch AppDelegate.store.state.playerState.state {
     case .playing?:
       queueIcon = .playIcon
     case .paused?:
@@ -24,7 +23,7 @@ class QueueDataSource: NSObject, NSOutlineViewDataSource {
   }
 
   func outlineView(_ outlineView: NSOutlineView, numberOfChildrenOfItem item: Any?) -> Int {
-    return queue.count + 1
+    return AppDelegate.store.state.queueState.queue.count + 1
   }
 
   func outlineView(_ outlineView: NSOutlineView, isItemExpandable item: Any) -> Bool {
@@ -33,7 +32,7 @@ class QueueDataSource: NSObject, NSOutlineViewDataSource {
 
   func outlineView(_ outlineView: NSOutlineView, child index: Int, ofItem item: Any?) -> Any {
     if index > 0 {
-      return queue[index - 1]
+      return AppDelegate.store.state.queueState.queue[index - 1]
     } else {
       return false
     }

Persephone/Extensions/CGColor.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 extension CGColor {
   static let albumBorderColorLight = NSColor.black.withAlphaComponent(0.15).cgColor

Persephone/Extensions/NSEvent.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 extension NSEvent {
   static let keyCodeSpace: UInt16 = 49

Persephone/Extensions/NSFont.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 extension NSFont {
   static let systemFontRegular = systemFont(ofSize: 13, weight: .regular)

Persephone/Extensions/NSImage.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 extension NSImage {
   static let playIcon = NSImage(named: "playButton")

Persephone/Extensions/NSUserInterfaceItemIdentifier.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 extension NSUserInterfaceItemIdentifier {
   static let queueSongTitleColumn = NSUserInterfaceItemIdentifier("songTitleColumn")

Persephone/Layouts/AlbumViewLayout.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 class AlbumViewLayout: NSCollectionViewFlowLayout {
   let maxItemWidth: CGFloat = 180

Persephone/Models/Album.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import CryptoSwift
 
 struct Album {

Persephone/Models/TrackTimer.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 class TrackTimer: NSObject {
   var timer: Timer?
@@ -16,12 +16,12 @@ class TrackTimer: NSObject {
   func start(elapsedTimeMs: UInt?) {
     guard let elapsedTimeMs = elapsedTimeMs else { return }
 
+    timer?.invalidate()
+
     startTime = CACurrentMediaTime()
     startElapsed = Double(elapsedTimeMs) / 1000
 
     DispatchQueue.main.async {
-      self.timer?.invalidate()
-
       self.timer = Timer.scheduledTimer(
         withTimeInterval: 0.25,
         repeats: true
@@ -41,9 +41,9 @@ class TrackTimer: NSObject {
   func stop(elapsedTimeMs: UInt?) {
     guard let elapsedTimeMs = elapsedTimeMs else { return }
 
-    DispatchQueue.main.async {
+    timer?.invalidate()
-      self.timer?.invalidate()
 
+    DispatchQueue.main.async {
       AppDelegate.store.dispatch(
         UpdateElapsedTimeAction(elapsedTimeMs: elapsedTimeMs)
       )

Persephone/Operations/CoverArtQueue.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 class CoverArtQueue {
   static let shared = CoverArtQueue()

Persephone/Preferences/Controllers/CoverArtPrefsController.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 class CoverArtPrefsController: NSViewController {
   override func viewDidLoad() {

Persephone/Preferences/Controllers/GeneralPrefsViewController.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import ReSwift
 
 class GeneralPrefsViewController: NSViewController {

Persephone/Preferences/Controllers/PreferencesViewController.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 class PreferencesViewController: NSTabViewController {
   private lazy var tabViewSizes: [String : NSSize] = [:]

Persephone/Preferences/Controllers/PreferencesWindowController.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 class PreferencesWindowController: NSWindowController, NSWindowDelegate {
   override func windowDidLoad() {

Persephone/Services/CoverArtService.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import PromiseKit
 
 class CoverArtService {

Persephone/Services/Extensions/CoverArtService+Caching.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import PromiseKit
 
 extension CoverArtService {

Persephone/Services/Extensions/CoverArtService+Filesystem.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import PromiseKit
 
 extension CoverArtService {

Persephone/Services/Extensions/CoverArtService+Remote.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import SwiftyJSON
 import PromiseKit
 import PMKFoundation

Persephone/Services/SongNotifierService.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 struct SongNotifierService {
   let song: Song

Persephone/State/Actions/AlbumListActions.swift

@@ -6,12 +6,12 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import ReSwift
 
-struct ResetAlbumListCoverArtAction: Action {}
+struct ResetAlbumListCoverArt: Action {}
 
-struct UpdateCoverArtAction: Action {
+struct UpdateCoverArt: Action {
   var coverArt: NSImage?
   var albumIndex: Int
 }

Persephone/State/Actions/PlayerActions.swift

@@ -6,14 +6,14 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import ReSwift
 
-struct UpdateCurrentCoverArtAction: Action {
+struct UpdateCurrentCoverArt: Action {
   var coverArt: NSImage?
 }
 
-struct UpdateCurrentSongAction: Action {
+struct UpdateCurrentSong: Action {
   var currentSong: Song
 }
 
@@ -25,6 +25,6 @@ struct UpdateStatusAction: Action {
   var status: MPDClient.MPDStatus
 }
 
-struct StartedDatabaseUpdateAction: Action {}
+struct StartedDatabaseUpdate: Action {}
 
-struct FinishedDatabaseUpdateAction: Action {}
+struct FinishedDatabaseUpdate: Action {}

Persephone/State/Actions/QueueActions.swift

@@ -15,7 +15,3 @@ struct UpdateQueueAction: Action {
 struct UpdateQueuePosAction: Action {
   var queuePos: Int
 }
-
-struct UpdateQueuePlayerStateAction: Action {
-  var state: MPDClient.MPDStatus.State?
-}

Persephone/State/PlayerState.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import ReSwift
 
 struct PlayerState: StateType {

Persephone/State/QueueState.swift

@@ -11,14 +11,11 @@ import ReSwift
 struct QueueState: StateType {
   var queue: [QueueItem] = []
   var queuePos: Int = -1
-
-  var state: MPDClient.MPDStatus.State?
 }
 
 extension QueueState: Equatable {
   static func == (lhs: QueueState, rhs: QueueState) -> Bool {
     return (lhs.queue == rhs.queue) &&
-      (lhs.queuePos == rhs.queuePos) &&
+      (lhs.queuePos == rhs.queuePos)
-      (lhs.state == rhs.state)
   }
 }

Persephone/State/Reducers/AlbumListReducer.swift

@@ -15,10 +15,10 @@ func albumListReducer(action: Action, state: AlbumListState?) -> AlbumListState
   case let action as UpdateAlbumListAction:
     state.albums = action.albums.map { Album(mpdAlbum: $0) }
 
-  case let action as UpdateCoverArtAction:
+  case let action as UpdateCoverArt:
     state.albums[action.albumIndex].coverArt = .loaded(action.coverArt)
 
-  case is ResetAlbumListCoverArtAction:
+  case is ResetAlbumListCoverArt:
     state.albums = AppDelegate.store.state.albumListState.albums.map {
       var album = $0
       switch album.coverArt {

Persephone/State/Reducers/PlayerReducer.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import ReSwift
 
 func playerReducer(action: Action, state: PlayerState?) -> PlayerState {
@@ -25,13 +25,7 @@ func playerReducer(action: Action, state: PlayerState?) -> PlayerState {
       AppDelegate.trackTimer.stop(elapsedTimeMs: state.elapsedTimeMs)
     }
 
-    DispatchQueue.main.async {
+  case let action as UpdateCurrentSong:
-      AppDelegate.store.dispatch(
-        UpdateQueuePlayerStateAction(state: state.state)
-      )
-    }
-
-  case let action as UpdateCurrentSongAction:
     state.currentSong = action.currentSong
 
     if let currentSong = state.currentSong {
@@ -41,29 +35,29 @@ func playerReducer(action: Action, state: PlayerState?) -> PlayerState {
         .done() { image in
           DispatchQueue.main.async {
             if let image = image {
-              AppDelegate.store.dispatch(UpdateCurrentCoverArtAction(coverArt: image))
+              AppDelegate.store.dispatch(UpdateCurrentCoverArt(coverArt: image))
             } else {
-              AppDelegate.store.dispatch(UpdateCurrentCoverArtAction(coverArt: .defaultCoverArt))
+              AppDelegate.store.dispatch(UpdateCurrentCoverArt(coverArt: .defaultCoverArt))
             }
           }
         }
         .cauterize()
     } else {
       DispatchQueue.main.async {
-        AppDelegate.store.dispatch(UpdateCurrentCoverArtAction(coverArt: .defaultCoverArt))
+        AppDelegate.store.dispatch(UpdateCurrentCoverArt(coverArt: .defaultCoverArt))
       }
     }
 
-  case let action as UpdateCurrentCoverArtAction:
+  case let action as UpdateCurrentCoverArt:
     state.currentArtwork = action.coverArt
 
   case let action as UpdateElapsedTimeAction:
     state.elapsedTimeMs = action.elapsedTimeMs
 
-  case is StartedDatabaseUpdateAction:
+  case is StartedDatabaseUpdate:
     state.databaseUpdating = true
 
-  case is FinishedDatabaseUpdateAction:
+  case is FinishedDatabaseUpdate:
     state.databaseUpdating = false
 
   default:

Persephone/State/Reducers/QueueReducer.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import ReSwift
 
 func queueReducer(action: Action, state: QueueState?) -> QueueState {
@@ -40,12 +40,9 @@ func queueReducer(action: Action, state: QueueState?) -> QueueState {
 
     DispatchQueue.main.async {
       AppDelegate.store.dispatch(
-        UpdateCurrentSongAction(currentSong: state.queue[newSongRowPos].song)
+        UpdateCurrentSong(currentSong: state.queue[newSongRowPos].song)
       )
     }
-
-  case let action as UpdateQueuePlayerStateAction:
-    state.state = action.state
     
   default:
     break

Persephone/Views/AlbumItemView.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 class AlbumItemView: NSView {
   var trackingArea: NSTrackingArea?

Persephone/Views/CurrentCoverArtView.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 import ReSwift
 
 class CurrentCoverArtView: NSImageView {

Persephone/Views/MainWindow.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import Cocoa
 
 class MainWindow: NSWindow {
   override func keyDown(with event: NSEvent) {