Revert "refactor: remove client feature"

This reverts commit cbe5739fa0e7fe3d49eb9cae7a8345cc865a4c8e.
2025-05-17 14:36:07 +08:00 · 2025-05-14 14:01:30 +04:00
parent f40bf5956c
commit eb7a3acd78
22 changed files with 116 additions and 4 deletions
--- a/lib/API/musify.dart
+++ b/lib/API/musify.dart
@ -70,6 +70,23 @@ Map activePlaylist = {
  'list': [],
 };

+final clients = {
+  'tv': YoutubeApiClient.tv,
+  'androidVr': YoutubeApiClient.androidVr,
+  'safari': YoutubeApiClient.safari,
+  'ios': YoutubeApiClient.ios,
+  'android': YoutubeApiClient.android,
+  'androidMusic': YoutubeApiClient.androidMusic,
+  'mediaConnect': YoutubeApiClient.mediaConnect,
+  'web': YoutubeApiClient.mweb,
+};
+
+List<YoutubeApiClient> userChosenClients = [
+  YoutubeApiClient.tv,
+  YoutubeApiClient.androidVr,
+  YoutubeApiClient.safari,
+];
+
 dynamic nextRecommendedSong;

 final currentLikedSongsLength = ValueNotifier<int>(userLikedSongsList.length);
@ -704,7 +721,10 @@ Future<AudioOnlyStreamInfo?> getSongManifest(String? songId) async {
      logger.log('getSongManifest: songId is null or empty', null, null);
      return null;
    }
