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

Compare commits

base: danbarber:812af07c1ace4885d8b1ea9bc9f91bc2dda73b1f
Branches Tags
danbarber:get-things-building-again
danbarber:main
danbarber:fix-command-threading-issues
danbarber:playlists
danbarber:now-playing
danbarber:add-ios-album-list
danbarber:better-shortcut-keys
danbarber:can-we-remove-the-artist-browser
danbarber:artist-browser
danbarber:separate-apps
danbarber:0.18.1-alpha
danbarber:0.18.0-alpha
danbarber:0.17.3-alpha
danbarber:0.17.2-alpha
danbarber:0.17.0-alpha
danbarber:0.16.1-alpha
danbarber:0.16.0-alpha
danbarber:0.15.0-alpha
danbarber:0.14.0-alpha
danbarber:0.13.0-alpha
danbarber:0.12.0-alpha
danbarber:v0.11.2-alpha
danbarber:v0.11.1-alpha
danbarber:v0.11.0-alpha
danbarber:0.10.3a
danbarber:0.10.2a
danbarber:v0.8.0
..
compare: danbarber:2fb0ceeaee0a9058c2d2479fdb8db49cd1e3fae6
Branches Tags
danbarber:get-things-building-again
danbarber:main
danbarber:fix-command-threading-issues
danbarber:playlists
danbarber:now-playing
danbarber:add-ios-album-list
danbarber:better-shortcut-keys
danbarber:can-we-remove-the-artist-browser
danbarber:artist-browser
danbarber:separate-apps
danbarber:0.18.1-alpha
danbarber:0.18.0-alpha
danbarber:0.17.3-alpha
danbarber:0.17.2-alpha
danbarber:0.17.0-alpha
danbarber:0.16.1-alpha
danbarber:0.16.0-alpha
danbarber:0.15.0-alpha
danbarber:0.14.0-alpha
danbarber:0.13.0-alpha
danbarber:0.12.0-alpha
danbarber:v0.11.2-alpha
danbarber:v0.11.1-alpha
danbarber:v0.11.0-alpha
danbarber:0.10.3a
danbarber:0.10.2a
danbarber:v0.8.0

No commits in common. "812af07c1ace4885d8b1ea9bc9f91bc2dda73b1f" and "2fb0ceeaee0a9058c2d2479fdb8db49cd1e3fae6" have entirely different histories.
812af07c1a ... 2fb0ceeaee

3 changed files with 13 additions and 13 deletions
Show Stats Expand all files Collapse all files

4
Cartfile.resolved
View File

@ -1,4 +1,4 @@
github "PromiseKit/Foundation" "3.3.2" github "PromiseKit/Foundation" "3.3.1"
github "SwiftyJSON/SwiftyJSON" "4.2.0" github "SwiftyJSON/SwiftyJSON" "4.2.0"
github "mxcl/PromiseKit" "6.8.4" github "mxcl/PromiseKit" "6.8.3"
github "nhurden/MediaKeyTap" "355d346c56243e6d56487fa46fcad945251e16ae" github "nhurden/MediaKeyTap" "355d346c56243e6d56487fa46fcad945251e16ae"

18
Persephone.xcodeproj/project.pbxproj
View File

