feat(yt): channel subscribe & notifications

this comes with across-pages safety, hitting the button in a place temoprarely disables other active buttons so damn cool oh ye and a sneaky lil fix ref: #227
namidaco · Jul 14, 2024 · 34a10fe · 34a10fe
1 parent 6ac49c7
commit 34a10fe
Show file tree

Hide file tree

Showing 11 changed files with 355 additions and 24 deletions.
diff --git a/lib/class/track.dart b/lib/class/track.dart
@@ -472,7 +472,7 @@ extension TrackUtils on Track {
   set duration(int value) {
     final trx = Indexer.inst.allTracksMappedByPath.value[this];
     if (trx != null) {
-      Indexer.inst.allTracksMappedByPath.value[this] = trx.copyWith(duration: value);
+      Indexer.inst.allTracksMappedByPath[this] = trx.copyWith(duration: value);
       Indexer.inst.allTracksMappedByPath.refresh();
     }
   }

diff --git a/lib/controller/waveform_controller.dart b/lib/controller/waveform_controller.dart
@@ -48,7 +48,7 @@ class WaveformController {
       Future.delayed(const Duration(milliseconds: 800)),
     ]);
 
-    if (stillPlaying(path)) {
+    if (waveformData.isNotEmpty && stillPlaying(path)) {
       // ----- Updating [_currentWaveform]
       const maxWaveformCount = 2000;
       final numberOfScales = duration.inMilliseconds ~/ 50;

diff --git a/lib/core/namida_converter_ext.dart b/lib/core/namida_converter_ext.dart
@@ -687,6 +687,10 @@ extension CommentsSortTypeUtils on CommentsSortType {
   String toText() => _NamidaConverters.inst.getTitle(this);
 }
 
+extension ChannelNotificationsUtils on ChannelNotifications {
+  String toText() => _NamidaConverters.inst.getTitle(this);
+}
+
 extension RouteUtils on NamidaRoute {
   List<Selectable> tracksListInside() {
     final iter = tracksInside();
@@ -1305,6 +1309,11 @@ class _NamidaConverters {
         CommentsSortType.top: lang.TOP,
         CommentsSortType.newest: lang.NEWEST,
       },
+      ChannelNotifications: {
+        ChannelNotifications.all: lang.ALL,
+        ChannelNotifications.personalized: lang.PERSONALIZED,
+        ChannelNotifications.none: lang.NONE,
+      },
     };
 
     // ====================================================

diff --git a/lib/core/translations/keys.dart b/lib/core/translations/keys.dart
@@ -461,6 +461,7 @@ abstract class LanguageKeys {
   String get PERCENTAGE => _getKey('PERCENTAGE');
   String get PERFORMANCE_MODE => _getKey('PERFORMANCE_MODE');
   String get PERFORMANCE_NOTE => _getKey('PERFORMANCE_NOTE');
+  String get PERSONALIZED => _getKey('PERSONALIZED');
   String get PICK_COLORS_FROM_DEVICE_WALLPAPER => _getKey('PICK_COLORS_FROM_DEVICE_WALLPAPER');
   String get PICK_FROM_STORAGE => _getKey('PICK_FROM_STORAGE');
   String get PINNED => _getKey('PINNED');

diff --git a/lib/ui/dialogs/general_popup_dialog.dart b/lib/ui/dialogs/general_popup_dialog.dart
@@ -1026,7 +1026,7 @@ Future<void> showGeneralPopupDialog(
                               },
                             ),
 
-                            isSingle && tracks.first == Player.inst.currentItem.value
+                            isSingle && tracks.first == Player.inst.currentTrack?.track
                                 ? NamidaOpacity(
                                     opacity: Player.inst.sleepTimerConfig.value.sleepAfterItems == 1 ? 0.6 : 1.0,
                                     child: IgnorePointer(

diff --git a/lib/youtube/controller/youtube_current_info.dart b/lib/youtube/controller/youtube_current_info.dart
@@ -7,6 +7,7 @@ class _YoutubeCurrentInfoController {
   bool get _canShowComments => settings.youtubeStyleMiniplayer.value;
 
   RxBaseCore<YoutiPieVideoPageResult?> get currentVideoPage => _currentVideoPage;
+  RxBaseCore<YoutiPieChannelPageResult?> get currentChannelPage => _currentChannelPage;
   RxBaseCore<YoutiPieCommentResult?> get currentComments => _currentComments;
   RxBaseCore<bool> get isLoadingVideoPage => _isLoadingVideoPage;
   RxBaseCore<bool> get isLoadingInitialComments => _isLoadingInitialComments;
@@ -20,6 +21,7 @@ class _YoutubeCurrentInfoController {
   final currentCachedQualities = <NamidaVideo>[].obs;
 
   final _currentVideoPage = Rxn<YoutiPieVideoPageResult>();
+  final _currentChannelPage = Rxn<YoutiPieChannelPageResult>();
   final _currentRelatedVideos = Rxn<YoutiPieRelatedVideosResult>();
   final _currentComments = Rxn<YoutiPieCommentResult>();
   final currentYTStreams = Rxn<VideoStreamsResult>();
@@ -39,6 +41,7 @@ class _YoutubeCurrentInfoController {
   void resetAll() {
     currentCachedQualities.clear();
     _currentVideoPage.value = null;
+    _currentChannelPage.value = null;
     _currentRelatedVideos.value = null;
     _currentComments.value = null;
     currentYTStreams.value = null;
@@ -52,6 +55,11 @@ class _YoutubeCurrentInfoController {
     final vidcache = YoutiPie.cacheBuilder.forVideoPage(videoId: videoId);
     final vidPageCached = vidcache.read();
     _currentVideoPage.value = vidPageCached;
+
+    final chId = vidPageCached?.channelInfo?.id ?? YoutubeInfoController.utils.getVideoChannelID(videoId);
+    final chPage = chId == null ? null : YoutiPie.cacheBuilder.forChannel(channelId: chId).read();
+    _currentChannelPage.value = chPage;
+
     final relatedcache = YoutiPie.cacheBuilder.forRelatedVideos(videoId: videoId);
     _currentRelatedVideos.value = relatedcache.read() ?? vidPageCached?.relatedVideosResult;
     return vidPageCached != null;
@@ -80,6 +88,7 @@ class _YoutubeCurrentInfoController {
     if (requestPage) {
       if (onVideoPageReset != null) onVideoPageReset!(); // jumps miniplayer to top
       _currentVideoPage.value = null;
+      _currentChannelPage.value = null;
     }
     if (requestComments) {
       _currentComments.value = null;
@@ -92,8 +101,23 @@ class _YoutubeCurrentInfoController {
     final page = await YoutubeInfoController.video.fetchVideoPage(videoId, details: ExecuteDetails.forceRequest());
     _isLoadingVideoPage.value = false;
 
+    if (page != null) {
+      final chId = page.channelInfo?.id ?? YoutubeInfoController.utils.getVideoChannelID(videoId);
+      if (chId != null) {
+        YoutubeInfoController.channel.fetchChannelInfo(channelId: page.channelInfo?.id, details: ExecuteDetails.forceRequest()).then(
+          (chPage) {
+            if (_canSafelyModifyMetadata(videoId)) {
+              _currentChannelPage.value = chPage;
+            }
+          },
+        );
+      }
+    }
+
     if (_canSafelyModifyMetadata(videoId)) {
-      if (requestPage) _currentVideoPage.value = page; // page is still requested cuz comments need it
+      if (requestPage) {
+        _currentVideoPage.value = page; // page is still requested cuz comments need it
+      }
       if (requestComments) {
         final commentsContinuation = page?.commentResult.continuation;
         if (commentsContinuation != null && _canShowComments) {
@@ -106,6 +130,7 @@ class _YoutubeCurrentInfoController {
           if (_canSafelyModifyMetadata(videoId)) {
             _isLoadingInitialComments.value = false;
             _currentVideoPage.refresh();
+            _currentChannelPage.refresh();
             _currentComments.value = comm;
             _isCurrentCommentsFromCache.value = false;
             _initialCommentsContinuation = comm?.continuation;

diff --git a/lib/youtube/pages/yt_channel_subpage.dart b/lib/youtube/pages/yt_channel_subpage.dart
@@ -57,7 +57,7 @@ class _YTChannelSubpageState extends YoutubeChannelController<YTChannelSubpage>
         subscribed: false,
       );
 
-  YoutiPieChannelPageResult? _channelInfo;
+  final _channelInfo = Rxn<YoutiPieChannelPageResult?>(); // rx is accessed only in subscribe button. keep using setState().
   YoutiPieFetchAllRes? _currentFetchAllRes;
 
   @override
@@ -68,15 +68,15 @@ class _YTChannelSubpageState extends YoutubeChannelController<YTChannelSubpage>
 
     final channelInfoCache = YoutubeInfoController.channel.fetchChannelInfoSync(ch.channelID);
     if (channelInfoCache != null) {
-      _channelInfo = channelInfoCache;
+      _channelInfo.value = channelInfoCache;
       fetchChannelStreams(channelInfoCache);
     }
 
     // -- always get new info.
     YoutubeInfoController.channel.fetchChannelInfo(channelId: ch.channelID, details: ExecuteDetails.forceRequest()).then(
       (value) {
         if (value != null) {
-          setState(() => _channelInfo = value);
+          setState(() => _channelInfo.value = value);
           onRefresh(() => fetchChannelStreams(value, forceRequest: true), forceProceed: true);
         }
       },
@@ -213,7 +213,7 @@ class _YTChannelSubpageState extends YoutubeChannelController<YTChannelSubpage>
 
   @override
   Widget build(BuildContext context) {
-    final channelInfo = _channelInfo;
+    final channelInfo = _channelInfo.value;
     const thumbnailHeight = Dimensions.youtubeThumbnailHeight;
     const thumbnailWidth = Dimensions.youtubeThumbnailWidth;
     const thumbnailItemExtent = thumbnailHeight + 8.0 * 2;
@@ -344,7 +344,10 @@ class _YTChannelSubpageState extends YoutubeChannelController<YTChannelSubpage>
                             ),
                           ),
                           const SizedBox(width: 4.0),
-                          YTSubscribeButton(channelID: channelID),
+                          YTSubscribeButton(
+                            channelID: channelID,
+                            mainChannelInfo: _channelInfo,
+                          ),
                           const SizedBox(width: 12.0),
                         ],
                       ),

diff --git a/lib/youtube/widgets/yt_comment_card.dart b/lib/youtube/widgets/yt_comment_card.dart
@@ -67,10 +67,10 @@ class _YTCommentCardState extends State<YTCommentCard> {
     onEnd();
     if (res == true) {
       _currentLikeStatus.value = _currentLikeStatus.value = action.toExpectedStatus();
-      return true;
-    } else {
-      return false;
+      return !isLiked;
     }
+
+    return isLiked;
   }
 
   void _onRepliesTap({required CommentInfoItem comment, required int? repliesCount}) {