-    final manifest = await _yt.videos.streams.getManifest(songId);
+    final manifest = await _yt.videos.streams.getManifest(
+      songId,
+      ytClients: userChosenClients,
+    );
    final audioStream = manifest.audioOnly;
    if (audioStream.isEmpty) {
      logger.log('getSongManifest: no audio streams for $songId', null, null);
--- a/lib/localization/app_ar.arb
+++ b/lib/localization/app_ar.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "Clear recently played history?",
  "clearSearchHistory": "امسح سجل البحث",
  "clearSearchHistoryQuestion": "Clear search history?",
+  "client": "Client",
  "confirm": "تأكيد",
  "confirmation": "تأكيد",
  "copyLogs": "نسخ السجلات",
--- a/lib/localization/app_de.arb
+++ b/lib/localization/app_de.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "Wiedergabeverlauf löschen?",
  "clearSearchHistory": "Suchverlauf löschen",
  "clearSearchHistoryQuestion": "Suchverlauf löschen?",
+  "client": "Client",
  "confirm": "Bestätigen",
  "confirmation": "Bestätigung",
  "copyLogs": "Logs kopieren",
--- a/lib/localization/app_el.arb
+++ b/lib/localization/app_el.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "Καθαρισμός πρόσφατου ιστορικού αναπαραγωγής?",
  "clearSearchHistory": "Καθαρισμός ιστορικού αναζήτησης",
  "clearSearchHistoryQuestion": "Καθαρισμός ιστορικού αναζήτησης?",
+  "client": "Client",
  "confirm": "Επιβεβαίωση",
  "confirmation": "Επιβεβαίωση",
  "copyLogs": "Αντιγραφή καταγραφών",
--- a/lib/localization/app_en.arb
+++ b/lib/localization/app_en.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "Are you sure you want to clear recently played history?",
  "clearSearchHistory": "Clear search history",
  "clearSearchHistoryQuestion": "Are you sure you want to clear search history?",
+  "client": "Client",
  "confirm": "Confirm",
  "confirmation": "Confirmation",
  "copyLogs": "Copy logs",
--- a/lib/localization/app_es.arb
+++ b/lib/localization/app_es.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "¿Borrar el historial de reproducción reciente?",
  "clearSearchHistory": "Borrar historial de búsqueda",
  "clearSearchHistoryQuestion": "¿Borrar el historial de búsqueda?",
+  "client": "Client",
  "confirm": "Confirmar",
  "confirmation": "Confirmación",
  "copyLogs": "Copiar registros",
--- a/lib/localization/app_fr.arb
+++ b/lib/localization/app_fr.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "Souhaitez-vous effacer l'historique de lecture ?",
  "clearSearchHistory": "Effacer l'historique de recherche",
  "clearSearchHistoryQuestion": "Souhaitez-vous effacer l'historique de recherche ?",
+  "client": "Client",
  "confirm": "Confirmer",
  "confirmation": "Confirmation",
  "copyLogs": "Copier les logs",
--- a/lib/localization/app_hi.arb
+++ b/lib/localization/app_hi.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "क्या आप हाल ही में बजाए गए गानों का इतिहास साफ़ करना चाहते हैं?",
  "clearSearchHistory": "खोज इतिहास साफ़ करें",
  "clearSearchHistoryQuestion": "क्या आप खोज इतिहास साफ़ करना चाहते हैं?",
+  "client": "क्लाइंट",
  "confirm": "पुष्टि करें",
  "confirmation": "पुष्टिकरण",
  "copyLogs": "लॉग्स कॉपी करें",
--- a/lib/localization/app_id.arb
+++ b/lib/localization/app_id.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "Apakah Anda yakin ingin menghapus riwayat yang baru saja dimainkan?",
  "clearSearchHistory": "Hapus riwayat pencarian",
  "clearSearchHistoryQuestion": "Apakah Anda yakin ingin menghapus riwayat pencarian?",
+  "client": "Klien",
  "confirm": "Terima",
  "confirmation": "Konfirmasi",
  "copyLogs": "Salin catatan",
--- a/lib/localization/app_it.arb
+++ b/lib/localization/app_it.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "Cancellare cronologia recenti?",
  "clearSearchHistory": "Cancella cronologia ricerche",
  "clearSearchHistoryQuestion": "Cancellare cronologia ricerche?",
+  "client": "Client",
  "confirm": "Conferma",
  "confirmation": "Conferma",
  "copyLogs": "Copia log",
--- a/lib/localization/app_ja.arb
+++ b/lib/localization/app_ja.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "再生履歴を削除しますか？",
  "clearSearchHistory": "検索履歴を削除",
  "clearSearchHistoryQuestion": "検索履歴を削除しますか？",
+  "client": "クライアント",
  "confirm": "確認",
  "confirmation": "確認",
  "copyLogs": "ログをコピー",
--- a/lib/localization/app_ko.arb
+++ b/lib/localization/app_ko.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "최근 재생 기록을 지울까요?",
  "clearSearchHistory": "검색 기록 지우기",
  "clearSearchHistoryQuestion": "검색 기록 지울까요?",
+  "client": "클라이언트",
  "confirm": "확인",
  "confirmation": "확인",
  "copyLogs": "로그 복사",
--- a/lib/localization/app_pl.arb
+++ b/lib/localization/app_pl.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "Wyczyścić historię ostatnio odtworzonych utworów?",
  "clearSearchHistory": "Wyczyść historię wyszukiwania",
  "clearSearchHistoryQuestion": "Wyczyścić historię wyszukiwania?",
+  "client": "Client",
  "confirm": "Potwierdź",
  "confirmation": "Potwierdzenie",
  "copyLogs": "Kopiuj logi",
--- a/lib/localization/app_pt.arb
+++ b/lib/localization/app_pt.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "Deseja limpar as reproduções recentes?",
  "clearSearchHistory": "Limpar buscas",
  "clearSearchHistoryQuestion": "Deseja limpar histórico de buscas?",
+  "client": "Cliente",
  "confirm": "Confirmar",
  "confirmation": "Confirmação",
  "copyLogs": "Copiar logs",
--- a/lib/localization/app_ru.arb
+++ b/lib/localization/app_ru.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "Точно очистить недавние треки?",
  "clearSearchHistory": "Очистить историю поиска",
  "clearSearchHistoryQuestion": "Точно очистить историю поиска?",
+  "client": "Клиент",
  "confirm": "Подтвердить",
  "confirmation": "Подтверждение",
  "copyLogs": "Скопировать логи",
--- a/lib/localization/app_tr.arb
+++ b/lib/localization/app_tr.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "Son çalınanları silmek istiyor musun?",
  "clearSearchHistory": "Arama Geçmişini Temizle",
  "clearSearchHistoryQuestion": "Arama geçmişini temizlemek istiyor musun?",
+  "client": "İstemci",
  "confirm": "Onayla",
  "confirmation": "Doğrulama",
  "copyLogs": "Kayıtları Kopyala",
--- a/lib/localization/app_uk.arb
+++ b/lib/localization/app_uk.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "Clear recently played history?",
  "clearSearchHistory": "Очистити історію пошуку",
  "clearSearchHistoryQuestion": "Clear search history?",
+  "client": "Client",
  "confirm": "Підтвердити",
  "confirmation": "Підтвердження",
  "copyLogs": "Копіювати журнали",
--- a/lib/localization/app_zh-Hant.arb
+++ b/lib/localization/app_zh-Hant.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "您確定要清除最近播放歷史嗎？",
  "clearSearchHistory": "清除搜索歷史",
  "clearSearchHistoryQuestion": "您確定要清除搜索歷史嗎？",
+  "client": "客戶端",
  "confirm": "確認",
  "confirmation": "確認",
  "copyLogs": "複製日誌",
--- a/lib/localization/app_zh.arb
+++ b/lib/localization/app_zh.arb
@ -31,6 +31,7 @@
  "clearRecentlyPlayedQuestion": "您确定要清除最近播放历史吗？",
  "clearSearchHistory": "清除搜索历史",
  "clearSearchHistoryQuestion": "您确定要清除搜索历史吗？",
+  "client": "客户端",
  "confirm": "确认",
  "confirmation": "确认",
  "copyLogs": "复制日志",
--- a/lib/main.dart
+++ b/lib/main.dart
@ -44,6 +44,7 @@ import 'package:musify/services/update_manager.dart';
 import 'package:musify/style/app_themes.dart';
 import 'package:musify/utilities/flutter_toast.dart';
 import 'package:path_provider/path_provider.dart';
+import 'package:youtube_explode_dart/youtube_explode_dart.dart';

 late MusifyAudioHandler audioHandler;

@ -244,6 +245,18 @@ Future<void> initialisation() async {
    // Init router
    NavigationManager.instance;

+    // Init clients
+    if (clientsSetting.value.isNotEmpty) {
+      final chosenClients = <YoutubeApiClient>[];
+      for (final client in clientsSetting.value) {
+        final _client = clients[client];
+        if (_client != null) {
+          chosenClients.add(_client);
+        }
+      }
+      userChosenClients = chosenClients;
+    }
+
    try {
      // Listen to incoming links while app is running
      appLinks.uriLinkStream.listen(
--- a/lib/screens/settings_page.dart
+++ b/lib/screens/settings_page.dart
@ -102,6 +102,13 @@ class SettingsPage extends StatelessWidget {
                inactivatedColor,
              ),
        ),
+        CustomBar(
+          context.l10n!.client,
+          FluentIcons.device_meeting_room_24_filled,
+          onTap:
+              () =>
+                  _showClientPicker(context, activatedColor, inactivatedColor),
+        ),
        CustomBar(
          context.l10n!.language,
          FluentIcons.translate_24_filled,
@ -422,6 +429,56 @@ class SettingsPage extends StatelessWidget {
    );
  }

+  void _showClientPicker(
+    BuildContext context,
+    Color activatedColor,
+    Color inactivatedColor,
+  ) {
+    final availableClients = clients.keys.toList();
+    showCustomBottomSheet(
+      context,
+      StatefulBuilder(
+        builder: (context, setState) {
+          return ListView.builder(
+            shrinkWrap: true,
+            physics: const BouncingScrollPhysics(),
+            padding: commonListViewBottmomPadding,
+            itemCount: availableClients.length,
+            itemBuilder: (context, index) {
+              final client = availableClients[index];
+              final _clientInModel = clients[client];
+              final isSelected = userChosenClients.contains(_clientInModel);
+              final borderRadius = getItemBorderRadius(
+                index,
+                availableClients.length,
+              );
+
+              return BottomSheetBar(
+                client,
+                () {
+                  setState(() {
+                    if (isSelected) {
+                      clientsSetting.value.remove(client);
+                      userChosenClients.remove(_clientInModel);
+                    } else {
+                      if (_clientInModel != null) {
+                        clientsSetting.value.add(client);
+                        userChosenClients.add(_clientInModel);
+                      }
+                    }
+                  });
+                  addOrUpdateData('settings', 'clients', clientsSetting.value);
+                },
+                isSelected ? activatedColor : inactivatedColor,
+                borderRadius: borderRadius,
+              );
+            },
+          );
+        },
+      ),
+    );
+  }
+
  void _showLanguagePicker(
    BuildContext context,
    Color activatedColor,
--- a/lib/services/settings_manager.dart
+++ b/lib/services/settings_manager.dart
@ -62,6 +62,10 @@ final audioQualitySetting = ValueNotifier<String>(
  Hive.box('settings').get('audioQuality', defaultValue: 'high'),
 );

+final clientsSetting = ValueNotifier<List>(
+  Hive.box('settings').get('clients', defaultValue: []),
+);
+
 Locale languageSetting = getLocaleFromLanguageCode(
  Hive.box('settings').get('language', defaultValue: 'English') as String,
 );