fix: add title query pattern only

NezuChan · Jun 26, 2024 · 9f6c7f6 · 9f6c7f6
1 parent 6af620a
commit 9f6c7f6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/main/src/main/java/com/github/topi314/lavasrc/mirror/DefaultMirroringAudioTrackResolver.java b/main/src/main/java/com/github/topi314/lavasrc/mirror/DefaultMirroringAudioTrackResolver.java
@@ -45,7 +45,11 @@ public AudioItem apply(MirroringAudioTrack mirroringAudioTrack) {
 				}
 			}
 
-			provider = provider.replace(MirroringAudioSourceManager.QUERY_PATTERN, getTrackTitle(mirroringAudioTrack));
+			if (provider.contains(MirroringAudioSourceManager.QUERY_TITLE_PATTERN)) {
+				provider = provider.replace(MirroringAudioSourceManager.QUERY_TITLE_PATTERN, getTitle(mirroringAudioTrack));
+			}
+
+			provider = provider.replace(MirroringAudioSourceManager.QUERY_PATTERN, getQuery(mirroringAudioTrack));
 			try {
 				track = mirroringAudioTrack.loadItem(provider);
 			}
@@ -60,12 +64,17 @@ public AudioItem apply(MirroringAudioTrack mirroringAudioTrack) {
 		return track;
 	}
 
-	public String getTrackTitle(MirroringAudioTrack mirroringAudioTrack) {
+	public String getQuery(MirroringAudioTrack mirroringAudioTrack) {
 		var query = mirroringAudioTrack.getInfo().title;
 		if (!mirroringAudioTrack.getInfo().author.equals("unknown")) {
 			query += " " + mirroringAudioTrack.getInfo().author;
 		}
 		return query;
 	}
 
+	public String getTitle(MirroringAudioTrack mirroringAudioTrack) {
+		var query = mirroringAudioTrack.getInfo().title;
+		return query;
+	}
+
 }
diff --git a/main/src/main/java/com/github/topi314/lavasrc/mirror/MirroringAudioSourceManager.java b/main/src/main/java/com/github/topi314/lavasrc/mirror/MirroringAudioSourceManager.java
@@ -19,6 +19,8 @@ public abstract class MirroringAudioSourceManager extends ExtendedAudioSourceMan
 
 	public static final String ISRC_PATTERN = "%ISRC%";
 	public static final String QUERY_PATTERN = "%QUERY%";
+	public static final String QUERY_TITLE_PATTERN = "%QUERY_TITLE%";
+
 	private static final Logger log = LoggerFactory.getLogger(MirroringAudioSourceManager.class);
 	protected final Function<Void, AudioPlayerManager> audioPlayerManager;
 	protected final MirroringAudioTrackResolver resolver;