Skip to content

Commit c774fde

Browse files
ddddxxxddddxxx
committed
Merge branch 'dev'
2 parents 3117c1d + 3b19cef commit c774fde

File tree

12 files changed

+98
-85
lines changed

12 files changed

+98
-85
lines changed

‎LyricsX.xcodeproj/project.pbxproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
BB4141C01E45B67800A51775 /* KaraokeLyricsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB4141BF1E45B67800A51775 /* KaraokeLyricsController.swift */; };
4646
BB4141C81E46CDD700A51775 /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB4141C61E46CDD200A51775 /* SnapKit.framework */; };
4747
BB4141C91E46CDD700A51775 /* SnapKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BB4141C61E46CDD200A51775 /* SnapKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
48-
BB458C63201C5F4500740C3B /* LyricsMetaData+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB458C62201C5F4500740C3B /* LyricsMetaData+Extension.swift */; };
48+
BB458C63201C5F4500740C3B /* LyricsMetadata+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB458C62201C5F4500740C3B /* LyricsMetadata+Extension.swift */; };
4949
BB4919361F00CD800054EA09 /* PreferenceShortcutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB4919351F00CD800054EA09 /* PreferenceShortcutViewController.swift */; };
5050
BB50786422014C3900B695C3 /* KaraokeLyricsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB4141BF1E45B67800A51775 /* KaraokeLyricsController.swift */; };
5151
BB50786522014C3900B695C3 /* Polyfill.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97593E32150F47800D80616 /* Polyfill.swift */; };
@@ -62,7 +62,7 @@
6262
BB50787022014C3900B695C3 /* TouchBarLyricsItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB5863F221EFFD9F0084D2C0 /* TouchBarLyricsItem.swift */; };
6363
BB50787222014C3900B695C3 /* CFExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1B2FFC20E8780A002F1AF8 /* CFExtension.swift */; };
6464
BB50787322014C3900B695C3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB4141AD1E458BA800A51775 /* AppDelegate.swift */; };
65-
BB50787422014C3900B695C3 /* LyricsMetaData+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB458C62201C5F4500740C3B /* LyricsMetaData+Extension.swift */; };
65+
BB50787422014C3900B695C3 /* LyricsMetadata+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB458C62201C5F4500740C3B /* LyricsMetadata+Extension.swift */; };
6666
BB50787622014C3900B695C3 /* PreferenceGeneralViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC7C5541E6AE28600E3EC4F /* PreferenceGeneralViewController.swift */; };
6767
BB50787722014C3900B695C3 /* Then.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBE8FC741F6BEA6200122AFA /* Then.swift */; };
6868
BB50787822014C3900B695C3 /* Updater.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB34F7E51F21911700B7C484 /* Updater.swift */; };
@@ -228,7 +228,7 @@
228228
BB4141B61E458BA900A51775 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
229229
BB4141BF1E45B67800A51775 /* KaraokeLyricsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KaraokeLyricsController.swift; sourceTree = "<group>"; };
230230
BB4141C61E46CDD200A51775 /* SnapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SnapKit.framework; path = Carthage/Build/Mac/SnapKit.framework; sourceTree = "<group>"; };
231-
BB458C62201C5F4500740C3B /* LyricsMetaData+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "LyricsMetaData+Extension.swift"; sourceTree = "<group>"; };
231+
BB458C62201C5F4500740C3B /* LyricsMetadata+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "LyricsMetadata+Extension.swift"; sourceTree = "<group>"; };
232232
BB4919351F00CD800054EA09 /* PreferenceShortcutViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreferenceShortcutViewController.swift; sourceTree = "<group>"; };
233233
BB5078AD22014C3900B695C3 /* LyricsX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LyricsX.app; sourceTree = BUILT_PRODUCTS_DIR; };
234234
BB5863F221EFFD9F0084D2C0 /* TouchBarLyricsItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TouchBarLyricsItem.swift; sourceTree = "<group>"; };
@@ -518,7 +518,7 @@
518518
BB947DFA23B4C60000C43BF2 /* SelectedPlayer.swift */,
519519
BB34F7E51F21911700B7C484 /* Updater.swift */,
520520
BB03C8881FDF6FC000FBE0DA /* ChineseConverter+Singleton.swift */,
521-
BB458C62201C5F4500740C3B /* LyricsMetaData+Extension.swift */,
521+
BB458C62201C5F4500740C3B /* LyricsMetadata+Extension.swift */,
522522
BB89089D21ED69410078F522 /* Lyrics+Language.swift */,
523523
BB5863F221EFFD9F0084D2C0 /* TouchBarLyricsItem.swift */,
524524
BB58640621F2B7500084D2C0 /* TouchBarArtworkViewController.swift */,
@@ -922,7 +922,7 @@
922922
BB5863F321EFFD9F0084D2C0 /* TouchBarLyricsItem.swift in Sources */,
923923
BB1B2FFD20E8780A002F1AF8 /* CFExtension.swift in Sources */,
924924
BB4141AE1E458BA800A51775 /* AppDelegate.swift in Sources */,
925-
BB458C63201C5F4500740C3B /* LyricsMetaData+Extension.swift in Sources */,
925+
BB458C63201C5F4500740C3B /* LyricsMetadata+Extension.swift in Sources */,
926926
BBC7C5551E6AE28600E3EC4F /* PreferenceGeneralViewController.swift in Sources */,
927927
BBE8FC751F6BEA6200122AFA /* Then.swift in Sources */,
928928
BB34F7E61F21911700B7C484 /* Updater.swift in Sources */,
@@ -967,7 +967,7 @@
967967
BB50787022014C3900B695C3 /* TouchBarLyricsItem.swift in Sources */,
968968
BB50787222014C3900B695C3 /* CFExtension.swift in Sources */,
969969
BB50787322014C3900B695C3 /* AppDelegate.swift in Sources */,
970-
BB50787422014C3900B695C3 /* LyricsMetaData+Extension.swift in Sources */,
970+
BB50787422014C3900B695C3 /* LyricsMetadata+Extension.swift in Sources */,
971971
BB50787622014C3900B695C3 /* PreferenceGeneralViewController.swift in Sources */,
972972
BB50787722014C3900B695C3 /* Then.swift in Sources */,
973973
BB50787822014C3900B695C3 /* Updater.swift in Sources */,
@@ -1432,7 +1432,7 @@
14321432
repositoryURL = "https://github.com/cx-org/CombineX";
14331433
requirement = {
14341434
kind = upToNextMinorVersion;
1435-
minimumVersion = 0.3.0;
1435+
minimumVersion = 0.4.0;
14361436
};
14371437
};
14381438
BB22681A234C9085008FAFED /* XCRemoteSwiftPackageReference "SwiftCF" */ = {
@@ -1448,7 +1448,7 @@
14481448
repositoryURL = "https://github.com/cx-org/CXExtensions";
14491449
requirement = {
14501450
kind = upToNextMinorVersion;
1451-
minimumVersion = 0.3.0;
1451+
minimumVersion = 0.4.0;
14521452
};
14531453
};
14541454
BB6C75E6248B908500804AEB /* XCRemoteSwiftPackageReference "TouchBarHelper" */ = {
@@ -1464,7 +1464,7 @@
14641464
repositoryURL = "https://github.com/ddddxxx/MusicPlayer";
14651465
requirement = {
14661466
kind = upToNextMinorVersion;
1467-
minimumVersion = 0.7.3;
1467+
minimumVersion = 0.8.2;
14681468
};
14691469
};
14701470
BBA82EF9256AB1490076831F /* XCRemoteSwiftPackageReference "appcenter-sdk-apple" */ = {
@@ -1488,7 +1488,7 @@
14881488
repositoryURL = "https://github.com/ddddxxx/GenericID";
14891489
requirement = {
14901490
kind = upToNextMinorVersion;
1491-
minimumVersion = 0.6.0;
1491+
minimumVersion = 0.7.0;
14921492
};
14931493
};
14941494
BBB03F2E232FB40400A3879E /* XCRemoteSwiftPackageReference "Semver" */ = {
@@ -1512,7 +1512,7 @@
15121512
repositoryURL = "https://github.com/ddddxxx/LyricsKit";
15131513
requirement = {
15141514
kind = upToNextMinorVersion;
1515-
minimumVersion = 0.10.0;
1515+
minimumVersion = 0.11.0;
15161516
};
15171517
};
15181518
/* End XCRemoteSwiftPackageReference section */

