feat: fetch square thumbnail for topic channel videos

- when downloading or when fixing thumbnails ref: #212
namidaco · Nov 30, 2024 · 3f3ffda · 3f3ffda
1 parent f3d069e
commit 3f3ffda
Show file tree

Hide file tree

Showing 6 changed files with 96 additions and 16 deletions.
diff --git a/lib/controller/ffmpeg_controller.dart b/lib/controller/ffmpeg_controller.dart
@@ -11,6 +11,7 @@ import 'package:namida/core/constants.dart';
 import 'package:namida/core/extensions.dart';
 import 'package:namida/core/utils.dart';
 import 'package:namida/main.dart';
+import 'package:namida/youtube/controller/youtube_info_controller.dart';
 import 'package:namida/youtube/widgets/yt_thumbnail.dart';
 
 import 'platform/ffmpeg_executer/ffmpeg_executer.dart';
@@ -323,21 +324,43 @@ class NamidaFFMPEG {
               onMinSizeTrigger: () => null,
             );
         if (tr == null) continue;
-        final ytId = tr.youtubeID;
-        if (ytId.isEmpty) continue;
+        final videoId = tr.youtubeID;
+        if (videoId.isEmpty) continue;
 
-        File? cachedThumbnail;
+        File? thumbnailFile;
+        bool isTempThumbnail = false;
+        try {
+          // -- try getting cropped version if required
+          final channelName = await YoutubeInfoController.utils.getVideoChannelNameAsync(videoId);
+          const topic = '- Topic';
+          if (channelName != null && channelName.endsWith(topic)) {
+            final thumbFilePath = FileParts.joinPath(Directory.systemTemp.path, '$videoId.png');
+            final thumbFile = await YoutubeInfoController.video.fetchMusicVideoThumbnailToFile(videoId, thumbFilePath);
+            if (thumbFile != null) {
+              thumbnailFile = thumbFile;
+              isTempThumbnail = true;
+            }
+          }
+        } catch (_) {}
 
-        cachedThumbnail = await ThumbnailManager.inst.getYoutubeThumbnailAndCache(id: ytId, type: ThumbnailType.video);
+        thumbnailFile ??= await ThumbnailManager.inst.getYoutubeThumbnailAndCache(
+          id: videoId,
+          isImportantInCache: true,
+          type: ThumbnailType.video,
+        );
 
