Skip to content

Add support for CR-ended embed lyrics and some Simplified Chinese strings #480

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
qwqVictor wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for CR-ended embed lyrics and some Simplified Chinese strings #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b55f170
fix extracting lyrics with CR newline
qwqVictor Jan 26, 2023
6266b70
add localization strings for Simplified Chinese
qwqVictor Jan 26, 2023
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
17 changes: 13 additions & 4 deletions app/src/main/java/com/naman14/timber/utils/LyricsExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,29 @@ public class LyricsExtractor {
public static String getLyrics(File file){
String filename = file.getName();
String fileending = filename.substring(filename.lastIndexOf('.')+1,filename.length()).toLowerCase();
String lyric = null;
try{
switch(fileending){
case "mp3":
return getLyricsID3(file);
lyric = getLyricsID3(file);
break;
case "mp4":
case "m4a":
case "aac":
return getLyricsMP4(file);
lyric = getLyricsMP4(file);
break;
case "ogg":
case "oga":
return getLyricsVorbis(file);
lyric = getLyricsVorbis(file);
break;
}
}catch(Exception e){}
return null;
/* iTunes and some music manager use CR as newline, we replace CRLF and CR to LF to ensure it
* be correctly displayed */
if (lyric != null) {
lyric = lyric.replace("\r\n", "\n").replace("\r", "\n");
}
return lyric;
}

private static int readOgg(byte[] buf, InputStream in, int bytesinpage, int skip) throws IOException {
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values-zh/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,10 @@

<string name="cancel">取消</string>

<string name="menu_show_lyrics">显示歌词</string>
<string name="no_lyrics">找不到歌词</string>
<string name="lyrics_makeitpersonal">歌词由 <a href="https://makeitpersonal.co/">makeitpersonal.co</a>提供</string>
<string name="cast">Cast</string>
<string name="now_playing_no_track_selected">\"没有选中的播放中曲目</string>
<string name="lyrics_loading">加载中...</string>
</resources>