Add album list and basic album detail view

Mac/Components/Browser/Album Detail/AlbumTracksDataSource.swift

@@ -9,21 +9,6 @@
 import AppKit
 
 class AlbumTracksDataSource: NSObject, NSTableViewDataSource {
-  struct AlbumSongItem {
-    let disc: String?
-    let song: Song?
-
-    init(song: Song) {
-      self.disc = nil
-      self.song = song
-    }
-
-    init(disc: String) {
-      self.disc = disc
-      self.song = nil
-    }
-  }
-
   var albumSongs: [AlbumSongItem] = []
   var showSongArtist: Bool = false
 

Mac/Components/Shared/Extensions/CGColor.swift

@@ -6,9 +6,9 @@
 //  Copyright © 2019 Dan Barber. All rights reserved.
 //
 
-import AppKit
+import CoreGraphics
 
 extension CGColor {
-  static let albumBorderColorLight = NSColor.black.withAlphaComponent(0.15).cgColor
-  static let albumBorderColorDark = NSColor.white.withAlphaComponent(0.15).cgColor
+  static let albumBorderColorLight = CGColor.black.copy(alpha: 0.15)
+  static let albumBorderColorDark = CGColor.white.copy(alpha: 0.15)
 }

Persephone.xcodeproj/xcshareddata/xcschemes/Persephone-iOS.xcscheme

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1220"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "E411C26C241C10F0008B9682"
+               BuildableName = "Persephone.app"
+               BlueprintName = "Persephone-iOS"
+               ReferencedContainer = "container:Persephone.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "E411C281241C10F5008B9682"
+               BuildableName = "Persephone-iOSTests.xctest"
+               BlueprintName = "Persephone-iOSTests"
+               ReferencedContainer = "container:Persephone.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "E411C28C241C10F5008B9682"
+               BuildableName = "Persephone-iOSUITests.xctest"
+               BlueprintName = "Persephone-iOSUITests"
+               ReferencedContainer = "container:Persephone.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E411C26C241C10F0008B9682"
+            BuildableName = "Persephone.app"
+            BlueprintName = "Persephone-iOS"
+            ReferencedContainer = "container:Persephone.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E411C26C241C10F0008B9682"
+            BuildableName = "Persephone.app"
+            BlueprintName = "Persephone-iOS"
+            ReferencedContainer = "container:Persephone.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Shared/Controllers/MPDServerController.swift

@@ -21,8 +21,10 @@ class MPDServerController {
   func connect() {
     let mpdServer = App.store.state.preferencesState.mpdServer
 
+    guard let host = mpdServer.hostOrDefault else { return }
+
     App.mpdClient.connect(
-      host: mpdServer.hostOrDefault,
+      host: host,
       port: mpdServer.portOrDefault
     )
   }

Shared/MPDClient/Extensions/MPDClient+Album.swift

@@ -57,7 +57,7 @@ extension MPDClient {
   func albums(filter: String) {
     var albums: [MPDAlbum] = []
 
-    mpd_search_db_songs(self.connection, false)
+    mpd_search_db_songs(connection, false)
     if filter != "" {
       let escapedFilter = filter.replacingOccurrences(of: "'", with: "\\'")
 
@@ -66,11 +66,12 @@ extension MPDClient {
         "(any contains '\(escapedFilter)')"
       )
     }
-    mpd_search_add_tag_constraint(self.connection, MPD_OPERATOR_DEFAULT, MPD_TAG_TRACK, "1")
+    mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT, MPD_TAG_TRACK, "1")
+    mpd_search_add_sort_tag(connection, MPD_TAG_ALBUM_ARTIST_SORT, false)
 
     mpd_search_commit(self.connection)
 
-    while let song = mpd_recv_song(self.connection) {
+    while let song = mpd_recv_song(connection) {
       let mpdSong = MPDSong(song)
 
       let mpdAlbum = MPDAlbum(
@@ -92,10 +93,10 @@ extension MPDClient {
 
     var firstSong: MPDSong?
 
-    mpd_search_db_songs(self.connection, true)
-    mpd_search_add_tag_constraint(self.connection, MPD_OPERATOR_DEFAULT, MPD_TAG_ALBUM, album.title)
-    mpd_search_add_tag_constraint(self.connection, MPD_OPERATOR_DEFAULT, MPD_TAG_ALBUM_ARTIST, album.artist)
-    mpd_search_add_tag_constraint(self.connection, MPD_OPERATOR_DEFAULT, MPD_TAG_TRACK, "1")
+    mpd_search_db_songs(connection, true)
+    mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT, MPD_TAG_ALBUM, album.title)
+    mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT, MPD_TAG_ALBUM_ARTIST, album.artist)
+    mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT, MPD_TAG_TRACK, "1")
 
     mpd_search_commit(self.connection)
 

Shared/MPDClient/Extensions/MPDClient+Connection.swift

@@ -35,19 +35,21 @@ extension MPDClient {
 
     self.delegate?.willDisconnect(mpdClient: self)
 
-     mpd_connection_free(self.connection)
-     self.isConnected = false
+    mpd_connection_free(self.connection)
+    self.isConnected = false
   }
 
   func connect(host: String, port: Int) {
-    let commandOperation = BlockOperation() { [unowned self] in
-      self.sendCommand(command: .connect, userData: ["host": host, "port": port])
+    if !isConnected {
+      let commandOperation = BlockOperation() { [unowned self] in
+        self.sendCommand(command: .connect, userData: ["host": host, "port": port])
 
-      if self.isConnected {
-        self.idle()
+        if self.isConnected {
+          self.idle()
+        }
       }
+      commandQueue.addOperation(commandOperation)
     }
-    commandQueue.addOperation(commandOperation)
   }
 
   func disconnect() {

Shared/Models/AlbumSongItem.swift

@@ -0,0 +1,24 @@
+//
+//  AlbumSongItem.swift
+//  Persephone-iOS
+//
+//  Created by Daniel Barber on 2020-3-30.
+//  Copyright © 2020 Dan Barber. All rights reserved.
+//
+
+import Foundation
+
+struct AlbumSongItem {
+  let disc: String?
+  let song: Song?
+
+  init(song: Song) {
+    self.disc = nil
+    self.song = song
+  }
+
+  init(disc: String) {
+    self.disc = disc
+    self.song = nil
+  }
+}

Shared/Models/MPDServer.swift

@@ -7,12 +7,17 @@
 //
 
 struct MPDServer {
-  let hostDefault = "127.0.0.1"
+  #if os(macOS)
+  let hostDefault: String? = "127.0.0.1"
+  #else
+  let hostDefault: String? = nil
+  #endif
+
   let portDefault = 6600
 
   var host: String?
 
-  var hostOrDefault: String {
+  var hostOrDefault: String? {
     return host ?? hostDefault
   }
 

Shared/Models/Time.swift

@@ -25,4 +25,8 @@ struct Time {
 
     return formatter.string(from: TimeInterval(timeInSeconds))!
   }
+
+  var hours: Int { timeInSeconds / 3600 }
+
+  var minutes: Int { timeInSeconds % 3600 / 60 }
 }

iOS/App.swift

@@ -11,7 +11,6 @@ import ReSwift
 struct App {
   static let store = Store<AppState>(reducer: appReducer, state: nil)
   static let trackTimer = TrackTimer()
-  //static let userNotificationsController = UserNotificationsController()
   static let mpdServerDelegate = MPDServerDelegate()
   static let mpdServerController = MPDServerController(delegate: mpdServerDelegate)
   static var mpdClient: MPDClient!

iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,116 @@
+{
+  "images" : [
+    {
+      "filename" : "iOS-40x40-1.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iOS-60x60.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iOS-58x58-1.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iOS-87x87.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iOS-80x80.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iOS-120x120.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iOS-120x120-1.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "iOS-180x180.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "iOS-20x20.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iOS-40x40.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iOS-29x29.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iOS-58x58.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iOS-40x40-2.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iOS-80x80-1.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iOS-76x76.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "iOS-152x152.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "iOS-167x167.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "iOS-1024x1024.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}