LiuMangMang/MyTool
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: reject metadata-only lyrics and refresh stale sidecars

Browse Source
This commit is contained in:
LiuMangMang
2026-07-22 00:06:55 +08:00
parent dcc1917580
commit b0d1b1766d
6 changed files with 93 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/main/java/com/music/service/IngestService.java
+4 -1
View File
@@ -964,7 +964,10 @@ public class IngestService {
String safeTitle, String originalTitle, String artist) {
try {
String lyrics = tag.getFirst(FieldKey.LYRICS);
if (lyrics == null || lyrics.trim().isEmpty()) return false;
if (!LyricsService.hasMeaningfulLyrics(lyrics)) {
log.debug("忽略无正文的嵌入式歌词: {}", safeTitle);
return false;
}
// 构建简易 LRC 内容（无时间戳，仅作为歌词文本）
StringBuilder lrcContent = new StringBuilder();
backend/src/main/java/com/music/service/LibraryHealthService.java
+6 -3
View File
@@ -125,7 +125,9 @@ public class LibraryHealthService {
String name = f.getFileName().toString();
if (name.toLowerCase(Locale.ROOT).endsWith(".lrc")) {
String base = baseName(name).toLowerCase(Locale.ROOT);
lrcBaseNames.add(base);
if (LyricsService.hasMeaningfulLyrics(f)) {
lrcBaseNames.add(base);
}
if (!audioBaseNames.contains(base)) {
report.setOrphanSidecars(report.getOrphanSidecars() + 1);
addExample(report.getExamplesOrphanSidecars(), rel(libraryPath, f));
@@ -404,7 +406,7 @@ public class LibraryHealthService {
// ========== 工具 ==========
/** 大小写不敏感判定音频是否有同名 .lrc 侧车（.lrc/.LRC 等）。 */
/** 大小写不敏感判定音频是否有同名且包含正文的 .lrc 侧车。 */
private boolean hasLrcSidecar(Path audio) {
Path dir = audio.getParent();
if (dir == null) return false;
@@ -412,7 +414,8 @@ public class LibraryHealthService {
try (DirectoryStream<Path> ds = Files.newDirectoryStream(dir)) {
for (Path f : ds) {
if (Files.isRegularFile(f)
&& f.getFileName().toString().toLowerCase(Locale.ROOT).equals(target)) {
&& f.getFileName().toString().toLowerCase(Locale.ROOT).equals(target)
&& LyricsService.hasMeaningfulLyrics(f)) {
return true;
}
}
backend/src/main/java/com/music/service/LyricsService.java
+36 -2
View File
@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
@@ -19,6 +20,8 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** Optional lyric lookup. All failures are intentionally non-fatal to ingest. */
@Service
@@ -26,6 +29,8 @@ public class LyricsService {
private static final Logger log = LoggerFactory.getLogger(LyricsService.class);
private static final ObjectMapper MAPPER = new ObjectMapper();
private static final int MAX_BYTES = 256 * 1024;
private static final Pattern TIMED_LINE = Pattern.compile("^\\s*\\[(?:\\d{1,2}:)?\\d{1,2}:\\d{2}(?:\\.\\d+)?\\]\\s*(.*)$");
private static final Pattern META_LINE = Pattern.compile("^(?:作词|作曲|词曲|编曲|制作人?|混音(?:师|助理)?|录音(?:师)?|工程师|弦乐|鼓和钢琴|电贝斯|额外编程|数字编辑|原唱|演唱|出品|发行|版权|produced|written|composer|arranged|lyrics?|music|artist|title)\\s*[:：\\-].*$", Pattern.CASE_INSENSITIVE);
/**
* 远程歌词解析结果（供入库报告统计使用）。
@@ -53,7 +58,7 @@ public class LyricsService {
public RemoteOutcome resolveRemote(Path targetFile, String title, String artist) {
if (targetFile == null || title == null || artist == null) return RemoteOutcome.MISSING;
Path lrc = targetFile.resolveSibling(baseName(targetFile.getFileName().toString()) + ".lrc");
if (Files.isRegularFile(lrc)) return RemoteOutcome.EXISTS;
if (Files.isRegularFile(lrc) && hasMeaningfulLyrics(lrc)) return RemoteOutcome.EXISTS;
if (!enabled()) return RemoteOutcome.DISABLED;
try {
Candidate c = lookup(title, artist);
@@ -87,7 +92,7 @@ public class LyricsService {
List<Candidate> candidates = new ArrayList<>();
if (root != null && root.isArray()) for (JsonNode n : root) {
String lyrics = text(n, "lyrics");
if (lyrics.trim().isEmpty()) continue;
if (!hasMeaningfulLyrics(lyrics)) continue;
String ct = text(n, "title"), ca = text(n, "artist");
int score = score(title, artist, ct, ca, lyrics, text(n, "type"), n.path("isComplete").asBoolean(false));
candidates.add(new Candidate(lyrics, text(n, "source"), score));
@@ -104,6 +109,35 @@ public class LyricsService {
}
private static String norm(String s) { return s == null ? "" : s.toLowerCase(Locale.ROOT).replaceAll("[（(](网易云音乐|酷狗音乐)[）)]", "").replaceAll("[^\\p{L}\\p{N}]", ""); }
private static String text(JsonNode n, String k) { return n.path(k).asText(""); }
static boolean hasMeaningfulLyrics(Path file) {
if (file == null || !Files.isRegularFile(file)) return false;
try {
return hasMeaningfulLyrics(new String(Files.readAllBytes(file), StandardCharsets.UTF_8));
} catch (IOException e) {
return false;
}
}
/**
* Reject metadata-only placeholders such as title/artist lines while accepting
* both timestamped LRC and plain embedded lyric text.
*/
static boolean hasMeaningfulLyrics(String lyrics) {
if (lyrics == null) return false;
String normalized = lyrics.replace("\uFEFF", "").replace("\r", "");
int lines = 0;
int chars = 0;
for (String raw : normalized.split("\\n")) {
String line = raw.trim();
if (line.isEmpty() || line.matches("^\\[(?:ti|ar|al|by|re|ve|offset):.*$")) continue;
Matcher timed = TIMED_LINE.matcher(line);
String body = timed.matches() ? timed.group(1).trim() : line;
if (body.isEmpty() || META_LINE.matcher(body).matches()) continue;
lines++;
chars += body.replaceAll("\\s+", "").length();
}
return lines >= 2 && chars >= 8;
}
private static byte[] readLimited(InputStream in) throws Exception { try (InputStream x = in; ByteArrayOutputStream b = new ByteArrayOutputStream()) { byte[] buf = new byte[8192]; int n, total = 0; while ((n = x.read(buf)) >= 0) { total += n; if (total > MAX_BYTES) throw new IllegalArgumentException("歌词响应过大"); b.write(buf, 0, n); } return b.toByteArray(); } }
private static String value(String env, String prop, String def) { String v = System.getenv(env); if (v == null || v.isEmpty()) v = System.getProperty(prop); return v == null || v.isEmpty() ? def : v; }
private static String baseName(String n) { int i = n.lastIndexOf('.'); return i > 0 ? n.substring(0, i) : n; }
backend/src/test/java/com/music/service/LibraryHealthServiceTest.java
+2 -2
View File
@@ -30,7 +30,7 @@ class LibraryHealthServiceTest {
Path album = root.resolve("Artist").resolve("Album");
Files.createDirectories(album);
Files.write(album.resolve("01 - Song.mp3"), new byte[]{1, 2, 3});
Files.write(album.resolve("01 - Song.lrc"), "[00:01]hi".getBytes(StandardCharsets.UTF_8));
Files.write(album.resolve("01 - Song.lrc"), "[00:01]first line\n[00:02]second line".getBytes(StandardCharsets.UTF_8));
Files.write(album.resolve("orphan.lrc"), "[00:01]orphan".getBytes(StandardCharsets.UTF_8));
Files.write(album.resolve("cover.jpg"), new byte[]{(byte) 0xFF, (byte) 0xD8, (byte) 0xFF});
return album;
@@ -244,7 +244,7 @@ class LibraryHealthServiceTest {
Files.createDirectories(album);
// 大写 .LRC 侧车：既不应算缺歌词，也不应算孤立（与 orphan 判定保持一致）
Files.write(album.resolve("01 - Song.mp3"), new byte[]{1, 2, 3});
Files.write(album.resolve("01 - Song.LRC"), "[00:01]hi".getBytes(StandardCharsets.UTF_8));
Files.write(album.resolve("01 - Song.LRC"), "[00:01]first line\n[00:02]second line".getBytes(StandardCharsets.UTF_8));
LibraryHealthService svc = newService(root);
LibraryHealthReport report = svc.scan(false);
backend/src/test/java/com/music/service/LyricsServiceTest.java
+13 -2
View File
@@ -22,8 +22,8 @@ class LyricsServiceTest {
@Test
void selectsExactArtistInsteadOfFirstCoverCandidate() throws Exception {
String json = "["
+ "{\"title\":\"夜曲 (网易云音乐)\",\"artist\":\"Xai小爱\",\"lyrics\":\"[00:01]翻唱\",\"type\":\"lrc\",\"source\":\"netease\"},"
+ "{\"title\":\"夜曲 (酷狗音乐)\",\"artist\":\"周杰伦\",\"lyrics\":\"[00:01]一群嗜血的蚂蚁\",\"type\":\"lrc\",\"source\":\"kugou\",\"isComplete\":true}]";
+ "{\"title\":\"夜曲 (网易云音乐)\",\"artist\":\"Xai小爱\",\"lyrics\":\"[00:01]翻唱第一句\\n[00:02]翻唱第二句\",\"type\":\"lrc\",\"source\":\"netease\"},"
+ "{\"title\":\"夜曲 (酷狗音乐)\",\"artist\":\"周杰伦\",\"lyrics\":\"[00:01]一群嗜血的蚂蚁\\n[00:02]被腐肉所吸引\",\"type\":\"lrc\",\"source\":\"kugou\",\"isComplete\":true}]";
start(json, 200);
LyricsService.Candidate result = new LyricsService().lookup("夜曲", "周杰伦");
assertNotNull(result);
@@ -37,6 +37,17 @@ class LyricsServiceTest {
assertNull(new LyricsService().lookup("夜曲", "周杰伦"));
}
@Test
void rejectsMetadataOnlyLyrics() {
assertFalse(LyricsService.hasMeaningfulLyrics("[00:00.00]特别的人\n[00:00.00]方大同\n"));
assertFalse(LyricsService.hasMeaningfulLyrics("[ti:特别的人]\n[ar:方大同]\n"));
}
@Test
void acceptsTimestampedLyrics() {
assertTrue(LyricsService.hasMeaningfulLyrics("[00:01.00]第一句歌词\n[00:03.00]第二句歌词\n"));
}
private void start(String body, int status) throws Exception {
server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0);
server.createContext("/lrc", exchange -> {