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:dafe7009f2f40df7bbc873d73667c65d54a14de2
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:9fef5a0fa25505b24383f526b0c4c64013ded725
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. "dafe7009f2f40df7bbc873d73667c65d54a14de2" and "9fef5a0fa25505b24383f526b0c4c64013ded725" have entirely different histories.
dafe7009f2 ... 9fef5a0fa2

5 changed files with 6 additions and 96 deletions
Show Stats Expand all files Collapse all files

2
Mac/Components/Queue/QueueViewController.swift
View File

@ -44,9 +44,7 @@ class QueueViewController: NSViewController {
case NSEvent.keyCodeBS: case NSEvent.keyCodeBS:
let queuePos = queueView.selectedRow let queuePos = queueView.selectedRow
if queuePos >= 0 {
App.mpdClient.removeSong(at: queuePos) App.mpdClient.removeSong(at: queuePos)
}
default: default:
nextResponder?.keyDown(with: event) nextResponder?.keyDown(with: event)
} }

8
Persephone.xcodeproj/project.pbxproj
View File

@ -1433,7 +1433,7 @@
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastSwiftUpdateCheck = 1130; LastSwiftUpdateCheck = 1130;
LastUpgradeCheck = 1200; LastUpgradeCheck = 0940;
ORGANIZATIONNAME = "Dan Barber"; ORGANIZATIONNAME = "Dan Barber";
TargetAttributes = { TargetAttributes = {
E40786172110CE6E006887B1 = { E40786172110CE6E006887B1 = {
@ -1961,7 +1961,6 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES;
@ -2023,7 +2022,6 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES;
@ -2073,7 +2071,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Shared/libmpdclient/output", "$(PROJECT_DIR)/Shared/libmpdclient/output",
); );
MARKETING_VERSION = "0.17.3-alpha"; MARKETING_VERSION = "0.17.2-alpha";
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 = "";
@ -2106,7 +2104,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Shared/libmpdclient/output", "$(PROJECT_DIR)/Shared/libmpdclient/output",
); );
MARKETING_VERSION = "0.17.3-alpha"; MARKETING_VERSION = "0.17.2-alpha";
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 = "";

2
Persephone.xcodeproj/xcshareddata/xcschemes/Persephone.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1200" LastUpgradeVersion = "1010"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

84
Persephone.xcodeproj/xcuserdata/danbarber.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@ -4,48 +4,6 @@
<dict> <dict>
<key>SchemeUserState</key> <key>SchemeUserState</key>
<dict> <dict>
<key>CryptoSwift (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>CryptoSwift (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>CryptoSwift (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>Graph (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>12</integer>
</dict>
<key>Graph (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>13</integer>
</dict>
<key>Graph (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>8</integer>
</dict>
<key>Persephone-iOS.xcscheme_^#shared#^_</key> <key>Persephone-iOS.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
@ -61,48 +19,6 @@
<key>orderHint</key> <key>orderHint</key>
<integer>0</integer> <integer>0</integer>
</dict> </dict>
<key>Playground (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>10</integer>
</dict>
<key>Playground (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>11</integer>
</dict>
<key>Playground (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>9</integer>
</dict>
<key>PromiseKit (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>6</integer>
</dict>
<key>PromiseKit (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>7</integer>
</dict>
<key>PromiseKit (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>libmpdclient.xcscheme_^#shared#^_</key> <key>libmpdclient.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>

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

@ -59,11 +59,9 @@ extension MPDClient {
mpd_search_db_songs(self.connection, false) mpd_search_db_songs(self.connection, false)
if filter != "" { if filter != "" {
let escapedFilter = filter.replacingOccurrences(of: "'", with: "\\'")
mpd_search_add_expression( mpd_search_add_expression(
self.connection, self.connection,
"(any contains '\(escapedFilter)')" "(any contains '\(filter)')"
) )
} }
mpd_search_add_tag_constraint(self.connection, MPD_OPERATOR_DEFAULT, MPD_TAG_TRACK, "1") mpd_search_add_tag_constraint(self.connection, MPD_OPERATOR_DEFAULT, MPD_TAG_TRACK, "1")