Import AppKit rather than Cocoa

Importing Cocoa pulls in CoreData, which we're not using. https://github.com/brentsimmons/NetNewsWire/blob/master/Technotes/CodingGuidelines.md
We need to invalidate the timer on the main thread
2025-03-04 08:39:11 +00:00 · 2019-04-29 08:59:04 -04:00 · 2019-04-29 08:31:58 -04:00 · 2019-04-29 08:31:44 -04:00
38 changed files with 88 additions and 90 deletions
--- a/Persephone/AppDelegate.swift
+++ b/Persephone/AppDelegate.swift
@ -6,7 +6,7 @@
 //  Copyright © 2018 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import ReSwift
 import MediaKeyTap

--- a/Persephone/Controllers/AlbumViewController.swift
+++ b/Persephone/Controllers/AlbumViewController.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import ReSwift
 import Differ

@ -28,15 +28,6 @@ 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() {
@ -68,7 +59,7 @@ class AlbumViewController: NSViewController,
    case "mpdLibraryDir":
      albumCollectionView.reloadData()
    case "fetchMissingArtworkFromInternet":
-      AppDelegate.store.dispatch(ResetAlbumListCoverArt())
+      AppDelegate.store.dispatch(ResetAlbumListCoverArtAction())
    default:
      break
    }
@ -82,16 +73,11 @@ extension AlbumViewController: StoreSubscriber {
  typealias StoreSubscriberStateType = AlbumListState

  func newState(state: StoreSubscriberStateType) {
-    if dataSource.albums == [] {
-      dataSource.albums = state.albums
-      albumCollectionView.reloadData()
-    } else {
-      let oldAlbums = dataSource.albums
-      dataSource.albums = state.albums
-      albumCollectionView.animateItemChanges(
-        oldData: oldAlbums,
-        newData: dataSource.albums
-      )
-    }
+    let oldAlbums = dataSource.albums
+    dataSource.albums = state.albums
+    albumCollectionView.animateItemChanges(
+      oldData: oldAlbums,
+      newData: dataSource.albums
+    )
  }
 }
