Skip to content

Commit

Permalink
fix: lyrics empty screen in some cases
Browse files Browse the repository at this point in the history 
due to plain text recognized as synced
  • Loading branch information
@MSOB7YY
MSOB7YY committed May 14, 2024
1 parent 502bda8 commit f59f23f
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 34 deletions.
76 changes: 45 additions & 31 deletions lib/controller/lyrics_controller.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,15 @@ class Lyrics {
/// 4. database.
final lrcLyrics = await _fetchLRCBasedLyrics(track, embedded, _lyricsSource);

if (lrcLyrics != null) {
if (lrcLyrics.$1 != null) {
if (_currentTrack == track) {
currentLyricsLRC.value = lrcLyrics;
_updateWidgets(lrcLyrics);
currentLyricsLRC.value = lrcLyrics.$1;
_updateWidgets(lrcLyrics.$1);
}
} else if (lrcLyrics.$2 != null) {
if (_currentTrack == track) {
currentLyricsText.value = lrcLyrics.$2 ?? '';
_updateWidgets(null);
}
} else {
/// 1. cached txt lyrics
Expand All @@ -105,11 +110,11 @@ class Lyrics {
}

bool hasLyrics(Track tr) {
return tr.lyrics != '' || lyricsFileCache(tr).existsSync() || lyricsFilesDevice(tr).any((element) => element.existsSync()) || lyricsFileText(tr).existsSync();
return tr.lyrics != '' || lyricsFileCacheLRC(tr).existsSync() || lyricsFilesDevice(tr).any((element) => element.existsSync()) || lyricsFileCacheText(tr).existsSync();
}

File lyricsFileText(Track tr) => File(p.join(AppDirs.LYRICS, "${tr.filename}.txt"));
File lyricsFileCache(Track tr) => File(p.join(AppDirs.LYRICS, "${tr.filename}.lrc"));
File lyricsFileCacheText(Track tr) => File(p.join(AppDirs.LYRICS, "${tr.filename}.txt"));
File lyricsFileCacheLRC(Track tr) => File(p.join(AppDirs.LYRICS, "${tr.filename}.lrc"));
List<File> lyricsFilesDevice(Track tr) {
final dirPath = tr.path.getDirectoryPath;
return [
Expand All @@ -121,7 +126,7 @@ class Lyrics {
}

Future<void> saveLyricsToCache(Track track, String lyricsText, bool isSynced) async {
final fc = isSynced ? lyricsFileCache(track) : lyricsFileText(track);
final fc = isSynced ? lyricsFileCacheLRC(track) : lyricsFileCacheText(track);
await fc.create();
await fc.writeAsString(lyricsText);
}
Expand All @@ -148,9 +153,7 @@ class Lyrics {
);
}

Future<Lrc?> _fetchLRCBasedLyrics(Track track, String trackLyrics, LyricsSource source) async {
final fc = lyricsFileCache(track);

Future<(Lrc?, String?)> _fetchLRCBasedLyrics(Track track, String trackLyrics, LyricsSource source) async {
Future<Lrc?> parseLRCFile(File file) async {
final content = await file.readAsString();
return content.parseLRC();
Expand All @@ -170,8 +173,9 @@ class Lyrics {
}
}
if (lrc == null) {
if (await fc.existsAndValid()) {
lrc = await parseLRCFile(fc);
final syncedInCache = lyricsFileCacheLRC(track);
if (await syncedInCache.existsAndValid()) {
lrc = await parseLRCFile(syncedInCache);
} else if (trackLyrics != '') {
lrc = trackLyrics.parseLRC();
}
Expand All @@ -182,15 +186,25 @@ class Lyrics {
if (source != LyricsSource.local && lrc == null) {
final trackExt = track.toTrackExt();
final lyrics = await searchLRCLyricsFromInternet(trackExt: trackExt);
final text = lyrics.firstOrNull?.lyrics;
if (text != null) await fc.writeAsString(text);
return text?.parseLRC();
final lyricsModelToUse = lyrics.firstOrNull;
if (lyricsModelToUse != null && lyricsModelToUse.lyrics.isNotEmpty == true) {
final parsedLrc = lyricsModelToUse.synced ? lyricsModelToUse.lyrics.parseLRC() : null;
if (parsedLrc != null) {
final syncedInCache = lyricsFileCacheLRC(track);
await syncedInCache.writeAsString(lyricsModelToUse.lyrics);
return (parsedLrc, null);
} else {
final plainInCache = lyricsFileCacheText(track);
await plainInCache.writeAsString(lyricsModelToUse.lyrics);
return (null, lyricsModelToUse.lyrics);
}
}
}
return lrc;
return (lrc, null);
}

Future<String> _fetchTextBasedLyrics(Track track, String trackLyrics, LyricsSource source) async {
final lyricsFile = lyricsFileText(track);
final lyricsFile = lyricsFileCacheText(track);

/// get from storage
if (source != LyricsSource.internet && await lyricsFile.existsAndValid()) {
Expand All @@ -215,7 +229,7 @@ class Lyrics {
Future<String> _fetchLyricsGoogle({String title = '', String artist = ''}) async {
if (title == '' && artist == '') return '';

final possibleQueries = [
final possibleQueries = <String>[
'$title by $artist lyrics',
'${title.split("-").first} by $artist lyrics',
'$title by $artist song lyrics',
Expand All @@ -224,30 +238,30 @@ class Lyrics {
return await _fetchLyricsGoogleIsolate.thready(possibleQueries);
}

Future<String> _fetchLyricsGoogleIsolate(List<String> searches) async {
Future<String> _fetchLyricsGoogleIsolate(List searches) async {
const url = "https://www.google.com/search?client=safari&rls=en&ie=UTF-8&oe=UTF-8&q=";
const delimiter1 = '</div></div></div></div><div class="hwc"><div class="BNeawe tAd8D AP7Wnd"><div><div class="BNeawe tAd8D AP7Wnd">';
const delimiter2 = '</div></div></div></div></div><div><span class="hwc"><div class="BNeawe uEec3 AP7Wnd">';

Future<String> requestQuery(String searchText) async {
http.Response? res;
try {
res = await http.get(Uri.parse(Uri.encodeFull("$url$searchText"))).timeout(const Duration(seconds: 10));
} catch (_) {}
if (res == null) return '';
final body = res.body;
final lyricsRes = body.substring(body.indexOf(delimiter1) + delimiter1.length, body.lastIndexOf(delimiter2));
if (lyricsRes.contains('<meta charset="UTF-8">')) return '';
if (lyricsRes.contains('please enable javascript on your web browser')) return '';
if (lyricsRes.contains('Error 500 (Server Error)')) return '';
if (lyricsRes.contains('systems have detected unusual traffic from your computer network')) return '';
return lyricsRes;
final res = await http.get(Uri.parse(Uri.encodeFull("$url$searchText"))).timeout(const Duration(seconds: 10));
final body = res.body;
final lyricsRes = body.substring(body.indexOf(delimiter1) + delimiter1.length, body.lastIndexOf(delimiter2));
if (lyricsRes.contains('<meta charset="UTF-8">')) return '';
if (lyricsRes.contains('please enable javascript on your web browser')) return '';
if (lyricsRes.contains('Error 500 (Server Error)')) return '';
if (lyricsRes.contains('systems have detected unusual traffic from your computer network')) return '';
return lyricsRes;
} catch (_) {
return '';
}
}

String lyrics = '';

for (final q in searches) {
lyrics = await requestQuery(q);
lyrics = await requestQuery(q as String);
if (lyrics != '') break;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/ui/dialogs/set_lrc_dialog.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ void showLRCSetDialog(Track trackPre, Color colorScheme) async {
final fetchedLyrics = <LyricsModel>[].obs;

final embedded = track.lyrics;
final cachedTxt = Lyrics.inst.lyricsFileText(trackPre);
final cachedLRC = Lyrics.inst.lyricsFileCache(trackPre);
final cachedTxt = Lyrics.inst.lyricsFileCacheText(trackPre);
final cachedLRC = Lyrics.inst.lyricsFileCacheLRC(trackPre);
final localLRCFiles = Lyrics.inst.lyricsFilesDevice(trackPre);

if (embedded != '') {
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: namida
description: A Beautiful and Feature-rich Music Player, With YouTube & Video Support Built in Flutter
publish_to: "none"
version: 2.4.1-beta+240514137
version: 2.4.2-beta+240514137

environment:
sdk: ">=3.1.4 <4.0.0"
Expand Down

0 comments on commit f59f23f

Please sign in to comment.