@ -646,7 +646,7 @@
TargetAttributes = { TargetAttributes = {
E40786172110CE6E006887B1 = { E40786172110CE6E006887B1 = {
CreatedOnToolsVersion = 9.4.1; CreatedOnToolsVersion = 9.4.1;
LastSwiftMigration = 1020; LastSwiftMigration = 1010;
SystemCapabilities = { SystemCapabilities = {
com.apple.Sandbox = { com.apple.Sandbox = {
enabled = 0; enabled = 0;
@ -655,12 +655,12 @@
}; };
E40786292110CE70006887B1 = { E40786292110CE70006887B1 = {
CreatedOnToolsVersion = 9.4.1; CreatedOnToolsVersion = 9.4.1;
LastSwiftMigration = 1020; LastSwiftMigration = 1010;
TestTargetID = E40786172110CE6E006887B1; TestTargetID = E40786172110CE6E006887B1;
}; };
E40786342110CE70006887B1 = { E40786342110CE70006887B1 = {
CreatedOnToolsVersion = 9.4.1; CreatedOnToolsVersion = 9.4.1;
LastSwiftMigration = 1020; LastSwiftMigration = 1010;
TestTargetID = E40786172110CE6E006887B1; TestTargetID = E40786172110CE6E006887B1;
}; };
}; };
@ -981,7 +981,7 @@
PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.Persephone; PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.Persephone;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 4.2;
SYSTEM_HEADER_SEARCH_PATHS = Persephone/include; SYSTEM_HEADER_SEARCH_PATHS = Persephone/include;
USER_HEADER_SEARCH_PATHS = libmpdclient/output; USER_HEADER_SEARCH_PATHS = libmpdclient/output;
}; };
@ -1012,7 +1012,7 @@
PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.Persephone; PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.Persephone;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 4.2;
SYSTEM_HEADER_SEARCH_PATHS = Persephone/include; SYSTEM_HEADER_SEARCH_PATHS = Persephone/include;
USER_HEADER_SEARCH_PATHS = libmpdclient/output; USER_HEADER_SEARCH_PATHS = libmpdclient/output;
}; };
@ -1040,7 +1040,7 @@
PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.PersephoneTests; PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.PersephoneTests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 4.2;
SYSTEM_HEADER_SEARCH_PATHS = Persephone/include; SYSTEM_HEADER_SEARCH_PATHS = Persephone/include;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Persephone.app/Contents/MacOS/Persephone"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Persephone.app/Contents/MacOS/Persephone";
USER_HEADER_SEARCH_PATHS = libmpdclient/output; USER_HEADER_SEARCH_PATHS = libmpdclient/output;
@ -1069,7 +1069,7 @@
PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.PersephoneTests; PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.PersephoneTests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 4.2;
SYSTEM_HEADER_SEARCH_PATHS = Persephone/include; SYSTEM_HEADER_SEARCH_PATHS = Persephone/include;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Persephone.app/Contents/MacOS/Persephone"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Persephone.app/Contents/MacOS/Persephone";
USER_HEADER_SEARCH_PATHS = libmpdclient/output; USER_HEADER_SEARCH_PATHS = libmpdclient/output;
@ -1093,7 +1093,7 @@
PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.PersephoneUITests; PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.PersephoneUITests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 4.2;
TEST_TARGET_NAME = Persephone; TEST_TARGET_NAME = Persephone;
}; };
name = Debug; name = Debug;
@ -1115,7 +1115,7 @@
PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.PersephoneUITests; PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.PersephoneUITests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 4.2;
TEST_TARGET_NAME = Persephone; TEST_TARGET_NAME = Persephone;
}; };
name = Release; name = Release;

4
Persephone/Services/AlbumArtService.swift
View File

@ -30,9 +30,9 @@ class AlbumArtService {
firstly { firstly {
self.getCachedArtwork() self.getCachedArtwork()
}.then { artwork -> Promise<NSImage?> in }.then { artwork -> Promise<NSImage?> in
artwork.map { Promise.value($0 as NSImage?) } ?? self.cacheIfNecessary(self.getArtworkFromFilesystem()) artwork.map(Promise.value) ?? self.cacheIfNecessary(self.getArtworkFromFilesystem())
}.then { artwork -> Promise<NSImage?> in }.then { artwork -> Promise<NSImage?> in
artwork.map { Promise.value($0 as NSImage?) } ?? self.cacheIfNecessary(self.getArtworkFromMusicBrainz().map(Optional.some)) artwork.map(Promise.value) ?? self.cacheIfNecessary(self.getArtworkFromMusicBrainz().map(Optional.some))
}.tap { result in }.tap { result in
switch result { switch result {
case .fulfilled(nil), .rejected(MusicBrainzError.noArtworkAvailable): case .fulfilled(nil), .rejected(MusicBrainzError.noArtworkAvailable):