indonesian audio track fix

yuliskov · Dec 30, 2024 · 075bae6 · 075bae6
1 parent 413d0b1
commit 075bae6
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 9 deletions.
diff --git a/MediaServiceCore b/MediaServiceCore
diff --git a/...2/common/app/presenters/dialogs/menu/providers/channelgroup/ChannelGroupMenuProvider.java b/...2/common/app/presenters/dialogs/menu/providers/channelgroup/ChannelGroupMenuProvider.java
@@ -83,7 +83,8 @@ private void showGroupDialog(Video item, VideoMenuCallback callback) {
         List<ChannelGroup> groups = mService.getChannelGroups();
 
         List<OptionItem> options = new ArrayList<>();
-
+
+        // Create new group or enter url
         String editDialogTitle = mContext.getString(R.string.new_subscriptions_group);
         options.add(UiOptionItem.from(editDialogTitle, optionItem -> {
             dialogPresenter.closeDialog();
@@ -111,8 +112,9 @@ private void showGroupDialog(Video item, VideoMenuCallback callback) {
                         return true;
                     });
         }, false));
-
-        String filePickerTitle = mContext.getString(R.string.import_subscriptions_group) + " (GrayJay/PocketTube)";
+
+        // Import from the file
+        String filePickerTitle = mContext.getString(R.string.import_subscriptions_group) + " (GrayJay/PocketTube/NewPipe)";
         options.add(UiOptionItem.from(filePickerTitle, optionItem -> {
             dialogPresenter.closeDialog();
 

diff --git a/...n/java/com/liskovsoft/smartyoutubetv2/common/exoplayer/selector/TrackSelectorManager.java b/...n/java/com/liskovsoft/smartyoutubetv2/common/exoplayer/selector/TrackSelectorManager.java
@@ -622,7 +622,7 @@ private MediaTrack[][] filterByLanguage(MediaTrack[][] trackGroupList, MediaTrac
             return trackGroupList;
         }
 
-        String audioLanguage = PlayerData.instance(mContext).getAudioLanguage();
+        String audioLanguage = fixLangCode(PlayerData.instance(mContext).getAudioLanguage());
 
         String resultLanguage = null;
         String originLanguage = null;
@@ -840,4 +840,17 @@ private boolean isErrorInAudio(MediaTrack mediaTrack) {
     private boolean isUnsafeFormat(MediaTrack mediaTrack) {
         return mediaTrack.isMP4ACodec() && mediaTrack.format.bitrate >= 195_000;
     }
+
+    private String fixLangCode(String langCode) {
+        if (langCode == null) {
+            return null;
+        }
+
+        switch (langCode) {
+            case "in": // Wrong Indonesian
+                return "id"; // Correct Indonesian
+            default:
+                return langCode;
+        }
+    }
 }
diff --git a/common/src/main/res/values-ru/strings.xml b/common/src/main/res/values-ru/strings.xml
@@ -680,5 +680,5 @@
     <string name="screen_dimming_amount">Степень затемнения экрана</string>
     <string name="screen_dimming_timeout">Тайм-аут затемнения экрана</string>
     <string name="playlists_rows">Отображать раздел Плейлисты в виде строк</string>
-    <string name="import_subscriptions_group">Импортировать файл</string>
+    <string name="import_subscriptions_group">Импортировать</string>
 </resources>
diff --git a/common/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml
@@ -689,5 +689,5 @@
     <string name="screen_dimming_amount">Ekran karartma miktarı</string>
     <string name="screen_dimming_timeout">Ekran karartma zaman aşımı</string>
     <string name="playlists_rows">Oynatma listelerini satır olarak göster</string>
-    <string name="import_subscriptions_group">Dosyayı içe aktar</string>
+    <string name="import_subscriptions_group">Içe aktar</string>
 </resources>
diff --git a/common/src/main/res/values-uk/strings.xml b/common/src/main/res/values-uk/strings.xml
@@ -680,5 +680,5 @@
     <string name="screen_dimming_amount">Величина затемнення екрана</string>
     <string name="screen_dimming_timeout">Тайм-аут затемнення екрана</string>
     <string name="playlists_rows">Відображати розділ Плейлисти у вигляді рядків</string>
-    <string name="import_subscriptions_group">Імпорт файлу</string>
+    <string name="import_subscriptions_group">Імпорт</string>
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
@@ -687,7 +687,7 @@
     <string name="screen_dimming_amount">Screen dimming amount</string>
     <string name="screen_dimming_timeout">Screen dimming timeout</string>
     <string name="playlists_rows">Show Playlists section as rows</string>
-    <string name="import_subscriptions_group">Import file</string>
+    <string name="import_subscriptions_group">Import</string>
     <string name="lb_playback_controls_closed_captioning_disable">Disable Closed Captioning</string>
     <string name="lb_playback_controls_closed_captioning_enable">Enable Closed Captioning</string>
 </resources>
+2 −1		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/channelgroups/ChannelGroupServiceImpl.kt
+54 −0		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/channelgroups/importing/newpipe/NewPipeService.kt
+11 −0		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/channelgroups/importing/newpipe/gen/Items.kt
+1 −1		youtubeapi/src/main/java/com/liskovsoft/youtubeapi/search/SearchService.java
+3 −16		youtubeapi/src/test/java/com/liskovsoft/youtubeapi/channelgroups/importing/grayjay/GrayJayApiTest.kt
+41 −0		youtubeapi/src/test/java/com/liskovsoft/youtubeapi/channelgroups/importing/newpipe/NewPipeApiTest.kt
+3 −15		youtubeapi/src/test/java/com/liskovsoft/youtubeapi/channelgroups/importing/pockettube/PocketTubeApiTest.kt
+1 −0		youtubeapi/src/test/resources/channelgroups/grayjay_subscription_groups
+1 −0		youtubeapi/src/test/resources/channelgroups/newpipe_subscriptions.json
+8 −0		youtubeapi/src/test/resources/channelgroups/pockettube.json