danbarber/persephone
1
1
Fork 0
mirror of https://github.com/danbee/persephone synced 2025-03-04 08:39:11 +00:00
Code Issues Releases Wiki Activity

Finish AlbumArtService refactor

Browse Source
This commit is contained in:
Daniel Barber 2019-03-25 22:39:40 -04:00
parent 27c0e32e48
commit 2fb0ceeaee
Signed by: danbarber
GPG Key ID: 931D8112E0103DD8
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Persephone/DataSources/AlbumDataSource.swift
View File

@ -23,7 +23,7 @@ class AlbumDataSource: NSObject, NSCollectionViewDataSource {
albumViewItem.setAlbum(albums[indexPath.item]) albumViewItem.setAlbum(albums[indexPath.item])
if albums[indexPath.item].coverArt == nil { if albums[indexPath.item].coverArt == nil {
AppDelegate.mpdClient.albumFirstSong(for: albums[indexPath.item].mpdAlbum) { AppDelegate.mpdClient.getAlbumFirstSong(for: albums[indexPath.item].mpdAlbum) {
guard let song = $0 else { return } guard let song = $0 else { return }
AlbumArtService(song: Song(mpdSong: song)).fetchAlbumArt { image in AlbumArtService(song: Song(mpdSong: song)).fetchAlbumArt { image in

4
Persephone/MPDClient/Extensions/MPDClient+Album.swift
View File

@ -18,7 +18,7 @@ extension MPDClient {
enqueueCommand(command: .playAlbum, userData: ["album": album]) enqueueCommand(command: .playAlbum, userData: ["album": album])
} }
func getAlbumFirstSong(for album: MPDAlbum, callback: @escaping (String?) -> Void) { func getAlbumFirstSong(for album: MPDAlbum, callback: @escaping (MPDSong?) -> Void) {
enqueueCommand( enqueueCommand(
command: .getAlbumFirstSong, command: .getAlbumFirstSong,
priority: .low, priority: .low,
@ -69,7 +69,7 @@ extension MPDClient {
self.delegate?.didLoadAlbums(mpdClient: self, albums: albums) self.delegate?.didLoadAlbums(mpdClient: self, albums: albums)
} }
func albumFirstSong(for album: MPDAlbum, callback: @escaping (MPDSong?) -> Void) { func albumFirstSong(for album: MPDAlbum, callback: (MPDSong?) -> Void) {
guard isConnected else { return } guard isConnected else { return }
var firstSong: MPDSong? var firstSong: MPDSong?

1
Persephone/MPDClient/Extensions/MPDClient+Command.swift
View File

@ -55,6 +55,7 @@ extension MPDClient {
guard let album = userData["album"] as? MPDAlbum, guard let album = userData["album"] as? MPDAlbum,
let callback = userData["callback"] as? (MPDSong?) -> Void let callback = userData["callback"] as? (MPDSong?) -> Void
else { return } else { return }
albumFirstSong(for: album, callback: callback) albumFirstSong(for: album, callback: callback)
} }
} }