fix(playlists): ensure playlist identifiers are sanitized and resolved correctly (closes: #737)

gokadzev · gokadzev · commit 2617759f1e45 · 2026-03-02T10:09:15.000+04:00
diff --git a/lib/screens/playlist_page.dart b/lib/screens/playlist_page.dart
@@ -118,8 +118,10 @@ class _PlaylistPageState extends State<PlaylistPage> {
         _playlist = widget.playlistData;
         final playlistList = _playlist?['list'] as List?;
         if (playlistList == null || playlistList.isEmpty) {
+          final resolvedId =
+              _playlist?['ytid']?.toString() ?? widget.playlistId;
           final fullPlaylist = await getPlaylistInfoForWidget(
-            widget.playlistId,
+            resolvedId,
             isArtist: widget.isArtist,
           );
           if (fullPlaylist != null) {
@@ -385,16 +387,31 @@ class _PlaylistPageState extends State<PlaylistPage> {
         );
 
         if (result != null) {
-          final playlistYtid = _playlist['ytid'];
+          final resolvedPlaylistYtid =
+              _playlist['ytid']?.toString() ?? widget.playlistId;
+          if (resolvedPlaylistYtid == null ||
+              resolvedPlaylistYtid.isEmpty ||
+              resolvedPlaylistYtid == 'null') {
+            showToast(context, context.l10n!.error);
+            return;
+          }
+
+          final updatedPlaylist = {
+            ..._playlist,
+            ...result,
+            'ytid': resolvedPlaylistYtid,
+            'source': _playlist['source'] ?? result['source'],
+            'list': result['list'] ?? _playlist['list'],
+          };
 
           // Search root list first, then inside folders.
           final rootIndex = userCustomPlaylists.value.indexWhere(
-            (p) => p['ytid'] == playlistYtid,
+            (p) => p['ytid'] == resolvedPlaylistYtid,
           );
 
           if (rootIndex != -1) {
             final updatedPlaylists = List<Map>.from(userCustomPlaylists.value);
-            updatedPlaylists[rootIndex] = result;
+            updatedPlaylists[rootIndex] = updatedPlaylist;
             userCustomPlaylists.value = updatedPlaylists;
             unawaited(
               addOrUpdateData(
@@ -411,10 +428,10 @@ class _PlaylistPageState extends State<PlaylistPage> {
                 folder['playlists'] as List? ?? [],
               );
               final fi = folderPlaylists.indexWhere(
-                (p) => p['ytid'] == playlistYtid,
+                (p) => p['ytid'] == resolvedPlaylistYtid,
               );
               if (fi != -1) {
-                folderPlaylists[fi] = result;
+                folderPlaylists[fi] = updatedPlaylist;
                 folder['playlists'] = folderPlaylists;
                 break;
               }
@@ -429,7 +446,7 @@ class _PlaylistPageState extends State<PlaylistPage> {
             );
           }
 
-          setState(() => _playlist = result);
+          setState(() => _playlist = updatedPlaylist);
           showToast(context, context.l10n!.playlistUpdated);
         }
       },
@@ -594,7 +611,8 @@ class _PlaylistPageState extends State<PlaylistPage> {
       }
       _pagingController.refresh();
     } else {
-      final updatedPlaylist = await getPlaylistInfoForWidget(widget.playlistId);
+      final resolvedId = _playlist['ytid']?.toString() ?? widget.playlistId;
+      final updatedPlaylist = await getPlaylistInfoForWidget(resolvedId);
       if (updatedPlaylist != null && mounted) {
         setState(() {
           _playlist = updatedPlaylist;
diff --git a/lib/services/playlists_manager.dart b/lib/services/playlists_manager.dart
@@ -54,6 +54,92 @@ List onlinePlaylists = [];
 final currentLikedPlaylistsLength = ValueNotifier<int>(
   userLikedPlaylists.length,
 );
+bool _didSanitizePlaylistIdentifiers = false;
+
+void _ensurePlaylistIdentifiersSanitized() {
+  if (_didSanitizePlaylistIdentifiers) return;
+  _didSanitizePlaylistIdentifiers = true;
+  _sanitizePlaylistIdentifiers();
+}
+
+bool _isMissingPlaylistId(dynamic playlistId) {
+  final normalized = playlistId?.toString().trim();
+  return normalized == null || normalized.isEmpty || normalized == 'null';
+}
+
+/// Repairs persisted custom playlist entries that have missing/null ids.
+///
+/// This prevents navigation paths like `/home/playlist/null` from stale,
+/// previously corrupted data.
+void _sanitizePlaylistIdentifiers() {
+  var customChanged = false;
+  final normalizedCustom = userCustomPlaylists.value.map((item) {
+    if (item is! Map) return item;
+    final source = item['source']?.toString();
+    final shouldRepair =
+        source == null || source == 'user-created' || source == 'custom';
+    if (!shouldRepair || !_isMissingPlaylistId(item['ytid'])) {
+      return item;
+    }
+
+    customChanged = true;
+    return <String, dynamic>{
+      ...Map<String, dynamic>.from(item.cast<dynamic, dynamic>()),
+      'ytid': generateCustomPlaylistId(),
+      'source': source ?? 'user-created',
+    };
+  }).toList();
+
+  if (customChanged) {
+    userCustomPlaylists.value = normalizedCustom;
+    unawaited(addOrUpdateData('user', 'customPlaylists', normalizedCustom));
+  }
+
+  var foldersChanged = false;
+  final normalizedFolders = userPlaylistFolders.value.map((folder) {
+    if (folder is! Map) return folder;
+
+    final folderMap = Map<String, dynamic>.from(
+      folder.cast<dynamic, dynamic>(),
+    );
+    final folderPlaylists = folderMap['playlists'] as List<dynamic>? ?? [];
+    var folderChanged = false;
+
+    final normalizedPlaylists = folderPlaylists.map((playlist) {
+      if (playlist is! Map) return playlist;
+
+      final playlistMap = Map<String, dynamic>.from(
+        playlist.cast<dynamic, dynamic>(),
+      );
+      final source = playlistMap['source']?.toString();
+      final shouldRepair =
+          source == null || source == 'user-created' || source == 'custom';
+
+      if (!shouldRepair || !_isMissingPlaylistId(playlistMap['ytid'])) {
+        return playlistMap;
+      }
+
+      folderChanged = true;
+      return <String, dynamic>{
+        ...playlistMap,
+        'ytid': generateCustomPlaylistId(),
+        'source': source ?? 'user-created',
+      };
+    }).toList();
+
+    if (folderChanged) {
+      foldersChanged = true;
+      folderMap['playlists'] = normalizedPlaylists;
+    }
+
+    return folderMap;
+  }).toList();
+
+  if (foldersChanged) {
+    userPlaylistFolders.value = normalizedFolders;
+    unawaited(addOrUpdateData('user', 'playlistFolders', normalizedFolders));
+  }
+}
 
 String generateCustomPlaylistId() {
   final timestamp = DateTime.now().microsecondsSinceEpoch;
@@ -503,6 +589,7 @@ String deletePlaylistFolder(String folderId, [BuildContext? context]) {
 }
 
 List<Map> getPlaylistsInFolder(String folderId) {
+  _ensurePlaylistIdentifiersSanitized();
   try {
     final folder = userPlaylistFolders.value.firstWhere(
       (folder) => folder['id'] == folderId,
@@ -520,6 +607,7 @@ List<Map> getPlaylistsInFolder(String folderId) {
 }
 
 List<Map> getPlaylistsNotInFolders() {
+  _ensurePlaylistIdentifiersSanitized();
   final playlistsInFolders = <String>{};
   for (final folder in userPlaylistFolders.value) {
     final folderPlaylists = folder['playlists'] as List<dynamic>? ?? [];
@@ -545,6 +633,7 @@ Future<List> getPlaylists({
   bool onlyLiked = false,
   String type = 'all',
 }) async {
+  _ensurePlaylistIdentifiersSanitized();
   if (onlyLiked) {
     if (playlistsNum != null) {
       return userLikedPlaylists.take(playlistsNum).toList();
@@ -715,12 +804,15 @@ Future<Map?> getPlaylistInfoForWidget(
   dynamic id, {
   bool isArtist = false,
 }) async {
+  _ensurePlaylistIdentifiersSanitized();
   if (id == null) return null;
-  if (isArtist) return _fetchArtistPlaylist(id.toString());
-  if (id.toString().startsWith('customId-')) {
-    return _findCustomPlaylist(id.toString());
+  final normalizedId = id.toString().trim();
+  if (normalizedId.isEmpty || normalizedId == 'null') return null;
+  if (isArtist) return _fetchArtistPlaylist(normalizedId);
+  if (normalizedId.startsWith('customId-')) {
+    return _findCustomPlaylist(normalizedId);
   }
-  return _fetchYouTubePlaylist(id.toString());
+  return _fetchYouTubePlaylist(normalizedId);
 }
 
 Future<Map> _fetchArtistPlaylist(String artistName) async {
diff --git a/lib/widgets/edit_playlist_dialog.dart b/lib/widgets/edit_playlist_dialog.dart
@@ -131,13 +131,16 @@ class _EditPlaylistDialogState extends State<EditPlaylistDialog> {
         FilledButton.icon(
           onPressed: () {
             final newPlaylist = {
+              'ytid': widget.playlistData['ytid'],
               'title': _titleController.text,
-              'source': 'user-created',
+              'source': widget.playlistData['source'] ?? 'user-created',
               if (_imageBase64 != null)
                 'image': _imageBase64
               else if (_imageUrlController.text.isNotEmpty)
                 'image': _imageUrlController.text,
               'list': widget.playlistData['list'],
+              if (widget.playlistData['createdAt'] != null)
+                'createdAt': widget.playlistData['createdAt'],
             };
 
             Navigator.pop(context, newPlaylist);
diff --git a/lib/widgets/playlist_bar.dart b/lib/widgets/playlist_bar.dart
@@ -366,7 +366,15 @@ class PlaylistBar extends StatelessWidget {
       };
     } else {
       return () {
-        context.push('/home/playlist/$playlistId');
+        final resolvedPlaylistId =
+            playlistId ?? playlistData?['ytid']?.toString();
+        if (resolvedPlaylistId == null ||
+            resolvedPlaylistId.isEmpty ||
+            resolvedPlaylistId == 'null') {
+          showToast(context, context.l10n!.error);
+          return;
+        }
+        context.push('/home/playlist/$resolvedPlaylistId');
       };
     }
   }
