Skip to content

Enhancement: Support getting LRC lyrics from a "Lyrics" subfolder #799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enhancement: Support getting LRC lyrics from a "Lyrics" subfolder #799

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions src/app/services/lyrics/lrc-lyrics-getter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,19 @@ export class LrcLyricsGetter implements ILyricsGetter {
}

private getLrcFilePath(track: TrackModel): string {
const trackPathWithoutExtension: string = this.fileAccess.getPathWithoutExtension(track.path);
let possibleLrcFilePath: string = `${trackPathWithoutExtension}.lrc`;
const trackPath: string = this.fileAccess.getDirectoryPath(track.path);
const trackFileNameWithoutExtension: string = this.fileAccess.getFileNameWithoutExtension(track.path);
const lrcExtensions: string[] = ['.lrc', '.Lrc', '.LRC']
const possibleFolders: string[] = [`${trackPath}`, `${trackPath}\\lyrics`, `${trackPath}\\Lyrics`, `${trackPath}\\LYRICS`]

if (this.fileAccess.pathExists(possibleLrcFilePath)) {
return possibleLrcFilePath;
}

possibleLrcFilePath = `${trackPathWithoutExtension}.Lrc`;

if (this.fileAccess.pathExists(possibleLrcFilePath)) {
return possibleLrcFilePath;
}
for (var folder of possibleFolders) {
for (var ext of lrcExtensions) {
let possibleLrcFilePath: string = `${folder}\\${trackFileNameWithoutExtension}${ext}`;

possibleLrcFilePath = `${trackPathWithoutExtension}.LRC`;

if (this.fileAccess.pathExists(possibleLrcFilePath)) {
return possibleLrcFilePath;
if (this.fileAccess.pathExists(possibleLrcFilePath)) {
return possibleLrcFilePath;
}
}
}

return '';
Expand Down