fixed youtube library loading bug

jhelumcorp · Sep 27, 2024 · 775edb0 · 775edb0
1 parent 0fdec11
commit 775edb0
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 16 deletions.
diff --git a/lib/app_config.dart b/lib/app_config.dart
@@ -1,4 +1,4 @@
-AppConfig appConfig = AppConfig(version: 27, codeName: '2.0.2');
+AppConfig appConfig = AppConfig(version: 28, codeName: '2.0.3');
 
 class AppConfig {
   int version;

diff --git a/lib/ytmusic/mixins/browsing.dart b/lib/ytmusic/mixins/browsing.dart
@@ -60,8 +60,6 @@ mixin BrowsingMixin on YTMusicServices {
                 'secondaryContents',
                 'sectionListRenderer'
               ]);
-      // pprint(nav(sectionListRenderer,
-      //     ['contents', 0, 'musicShelfRenderer', 'continuations']));
       List? chips =
           nav(sectionListRenderer, ['header', 'chipCloudRenderer', 'chips']);
       if (chips != null) {

diff --git a/lib/ytmusic/mixins/library.dart b/lib/ytmusic/mixins/library.dart
@@ -1,18 +1,22 @@
+import 'package:gyawun/utils/pprint.dart';
+
 import '../helpers.dart';
 import '../yt_service_provider.dart';
 import 'utils.dart';
 
 mixin LibraryMixin on YTMusicServices {
   Future<Map> getLibrarySongs({String? continuationParams}) async {
     Map<String, dynamic> body = {'browseId': 'FEmusic_liked_videos'};
+
     final response = await sendRequest('browse', body,
         additionalParams: continuationParams ?? '');
+
     Map outerContents = {};
     if (continuationParams != null) {
       outerContents =
           nav(response, ['continuationContents', 'musicShelfContinuation']);
     } else {
-      outerContents = nav(response, [
+      Map contents = nav(response, [
         'contents',
         'singleColumnBrowseResultsRenderer',
         'tabs',
@@ -22,8 +26,13 @@ mixin LibraryMixin on YTMusicServices {
         'sectionListRenderer',
         'contents',
         0,
+      ]);
+      outerContents = nav(contents, [
         'musicShelfRenderer'
+      ])??nav(contents, [
+        'itemSectionRenderer'
       ]);
+
     }
 
     String? continuation = nav(outerContents,
@@ -47,25 +56,27 @@ mixin LibraryMixin on YTMusicServices {
       outerContents =
           nav(response, ['continuationContents', 'gridContinuation']);
     } else {
-      outerContents = nav(response, [
-        'contents',
+      Map contents = nav(response, ['contents',
         'singleColumnBrowseResultsRenderer',
         'tabs',
         0,
         'tabRenderer',
         'content',
         'sectionListRenderer',
         'contents',
-        0,
+        0,]);
+      outerContents = nav(contents, [
         'gridRenderer',
+      ])??nav(contents, [
+        'itemSectionRenderer',
       ]);
     }
     String? continuation = nav(outerContents,
         ['continuations', 0, 'nextContinuationData', 'continuation']);
     if (continuation != null) {
       continuation = getContinuationString(continuation);
     }
-    List contents = nav(outerContents, ['items']);
+    List contents = nav(outerContents, ['items'])??nav(outerContents, ['contents']);
 
     return {
       'contents': handleContents(contents),
@@ -85,17 +96,19 @@ mixin LibraryMixin on YTMusicServices {
       outerContents =
           nav(response, ['continuationContents', 'musicShelfContinuation']);
     } else {
-      outerContents = nav(response, [
-        'contents',
+      Map contents = nav(response,['contents',
         'singleColumnBrowseResultsRenderer',
         'tabs',
         0,
         'tabRenderer',
         'content',
         'sectionListRenderer',
         'contents',
-        0,
+        0,]);
+      outerContents = nav(contents, [
         'musicShelfRenderer',
+      ])??nav(contents,[
+        'itemSectionRenderer',
       ]);
     }
     String? continuation = nav(outerContents,
@@ -120,18 +133,22 @@ mixin LibraryMixin on YTMusicServices {
       outerContents =
           nav(response, ['continuationContents', 'gridContinuation']);
     } else {
-      outerContents = nav(response, [
-        'contents',
+      Map contents = nav(response,[ 'contents',
         'singleColumnBrowseResultsRenderer',
         'tabs',
         0,
         'tabRenderer',
         'content',
         'sectionListRenderer',
         'contents',
-        0,
+        0,]);
+      outerContents = nav(contents, [
         'gridRenderer'
+      ])??
+      nav(contents, [
+        'itemSectionRenderer',
       ]);
+
     }
     String? continuation = nav(outerContents,
         ['continuations', 0, 'nextContinuationData', 'continuation']);
@@ -158,7 +175,7 @@ mixin LibraryMixin on YTMusicServices {
       outerContents = outerContents =
           nav(response, ['continuationContents', 'musicShelfContinuation']);
     } else {
-      outerContents = nav(response, [
+      Map contents = nav(response,[
         'contents',
         'singleColumnBrowseResultsRenderer',
         'tabs',
@@ -168,7 +185,11 @@ mixin LibraryMixin on YTMusicServices {
         'sectionListRenderer',
         'contents',
         0,
+      ]);
+      outerContents = nav(contents, [
         'musicShelfRenderer',
+      ])??nav(contents, [
+        'itemSectionRenderer',
       ]);
     }
     String? continuation = nav(outerContents,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: gyawun
 description: "A new Flutter project."
 publish_to: 'none'
-version: 2.0.2+27
+version: 2.0.3+28
 
 environment:
   sdk: '>=3.4.1 <4.0.0'