‎LyricsX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 39 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LyricsX/Component/AppController.swift‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,7 @@ class AppController: NSObject {
201201
}
202202

203203
let duration = track.duration ?? 0
204-
let req = LyricsSearchRequest(searchTerm: .info(title: title, artist: artist),
205-
title: title,
206-
artist: artist,
207-
duration: duration,
208-
limit: 5,
209-
timeout: 10)
204+
let req = LyricsSearchRequest(searchTerm: .info(title: title, artist: artist), duration: duration, limit: 5)
210205
searchRequest = req
211206
searchCanceller = lyricsManager.lyricsPublisher(request: req)
212207
.timeout(.seconds(10), scheduler: DispatchQueue.lyricsDisplay.cx)
@@ -223,7 +218,8 @@ class AppController: NSObject {
223218

224219
func lyricsReceived(lyrics: Lyrics) {
225220
guard let req = searchRequest,
226-
lyrics.metadata.request == req else {
221+
lyrics.metadata.request == req,
222+
let track = selectedPlayer.currentTrack else {
227223
return
228224
}
229225
if defaults[.strictSearchEnabled] && !lyrics.isMatched() {
@@ -232,6 +228,7 @@ class AppController: NSObject {
232228
if let current = currentLyrics, current.quality >= lyrics.quality {
233229
return
234230
}
231+
lyrics.associateWithTrack(track)
235232
lyrics.filtrate()
236233
lyrics.recognizeLanguage()
237234
lyrics.metadata.needsPersist = true

LyricsX/Component/LyricsMetaData+Extension.swift renamed to LyricsX/Component/LyricsMetadata+Extension.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// LyricsMetaData+Extension.swift
2+
// LyricsMetadata+Extension.swift
33
// LyricsX - https://github.com/ddddxxx/LyricsX
44
//
55
// This Source Code Form is subject to the terms of the Mozilla Public
@@ -10,28 +10,28 @@
1010
import Foundation
1111
import LyricsCore
1212

13-
extension Lyrics.MetaData.Key {
14-
static var localURL = Lyrics.MetaData.Key("localURL")
15-
static var title = Lyrics.MetaData.Key("title")
16-
static var artist = Lyrics.MetaData.Key("artist")
17-
static var needsPersist = Lyrics.MetaData.Key("needsPersist")
18-
static var language = Lyrics.MetaData.Key("language")
13+
extension Lyrics.Metadata.Key {
14+
static var localURL = Lyrics.Metadata.Key("localURL")
15+
static var title = Lyrics.Metadata.Key("title")
16+
static var artist = Lyrics.Metadata.Key("artist")
17+
static var needsPersist = Lyrics.Metadata.Key("needsPersist")
18+
static var language = Lyrics.Metadata.Key("language")
1919
}
2020

21-
extension Lyrics.MetaData {
21+
extension Lyrics.Metadata {
2222

2323
var localURL: URL? {
2424
get { return data[.localURL] as? URL }
2525
set { data[.localURL] = newValue }
2626
}
2727

2828
var title: String? {
29-
get { return request?.title ?? data[.title] as? String }
29+
get { return data[.title] as? String }
3030
set { data[.title] = newValue }
3131
}
3232

3333
var artist: String? {
34-
get { return request?.artist ?? data[.artist] as? String }
34+
get { return data[.artist] as? String }
3535
set { data[.artist] = newValue }
3636
}
3737

‎LyricsX/Component/TouchBarLyricsItem.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class TouchBarLyricsItem: NSCustomTouchBarItem {
6161
if let timetag = line.attachments.timetag {
6262
let position = selectedPlayer.playbackTime
6363
let timeDelay = line.lyrics?.adjustedTimeDelay ?? 0
64-
let progress = timetag.tags.map { ($0.timeTag + line.position - timeDelay - position, $0.index) }
64+
let progress = timetag.tags.map { ($0.time + line.position - timeDelay - position, $0.index) }
6565
self.lyricsTextField.setProgressAnimation(color: self.progressColor, progress: progress)
6666
}
6767
}

‎LyricsX/Controller/KaraokeLyricsController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class KaraokeLyricsWindowController: NSWindowController {
162162
let timetag = lrc.attachments.timetag {
163163
let position = selectedPlayer.playbackTime
164164
let timeDelay = AppController.shared.currentLyrics?.adjustedTimeDelay ?? 0
165-
let progress = timetag.tags.map { ($0.timeTag + lrc.position - timeDelay - position, $0.index) }
165+
let progress = timetag.tags.map { ($0.time + lrc.position - timeDelay - position, $0.index) }
166166
upperTextField.setProgressAnimation(color: self.lyricsView.progressColor, progress: progress)
167167
if !selectedPlayer.playbackState.isPlaying {
168168
upperTextField.pauseProgressAnimation()

‎LyricsX/Controller/SearchLyricsViewController.swift‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,7 @@ class SearchLyricsViewController: NSViewController, NSTableViewDelegate, NSTable
7979

8080
let track = selectedPlayer.currentTrack
8181
let duration = track?.duration ?? 0
82-
let title = track?.title ?? ""
83-
let artist = track?.artist ?? ""
84-
let req = LyricsSearchRequest(searchTerm: .info(title: searchTitle, artist: searchArtist),
85-
title: title,
86-
artist: artist,
87-
duration: duration,
88-
limit: 8,
89-
timeout: 10)
82+
let req = LyricsSearchRequest(searchTerm: .info(title: searchTitle, artist: searchArtist), duration: duration, limit: 8)
9083
searchRequest = req
9184
searchCanceller = lyricsManager.lyricsPublisher(request: req)
9285
.sink(receiveCompletion: { [unowned self] _ in
@@ -105,16 +98,18 @@ class SearchLyricsViewController: NSViewController, NSTableViewDelegate, NSTable
10598
return
10699
}
107100

108-
if let track = selectedPlayer.currentTrack {
109-
if let index = defaults[.noSearchingTrackIds].firstIndex(of: track.id) {
110-
defaults[.noSearchingTrackIds].remove(at: index)
111-
}
112-
if let index = defaults[.noSearchingAlbumNames].firstIndex(of: track.album ?? "") {
113-
defaults[.noSearchingAlbumNames].remove(at: index)
114-
}
101+
guard let track = selectedPlayer.currentTrack else {
102+
return
103+
}
104+
if let index = defaults[.noSearchingTrackIds].firstIndex(of: track.id) {
105+
defaults[.noSearchingTrackIds].remove(at: index)
106+
}
107+
if let index = defaults[.noSearchingAlbumNames].firstIndex(of: track.album ?? "") {
108+
defaults[.noSearchingAlbumNames].remove(at: index)
115109
}
116110

117111
let lrc = searchResult[index]
112+
lrc.associateWithTrack(track)
118113
AppController.shared.currentLyrics = lrc
119114
if defaults[.writeToiTunesAutomatically] {
120115
AppController.shared.writeToiTunes(overwrite: true)

‎LyricsX/Supporting Files/Info.plist‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
<key>CFBundlePackageType</key>
3333
<string>APPL</string>
3434
<key>CFBundleShortVersionString</key>
35-
<string>1.6.1</string>
35+
<string>1.6.2-beta.1</string>
3636
<key>CFBundleVersion</key>
37-
<string>2344</string>
37+
<string>2347</string>
3838
<key>Fabric</key>
3939
<dict>
4040
<key>APIKey</key>
@@ -58,7 +58,7 @@
5858
<key>LSUIElement</key>
5959
<true/>
6060
<key>LX_BUILD_TIME</key>
61-
<integer>1622460550</integer>
61+
<integer>1625917652</integer>
6262
<key>NSAppTransportSecurity</key>
6363
<dict>
6464
<key>NSExceptionDomains</key>

‎LyricsX/Supporting Files/fa.lproj/Localizable.strings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"Search Lyrics" = "جستجو ترانه";
1212

1313
/* No comment provided by engineer. */
14-
"Touch Bar lyrics is not supported in Mac App Store Version. Please download on GitHub." = "نمایش متن ترانه در تاچ بار در نسخه دانلود از استور پشتیبانی نمی شود. لطفا از نسخه موجود در گیت هاب استفاده کنید.";
14+
"Touch Bar lyrics is not supported in Mac App Store Version. Please download on GitHub." = "نمایش متن ترانه در تاچ بار در نسخه دانلود شده از فروشگاه اپل پشتیبانی نمی شود. لطفا از نسخه موجود در گیتهاب استفاده کنید.";
1515

1616
/* alert title */
1717
"Unable to enable Touch Bar lyrics." = "نمایش متن ترانه در تاچ بار فعال نشد.";

‎LyricsX/Utility/CombineExtension.swift‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@
99

1010
import CXShim
1111

12-
extension Publisher {
13-
14-
func signal() -> Publishers.Map<Self, Void> {
15-
return self.map { _ in Void() }
16-
}
17-
}
18-
1912
extension Publisher where Output == Void {
2013

2114
func prepend() -> Publishers.Concatenate<Publishers.Sequence<[Void], Failure>, Self> {

0 commit comments

Comments
 (0)