Fix YouTube English not working, fix newlines not parsing

arianneorpilla · Jan 16, 2023 · 272ee90 · 272ee90
1 parent 449ff18
commit 272ee90
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/yuuna/lib/src/language/implementations/english_language.dart b/yuuna/lib/src/language/implementations/english_language.dart
@@ -87,9 +87,13 @@ Future<List<DictionaryTerm>> prepareSearchResultsEnglishLanguage(
   Map<int, List<DictionaryEntry>> termExactResultsByLength = {};
   Map<int, List<DictionaryEntry>> termDeinflectedResultsByLength = {};
 
-  List<String> words = searchTerm.splitWithDelim(RegExp('[ -]'));
+  List<String> segments = searchTerm.splitWithDelim(RegExp('[ -]'));
+  if (segments.length > 1) {
+    String last = segments.removeLast();
+    segments.addAll(last.split(''));
+  }
 
-  words.forEachIndexed((index, word) {
+  segments.forEachIndexed((index, word) {
     searchBuffer.write(word);
 
     if (word == ' ') {

diff --git a/yuuna/lib/src/language/language.dart b/yuuna/lib/src/language/language.dart
@@ -221,7 +221,7 @@ abstract class Language {
     if (isSpaceDelimited) {
       final workingBuffer = StringBuffer();
       final termBuffer = StringBuffer();
-      List<String> words = textToWords(text);
+      List<String> words = textToWords(text.replaceAll('\n', ' '));
 
       for (String word in words) {
         workingBuffer.write(word);

diff --git a/yuuna/lib/src/media/sources/player_youtube_source.dart b/yuuna/lib/src/media/sources/player_youtube_source.dart
@@ -347,7 +347,7 @@ class PlayerYoutubeSource extends PlayerMediaSource {
       targetLanguageItem = items[targetLanguageIndex];
       items.remove(targetLanguageItem);
     }
-    if (appLanguageIndex != -1) {
+    if (appLanguageIndex != -1 && targetLanguageIndex != appLanguageIndex) {
       appLanguageItem = items[appLanguageIndex];
       items.remove(appLanguageItem);
     }

diff --git a/yuuna/lib/src/models/app_model.dart b/yuuna/lib/src/models/app_model.dart
@@ -1241,6 +1241,8 @@ class AppModel with ChangeNotifier {
       return _dictionarySearchCache[searchTerm]!;
     }
 
+    searchTerm = searchTerm.replaceAll('\n', ' ');
+
     if (searchTerm.trim().isEmpty) {
       return DictionaryResult(
         searchTerm: searchTerm,