--- a/Persephone/Controllers/AlbumViewItem.swift
+++ b/Persephone/Controllers/AlbumViewItem.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 class AlbumViewItem: NSCollectionViewItem {
  var observer: NSKeyValueObservation?
--- a/Persephone/Controllers/MainSplitViewController.swift
+++ b/Persephone/Controllers/MainSplitViewController.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 class MainSplitViewController: NSSplitViewController {
  override func keyDown(with event: NSEvent) {
--- a/Persephone/Controllers/NotificationsController.swift
+++ b/Persephone/Controllers/NotificationsController.swift
@ -30,13 +30,13 @@ class NotificationsController: MPDClientDelegate {

  func willStartDatabaseUpdate(mpdClient: MPDClient) {
    DispatchQueue.main.async {
-      AppDelegate.store.dispatch(StartedDatabaseUpdate())
+      AppDelegate.store.dispatch(StartedDatabaseUpdateAction())
    }
  }

  func didFinishDatabaseUpdate(mpdClient: MPDClient) {
    DispatchQueue.main.async {
-      AppDelegate.store.dispatch(FinishedDatabaseUpdate())
+      AppDelegate.store.dispatch(FinishedDatabaseUpdateAction())
    }
  }

--- a/Persephone/Controllers/QueueViewController.swift
+++ b/Persephone/Controllers/QueueViewController.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import ReSwift

 class QueueViewController: NSViewController,
@ -27,12 +27,6 @@ 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:
@ -128,7 +122,8 @@ extension QueueViewController: StoreSubscriber {
  typealias StoreSubscriberStateType = QueueState

  func newState(state: StoreSubscriberStateType) {
-    dataSource.setQueueIcon()
+    dataSource.queue = state.queue
+    dataSource.setQueueIcon(state)
    queueView.reloadData()
  }
 }
--- a/Persephone/Controllers/WindowController.swift
+++ b/Persephone/Controllers/WindowController.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import ReSwift

 class WindowController: NSWindowController {
--- a/Persephone/DataSources/AlbumDataSource.swift
+++ b/Persephone/DataSources/AlbumDataSource.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import PromiseKit

 class AlbumDataSource: NSObject, NSCollectionViewDataSource {
@ -33,7 +33,7 @@ class AlbumDataSource: NSObject, NSCollectionViewDataSource {
          .done { image in
            DispatchQueue.main.async {
              AppDelegate.store.dispatch(
-                UpdateCoverArt(coverArt: image, albumIndex: indexPath.item)
+                UpdateCoverArtAction(coverArt: image, albumIndex: indexPath.item)
              )
            }
          }
--- a/Persephone/DataSources/QueueDataSource.swift
+++ b/Persephone/DataSources/QueueDataSource.swift
@ -6,13 +6,14 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 class QueueDataSource: NSObject, NSOutlineViewDataSource {
+  var queue: [QueueItem] = []
  var queueIcon: NSImage? = nil

-  func setQueueIcon() {
-    switch AppDelegate.store.state.playerState.state {
+  func setQueueIcon(_ state: QueueState) {
+    switch state.state {
    case .playing?:
      queueIcon = .playIcon
    case .paused?:
@ -23,7 +24,7 @@ class QueueDataSource: NSObject, NSOutlineViewDataSource {
  }

  func outlineView(_ outlineView: NSOutlineView, numberOfChildrenOfItem item: Any?) -> Int {
-    return AppDelegate.store.state.queueState.queue.count + 1
+    return queue.count + 1
  }

  func outlineView(_ outlineView: NSOutlineView, isItemExpandable item: Any) -> Bool {
@ -32,7 +33,7 @@ class QueueDataSource: NSObject, NSOutlineViewDataSource {

  func outlineView(_ outlineView: NSOutlineView, child index: Int, ofItem item: Any?) -> Any {
    if index > 0 {
-      return AppDelegate.store.state.queueState.queue[index - 1]
+      return queue[index - 1]
    } else {
      return false
    }
--- a/Persephone/Extensions/CGColor.swift
+++ b/Persephone/Extensions/CGColor.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 extension CGColor {
  static let albumBorderColorLight = NSColor.black.withAlphaComponent(0.15).cgColor
--- a/Persephone/Extensions/NSEvent.swift
+++ b/Persephone/Extensions/NSEvent.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 extension NSEvent {
  static let keyCodeSpace: UInt16 = 49
--- a/Persephone/Extensions/NSFont.swift
+++ b/Persephone/Extensions/NSFont.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 extension NSFont {
  static let systemFontRegular = systemFont(ofSize: 13, weight: .regular)
--- a/Persephone/Extensions/NSImage.swift
+++ b/Persephone/Extensions/NSImage.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 extension NSImage {
  static let playIcon = NSImage(named: "playButton")
--- a/Persephone/Extensions/NSUserInterfaceItemIdentifier.swift
+++ b/Persephone/Extensions/NSUserInterfaceItemIdentifier.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 extension NSUserInterfaceItemIdentifier {
  static let queueSongTitleColumn = NSUserInterfaceItemIdentifier("songTitleColumn")
--- a/Persephone/Layouts/AlbumViewLayout.swift
+++ b/Persephone/Layouts/AlbumViewLayout.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 class AlbumViewLayout: NSCollectionViewFlowLayout {
  let maxItemWidth: CGFloat = 180
--- a/Persephone/Models/Album.swift
+++ b/Persephone/Models/Album.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import CryptoSwift

 struct Album {
--- a/Persephone/Models/TrackTimer.swift
+++ b/Persephone/Models/TrackTimer.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 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 }

-    timer?.invalidate()
-
    DispatchQueue.main.async {
+      self.timer?.invalidate()
+
      AppDelegate.store.dispatch(
        UpdateElapsedTimeAction(elapsedTimeMs: elapsedTimeMs)
      )
--- a/Persephone/Operations/CoverArtQueue.swift
+++ b/Persephone/Operations/CoverArtQueue.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 class CoverArtQueue {
  static let shared = CoverArtQueue()
--- a/Persephone/Preferences/Controllers/CoverArtPrefsController.swift
+++ b/Persephone/Preferences/Controllers/CoverArtPrefsController.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 class CoverArtPrefsController: NSViewController {
  override func viewDidLoad() {
--- a/Persephone/Preferences/Controllers/GeneralPrefsViewController.swift
+++ b/Persephone/Preferences/Controllers/GeneralPrefsViewController.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import ReSwift

 class GeneralPrefsViewController: NSViewController {
--- a/Persephone/Preferences/Controllers/PreferencesViewController.swift
+++ b/Persephone/Preferences/Controllers/PreferencesViewController.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 class PreferencesViewController: NSTabViewController {
  private lazy var tabViewSizes: [String : NSSize] = [:]
--- a/Persephone/Preferences/Controllers/PreferencesWindowController.swift
+++ b/Persephone/Preferences/Controllers/PreferencesWindowController.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 class PreferencesWindowController: NSWindowController, NSWindowDelegate {
  override func windowDidLoad() {
--- a/Persephone/Services/CoverArtService.swift
+++ b/Persephone/Services/CoverArtService.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import PromiseKit

 class CoverArtService {
--- a/Persephone/Services/Extensions/CoverArtService+Caching.swift
+++ b/Persephone/Services/Extensions/CoverArtService+Caching.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import PromiseKit

 extension CoverArtService {
--- a/Persephone/Services/Extensions/CoverArtService+Filesystem.swift
+++ b/Persephone/Services/Extensions/CoverArtService+Filesystem.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import PromiseKit

 extension CoverArtService {
--- a/Persephone/Services/Extensions/CoverArtService+Remote.swift
+++ b/Persephone/Services/Extensions/CoverArtService+Remote.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import SwiftyJSON
 import PromiseKit
 import PMKFoundation
--- a/Persephone/Services/SongNotifierService.swift
+++ b/Persephone/Services/SongNotifierService.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 struct SongNotifierService {
  let song: Song
--- a/Persephone/State/Actions/AlbumListActions.swift
+++ b/Persephone/State/Actions/AlbumListActions.swift
@ -6,12 +6,12 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import ReSwift

-struct ResetAlbumListCoverArt: Action {}
+struct ResetAlbumListCoverArtAction: Action {}

-struct UpdateCoverArt: Action {
+struct UpdateCoverArtAction: Action {
  var coverArt: NSImage?
  var albumIndex: Int
 }
--- a/Persephone/State/Actions/PlayerActions.swift
+++ b/Persephone/State/Actions/PlayerActions.swift
@ -6,14 +6,14 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import ReSwift

-struct UpdateCurrentCoverArt: Action {
+struct UpdateCurrentCoverArtAction: Action {
  var coverArt: NSImage?
 }

-struct UpdateCurrentSong: Action {
+struct UpdateCurrentSongAction: Action {
  var currentSong: Song
 }

@ -25,6 +25,6 @@ struct UpdateStatusAction: Action {
  var status: MPDClient.MPDStatus
 }

-struct StartedDatabaseUpdate: Action {}
+struct StartedDatabaseUpdateAction: Action {}

-struct FinishedDatabaseUpdate: Action {}
+struct FinishedDatabaseUpdateAction: Action {}
--- a/Persephone/State/Actions/QueueActions.swift
+++ b/Persephone/State/Actions/QueueActions.swift
@ -15,3 +15,7 @@ struct UpdateQueueAction: Action {
 struct UpdateQueuePosAction: Action {
  var queuePos: Int
 }
+
+struct UpdateQueuePlayerStateAction: Action {
+  var state: MPDClient.MPDStatus.State?
+}
--- a/Persephone/State/PlayerState.swift
+++ b/Persephone/State/PlayerState.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import ReSwift

 struct PlayerState: StateType {
--- a/Persephone/State/QueueState.swift
+++ b/Persephone/State/QueueState.swift
@ -11,11 +11,14 @@ 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)
  }
 }
--- a/Persephone/State/Reducers/AlbumListReducer.swift
+++ b/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 UpdateCoverArt:
+  case let action as UpdateCoverArtAction:
    state.albums[action.albumIndex].coverArt = .loaded(action.coverArt)

-  case is ResetAlbumListCoverArt:
+  case is ResetAlbumListCoverArtAction:
    state.albums = AppDelegate.store.state.albumListState.albums.map {
      var album = $0
      switch album.coverArt {
--- a/Persephone/State/Reducers/PlayerReducer.swift
+++ b/Persephone/State/Reducers/PlayerReducer.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import ReSwift

 func playerReducer(action: Action, state: PlayerState?) -> PlayerState {
@ -25,7 +25,13 @@ func playerReducer(action: Action, state: PlayerState?) -> PlayerState {
      AppDelegate.trackTimer.stop(elapsedTimeMs: state.elapsedTimeMs)
    }

-  case let action as UpdateCurrentSong:
+    DispatchQueue.main.async {
+      AppDelegate.store.dispatch(
+        UpdateQueuePlayerStateAction(state: state.state)
+      )
+    }
+
+  case let action as UpdateCurrentSongAction:
    state.currentSong = action.currentSong

    if let currentSong = state.currentSong {
@ -35,29 +41,29 @@ func playerReducer(action: Action, state: PlayerState?) -> PlayerState {
        .done() { image in
          DispatchQueue.main.async {
            if let image = image {
-              AppDelegate.store.dispatch(UpdateCurrentCoverArt(coverArt: image))
+              AppDelegate.store.dispatch(UpdateCurrentCoverArtAction(coverArt: image))
            } else {
-              AppDelegate.store.dispatch(UpdateCurrentCoverArt(coverArt: .defaultCoverArt))
+              AppDelegate.store.dispatch(UpdateCurrentCoverArtAction(coverArt: .defaultCoverArt))
            }
          }
        }
        .cauterize()
    } else {
      DispatchQueue.main.async {
-        AppDelegate.store.dispatch(UpdateCurrentCoverArt(coverArt: .defaultCoverArt))
+        AppDelegate.store.dispatch(UpdateCurrentCoverArtAction(coverArt: .defaultCoverArt))
      }
    }

-  case let action as UpdateCurrentCoverArt:
+  case let action as UpdateCurrentCoverArtAction:
    state.currentArtwork = action.coverArt

  case let action as UpdateElapsedTimeAction:
    state.elapsedTimeMs = action.elapsedTimeMs

-  case is StartedDatabaseUpdate:
+  case is StartedDatabaseUpdateAction:
    state.databaseUpdating = true

-  case is FinishedDatabaseUpdate:
+  case is FinishedDatabaseUpdateAction:
    state.databaseUpdating = false

  default:
--- a/Persephone/State/Reducers/QueueReducer.swift
+++ b/Persephone/State/Reducers/QueueReducer.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import ReSwift

 func queueReducer(action: Action, state: QueueState?) -> QueueState {
@ -40,9 +40,12 @@ func queueReducer(action: Action, state: QueueState?) -> QueueState {

    DispatchQueue.main.async {
      AppDelegate.store.dispatch(
-        UpdateCurrentSong(currentSong: state.queue[newSongRowPos].song)
+        UpdateCurrentSongAction(currentSong: state.queue[newSongRowPos].song)
      )
    }
+
+  case let action as UpdateQueuePlayerStateAction:
+    state.state = action.state
    
  default:
    break
--- a/Persephone/Views/AlbumItemView.swift
+++ b/Persephone/Views/AlbumItemView.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 class AlbumItemView: NSView {
  var trackingArea: NSTrackingArea?
--- a/Persephone/Views/CurrentCoverArtView.swift
+++ b/Persephone/Views/CurrentCoverArtView.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit
 import ReSwift

 class CurrentCoverArtView: NSImageView {
--- a/Persephone/Views/MainWindow.swift
+++ b/Persephone/Views/MainWindow.swift
@ -6,7 +6,7 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //

-import Cocoa
+import AppKit

 class MainWindow: NSWindow {
  override func keyDown(with event: NSEvent) {
Author	SHA1	Message	Date
Daniel Barber	4d2a8087ed	Import AppKit rather than Cocoa Importing Cocoa pulls in CoreData, which we're not using. https://github.com/brentsimmons/NetNewsWire/blob/master/Technotes/CodingGuidelines.md	2019-04-29 08:59:04 -04:00
Daniel Barber	b311005393	We need to invalidate the timer on the main thread	2019-04-29 08:31:58 -04:00
Daniel Barber	0de001ce16	Give the queue its own local state	2019-04-29 08:31:44 -04:00