-        if (cachedThumbnail == null) {
+        if (thumbnailFile == null) {
           currentFailed++;
         } else {
           final didUpdate = await editAudioThumbnail(
             audioPath: filee.path,
-            thumbnailPath: cachedThumbnail.path,
+            thumbnailPath: thumbnailFile.path,
           );
           if (!didUpdate) currentFailed++;
+
+          if (isTempThumbnail) {
+            thumbnailFile.tryDeleting();
+          }
         }
 
         currentOperations[OperationType.ytdlpThumbnailFix]!.value = OperationProgress(

diff --git a/lib/controller/indexer_controller.dart b/lib/controller/indexer_controller.dart
@@ -839,9 +839,7 @@ class Indexer<T extends Track> {
     });
 
     if (updateArtwork) {
-      imageCache.clear();
-      imageCache.clearLiveImages();
-      AudioService.evictArtworkCache();
+      Indexer.clearMemoryImageCache();
     }
 
     tracksMissing.loop((e) => onProgress(false));
@@ -891,9 +889,7 @@ class Indexer<T extends Track> {
     final newTracks = <T>[];
 
     if (artworkWasEdited) {
-      imageCache.clear();
-      imageCache.clearLiveImages();
-      AudioService.evictArtworkCache();
+      Indexer.clearMemoryImageCache();
     }
 
     final finalNewOldTracks = <TrackExtended, TrackExtended?>{};
@@ -1600,6 +1596,12 @@ class Indexer<T extends Track> {
   static SplitArtistGenreConfigsWrapper _createSplitConfig() {
     return SplitArtistGenreConfigsWrapper.settings();
   }
+
+  static void clearMemoryImageCache() {
+    imageCache.clear();
+    imageCache.clearLiveImages();
+    AudioService.evictArtworkCache();
+  }
 }
 
 extension _OrderedInsert<T> on List<T> {

diff --git a/lib/youtube/controller/info_controllers/yt_various_utils.dart b/lib/youtube/controller/info_controllers/yt_various_utils.dart
@@ -124,6 +124,38 @@ class _YoutubeInfoUtils {
     return _tempInfoVideoDurationSeconds[videoId] ??= getStreamInfoSync(videoId)?.durSeconds ?? //
         _getVideoStreamResultSync(videoId)?.info?.durSeconds;
   }
+
+  // ==== async methods ====
+
+  Future<StreamInfoItem?> getStreamInfoAsync(String videoId) {
+    return YoutiPie.cacheBuilder.forStreamInfoItem(videoId: videoId).readAsync();
+  }
+
+  Future<VideoStreamsResult?> _getVideoStreamResultAsync(String videoId) {
+    return YoutubeInfoController.video.fetchVideoStreams(videoId, forceRequest: false);
+  }
+
+  Future<YoutiPieVideoPageResult?> _getVideoPageResultAsync(String videoId) {
+    return YoutubeInfoController.video.fetchVideoPage(videoId);
+  }
+
+  Future<String?> getVideoNameAsync(String videoId) async {
+    String? name = tempVideoInfosFromStreams[videoId]?.title.nullifyEmpty() ?? tempBackupVideoInfo[videoId]?.title.nullifyEmpty();
+    if (name != null) return name;
+    final title = await getStreamInfoAsync(videoId).then((value) => value?.title.nullifyEmpty()) ??
+        await _getVideoStreamResultAsync(videoId).then((value) => value?.info?.title.nullifyEmpty()) ?? //
+        await _getVideoPageResultAsync(videoId).then((value) => value?.videoInfo?.title.nullifyEmpty());
+    return _tempInfoTitle[videoId] ??= title;
+  }
+
+  Future<String?> getVideoChannelNameAsync(String videoId) async {
+    String? name = tempVideoInfosFromStreams[videoId]?.channelName?.nullifyEmpty() ?? tempBackupVideoInfo[videoId]?.channel.nullifyEmpty();
+    if (name != null) return name;
+    final channelName = await getStreamInfoAsync(videoId).then((value) => value?.channelName?.nullifyEmpty()) ??
+        await _getVideoStreamResultAsync(videoId).then((value) => value?.info?.channelName?.nullifyEmpty()) ?? //
+        await _getVideoPageResultAsync(videoId).then((value) => value?.channelInfo?.title.nullifyEmpty());
+    return _tempInfoChannelTitle[videoId] ??= channelName;
+  }
 }
 
 extension _StringChecker on String {

diff --git a/lib/youtube/controller/info_controllers/yt_video_info_controller.dart b/lib/youtube/controller/info_controllers/yt_video_info_controller.dart
@@ -63,6 +63,10 @@ class _VideoInfoController {
     return res;
   }
 
+  Future<File?> fetchMusicVideoThumbnailToFile(String videoId, String filePath) {
+    return YoutiPie.video.fetchMusicVideoThumbnailToFile(id: videoId, filePath: filePath);
+  }
+
   /// Returns cached streams result if exist. you need to ensure that urls didn't expire ![VideoStreamsResult.hasExpired] before consuming them.
   ///
   /// Enable [bypassJSCheck] if you gurantee using [VideoStreamsResult.info] only.

diff --git a/lib/youtube/controller/youtube_controller.dart b/lib/youtube/controller/youtube_controller.dart
@@ -752,17 +752,36 @@ class YoutubeController {
         onInitialAudioFileSize: (initialFileSize) {},
         ffmpegTags: config.ffmpegTags,
         onAudioFileReady: (audioFile) async {
-          final thumbnailFile = await ThumbnailManager.inst.getYoutubeThumbnailAndCache(
-            id: videoID.videoId,
+          final videoId = videoID.videoId;
+          File? thumbnailFile;
+          bool isTempThumbnail = false;
+          try {
+            // -- try getting cropped version if required
+            final channelName = await YoutubeInfoController.utils.getVideoChannelNameAsync(videoId);
+            const topic = '- Topic';
+            if (channelName != null && channelName.endsWith(topic)) {
+              final thumbFilePath = FileParts.joinPath(Directory.systemTemp.path, '$videoId.png');
+              final thumbFile = await YoutubeInfoController.video.fetchMusicVideoThumbnailToFile(videoId, thumbFilePath);
+              if (thumbFile != null) {
+                thumbnailFile = thumbFile;
+                isTempThumbnail = true;
+              }
+            }
+          } catch (_) {}
+          thumbnailFile ??= await ThumbnailManager.inst.getYoutubeThumbnailAndCache(
+            id: videoId,
             isImportantInCache: true,
             type: ThumbnailType.video,
           );
           await YTUtils.writeAudioMetadata(
-            videoId: videoID.videoId,
+            videoId: videoId,
             audioFile: audioFile,
             thumbnailFile: thumbnailFile,
             tagsMap: config.ffmpegTags,
           );
+          if (isTempThumbnail) {
+            thumbnailFile?.tryDeleting();
+          }
         },
         onVideoFileReady: (videoFile) async {
           await NamidaFFMPEG.inst.editMetadata(

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: namida
 description: A Beautiful and Feature-rich Music Player, With YouTube & Video Support Built in Flutter
 publish_to: "none"
-version: 4.7.52-beta+241129207
+version: 4.7.6-beta+241130122
 
 environment:
   sdk: ">=3.4.0 <4.0.0"