feat: improve offline playlist functionality and proxy handling

Author: gokadzev

lib/screens/playlist_page.dart

@@ -511,75 +511,84 @@ class _PlaylistPageState extends State<PlaylistPage> {
       return const SizedBox.shrink();
     }
 
-    return ValueListenableBuilder<List<dynamic>>(
-      valueListenable: offlinePlaylistService.offlinePlaylists,
-      builder: (context, offlinePlaylists, _) {
-        playlistOfflineStatus = offlinePlaylistService.isPlaylistDownloaded(
-          playlistId,
-        );
-
-        if (playlistOfflineStatus) {
-          return IconButton.filled(
-            icon: Icon(
-              FluentIcons.arrow_download_off_24_filled,
-              color: Theme.of(context).colorScheme.onPrimary,
-            ),
-            iconSize: 24,
-            onPressed: () => _showRemoveOfflineDialog(playlistId),
-            tooltip: context.l10n!.removeOffline,
-          );
-        }
-
-        return ValueListenableBuilder<DownloadProgress>(
-          valueListenable: offlinePlaylistService.getProgressNotifier(
-            playlistId,
-          ),
-          builder: (context, progress, _) {
-            final isDownloading = offlinePlaylistService.isPlaylistDownloading(
-              playlistId,
-            );
-
-            if (isDownloading) {
-              return SizedBox(
-                width: 48,
-                height: 48,
-                child: Stack(
-                  alignment: Alignment.center,
-                  children: [
-                    SizedBox(
-                      width: 40,
-                      height: 40,
-                      child: CircularProgressIndicator(
-                        value: progress.progress,
-                        strokeWidth: 3,
-                        backgroundColor: Theme.of(
-                          context,
-                        ).colorScheme.primaryContainer,
-                      ),
-                    ),
-                    IconButton(
-                      icon: const Icon(FluentIcons.dismiss_24_filled, size: 16),
-                      onPressed: () => offlinePlaylistService.cancelDownload(
-                        context,
-                        playlistId,
-                      ),
-                      tooltip: context.l10n!.cancel,
-                    ),
-                  ],
+    return ValueListenableBuilder<int>(
+      valueListenable: currentOfflineSongsLength,
+      builder: (context, _, __) {
+        return ValueListenableBuilder<List<dynamic>>(
+          valueListenable: offlinePlaylistService.offlinePlaylists,
+          builder: (context, offlinePlaylists, _) {
+            final playlistSongs = _playlist?['list'] as List? ?? [];
+            playlistOfflineStatus = isPlaylistFullyOffline(playlistSongs);
+
+            if (playlistOfflineStatus) {
+              return IconButton.filled(
+                icon: Icon(
+                  FluentIcons.arrow_download_off_24_filled,
+                  color: Theme.of(context).colorScheme.onPrimary,
                 ),
+                iconSize: 24,
+                onPressed: () => _showRemoveOfflineDialog(playlistId),
+                tooltip: context.l10n!.removeOffline,
               );
             }
 
-            if (offlineMode.value) {
-              return const SizedBox.shrink();
-            }
-
-            return IconButton.filledTonal(
-              icon: const Icon(FluentIcons.arrow_download_24_filled),
-              iconSize: 24,
-              onPressed: () =>
-                  offlinePlaylistService.downloadPlaylist(context, _playlist),
-              tooltip: context.l10n!.downloadPlaylist,
+            return ValueListenableBuilder<DownloadProgress>(
+              valueListenable: offlinePlaylistService.getProgressNotifier(
+                playlistId,
+              ),
+              builder: (context, progress, _) {
+                final isDownloading =
+                    offlinePlaylistService.isPlaylistDownloading(playlistId);
+
+                if (isDownloading) {
+                  return SizedBox(
+                    width: 48,
+                    height: 48,
+                    child: Stack(
+                      alignment: Alignment.center,
+                      children: [
+                        SizedBox(
+                          width: 40,
+                          height: 40,
+                          child: CircularProgressIndicator(
+                            value: progress.progress,
+                            strokeWidth: 3,
+                            backgroundColor: Theme.of(
+                              context,
+                            ).colorScheme.primaryContainer,
+                          ),
+                        ),
+                        IconButton(
+                          icon: const Icon(
+                            FluentIcons.dismiss_24_filled,
+                            size: 16,
+                          ),
+                          onPressed: () =>
+                              offlinePlaylistService.cancelDownload(
+                                context,
+                                playlistId,
+                              ),
+                          tooltip: context.l10n!.cancel,
+                        ),
+                      ],
+                    ),
+                  );
+                }
+
+                if (offlineMode.value) {
+                  return const SizedBox.shrink();
+                }
+
+                return IconButton.filledTonal(
+                  icon: const Icon(FluentIcons.arrow_download_24_filled),
+                  iconSize: 24,
+                  onPressed: () => offlinePlaylistService.downloadPlaylist(
+                    context,
+                    _playlist,
+                  ),
+                  tooltip: context.l10n!.downloadPlaylist,
+                );
+              },
             );
           },
         );

lib/services/common_services.dart

@@ -286,6 +286,12 @@ bool isPlaylistAlreadyLiked(playlistIdToCheck) =>
 bool isSongAlreadyOffline(songIdToCheck) =>
     userOfflineSongs.any((song) => song['ytid'] == songIdToCheck);
 
+bool isPlaylistFullyOffline(List songs) {
+  if (songs.isEmpty) return false;
+  final offlineIds = userOfflineSongs.map((s) => s['ytid']).toSet();
+  return songs.every((s) => offlineIds.contains(s['ytid']));
+}
+
 Map<String, dynamic> getOfflineSongByYtid(String ytid) {
   try {
     final song = userOfflineSongs.firstWhere(
@@ -337,7 +343,7 @@ Future<List<String>> getSearchSuggestions(String query) async {
 
 Future<List<Map<String, int>>> getSkipSegments(String id) async {
   try {
-    final res = await http.get(
+    final res = await ProxyManager().getProxiedResponse(
       Uri(
         scheme: 'https',
         host: 'sponsor.ajay.app',
@@ -356,7 +362,7 @@ Future<List<Map<String, int>>> getSkipSegments(String id) async {
         },
       ),
     );
-    if (res.body != 'Not Found') {
+    if (res.statusCode == 200 && res.body != 'Not Found') {
       final data = jsonDecode(res.body);
       final segments = data.map((obj) {
         return Map.castFrom<String, dynamic, String, int>({
@@ -667,7 +673,7 @@ Future<bool> removeSongFromOffline(dynamic songId) async {
 
 Future<File?> _downloadAndSaveArtworkFile(String url, String filePath) async {
   try {
-    final response = await http.get(Uri.parse(url));
+    final response = await ProxyManager().getProxiedResponse(Uri.parse(url));
 
     if (response.statusCode == 200) {
       final file = File(filePath);

lib/services/playlist_download_service.dart

@@ -84,12 +84,6 @@ class OfflinePlaylistService {
       return;
     }
 
-    // Check if already downloaded
-    if (isPlaylistDownloaded(playlistId)) {
-      showToast(context, context.l10n!.playlistAlreadyDownloaded);
-      return;
-    }
-
     // Initialize download state
     final songsList = playlist['list'] as List<dynamic>? ?? [];
     if (songsList.isEmpty) {

lib/services/proxy_manager.dart

@@ -395,6 +395,33 @@ class ProxyManager {
     return manifest;
   }
 
+  /// Performs an HTTP GET request that respects current proxy settings.
+  Future<http.Response> getProxiedResponse(
+    Uri uri, {
+    Map<String, String>? headers,
+    int timeoutSeconds = 10,
+  }) async {
+    if (!useProxy.value || _sharedProxyAddress == null) {
+      return http.get(uri, headers: headers).timeout(
+            Duration(seconds: timeoutSeconds),
+            onTimeout: () => http.Response('Timeout', 408),
+          );
+    }
+
+    final res = _proxyResources[_sharedProxyAddress!];
+    if (res == null) {
+      return http.get(uri, headers: headers).timeout(
+            Duration(seconds: timeoutSeconds),
+            onTimeout: () => http.Response('Timeout', 408),
+          );
+    }
+
+    return res.ioClient.get(uri, headers: headers).timeout(
+          Duration(seconds: timeoutSeconds),
+          onTimeout: () => http.Response('Timeout', 408),
+        );
+  }
+
   void _closeAllProxyResources() {
     for (final res in _proxyResources.values) {
       try {