Skip to content

Liquid Glass and Apple Music touches for the Spotify iOS app. A GPL-3.0 fork of spoti.pw 0.21.1.

C

fix: Genius is not asked once another source has lyrics

My-Name-Is-Jeffef2da042dc23
diff --git a/tweak/Sources/Shared/LyricsSources/LyricsSources.h b/tweak/Sources/Shared/LyricsSources/LyricsSources.h
index 44cd4b21..33104252 100644
--- a/tweak/Sources/Shared/LyricsSources/LyricsSources.h
+++ b/tweak/Sources/Shared/LyricsSources/LyricsSources.h
@@ -71,6 +71,8 @@ typedef void (^SGLyricsAsk)(SGLyricsQuery *query, void (^done)(SGLyricsResult *r
// Searches by title and artist, so it has nothing to ask with until someone has named the track.
// Musixmatch matches by Spotify's id and can go without.
@property (nonatomic) BOOL needsName;
+// Has only untimed lines, which never replace lines already found, so it is asked only while there are none.
+@property (nonatomic) BOOL untimed;
@property (nonatomic, copy) SGLyricsAsk ask;
@end
diff --git a/tweak/Sources/Shared/LyricsSources/LyricsSources.m b/tweak/Sources/Shared/LyricsSources/LyricsSources.m
index ab5b8ff9..887d3bb1 100644
--- a/tweak/Sources/Shared/LyricsSources/LyricsSources.m
+++ b/tweak/Sources/Shared/LyricsSources/LyricsSources.m
@@ -169,6 +169,7 @@ NSArray<SGLyricsProvider *> *SGLyricsAllProviders(void) {
// A source that matches by Spotify's own track id has everything it needs from the
// start; the rest wait for the player to name the track before they can search.
provider.needsName = ![key isEqualToString:@"musixmatch"] && ![key isEqualToString:SGSpicyLyricsKey];
+ provider.untimed = [key isEqualToString:@"genius"];
provider.ask = ask;
return provider;
};
@@ -444,6 +445,10 @@ static void step(SGLyricsWalk *walk) {
return;
}
SGLyricsProvider *provider = SGLyricsProviderFor(walk.order[walk.index++]);
+ if (provider.untimed && (merged.karaokeLines.count || merged.texts.count)) {
+ step(walk);
+ return;
+ }
if (provider.needsName && !named(query)) {
[walk.passedOver addObject:provider.key];
step(walk);