chore: improved single download filename logic

namidaco · Sep 26, 2024 · 96ac21b · 96ac21b
1 parent 1d38cd0
commit 96ac21b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 8 deletions.
diff --git a/lib/youtube/functions/download_sheet.dart b/lib/youtube/functions/download_sheet.dart
@@ -78,12 +78,34 @@ Future<void> showDownloadVideoBottomSheet({
   updateTagsMap(defaultInitialTags);
   updateTagsMap(settings.youtube.initialDefaultMetadataTags);
 
+  bool videoOutputFilenameWasUserEdited = false;
   void updatefilenameOutput({String customName = ''}) {
+    if (videoOutputFilenameWasUserEdited) return;
+
     if (customName != '') {
       videoOutputFilenameController.text = customName;
       return;
     }
-    if (initialItemConfig != null) return; // cuz already set.
+
+    final filenameBuilderInSetting = settings.youtube.downloadFilenameBuilder.value;
+    if (filenameBuilderInSetting.isNotEmpty) {
+      final finalFilenameTempRebuilt = YoutubeController.filenameBuilder.rebuildFilenameWithDecodedParams(
+        filenameBuilderInSetting,
+        videoId,
+        streamResult.value,
+        null,
+        streamInfoItem ?? initialItemConfig?.streamInfoItem,
+        playlistInfo,
+        selectedVideoOnlyStream.value,
+        selectedAudioOnlyStream.value,
+        initialItemConfig?.index,
+        initialItemConfig?.totalLength,
+      );
+      if (finalFilenameTempRebuilt != null && finalFilenameTempRebuilt.isNotEmpty) {
+        videoOutputFilenameController.text = finalFilenameTempRebuilt;
+        return;
+      }
+    }
 
     final videoTitle = videoInfo.value?.title ?? videoId;
     if (selectedAudioOnlyStream.value == null && selectedVideoOnlyStream.value == null) {
@@ -100,6 +122,14 @@ Future<void> showDownloadVideoBottomSheet({
     }
   }
 
+  if (initialItemConfig != null) {
+    updatefilenameOutput(customName: initialItemConfig.filename.filename);
+    updateTagsMap(initialItemConfig.ffmpegTags);
+    videoOutputFilenameWasUserEdited = true;
+  } else {
+    updatefilenameOutput(customName: settings.youtube.downloadFilenameBuilder.value);
+  }
+
   void showWebmWarning() {
     snackyy(
       title: lang.WARNING,
@@ -119,11 +149,6 @@ Future<void> showDownloadVideoBottomSheet({
     if (selectedVideoOnlyStream.value?.isWebm == true) showWebmWarning(); // webm doesnt support tag editing
   }
 
-  if (initialItemConfig != null) {
-    updatefilenameOutput(customName: initialItemConfig.filename.filename);
-    updateTagsMap(initialItemConfig.ffmpegTags);
-  }
-
   void onStreamsObtained(VideoStreamsResult? streams) {
     streamResult.value = streams;
     if (streams?.info != null) videoInfo.value = streams!.info!;
@@ -629,6 +654,7 @@ Future<void> showDownloadVideoBottomSheet({
                       controller: videoOutputFilenameController,
                       hintText: videoOutputFilenameController.text,
                       labelText: lang.FILE_NAME,
+                      onChanged: (_) => videoOutputFilenameWasUserEdited = true,
                       validatorMode: AutovalidateMode.always,
                       validator: (value) {
                         if (value == null) return lang.PLEASE_ENTER_A_NAME;

diff --git a/lib/youtube/pages/yt_playlist_download_subpage.dart b/lib/youtube/pages/yt_playlist_download_subpage.dart
@@ -95,7 +95,9 @@ class _YTPlaylistDownloadPageState extends State<YTPlaylistDownloadPage> {
 
   YoutubeItemDownloadConfig _getDummyDownloadConfig(String id, int index, {String? defaultFilename}) {
     final streamInfoItem = widget.infoLookup[id];
-    final filename = defaultFilename ?? streamInfoItem?.title ?? YoutubeInfoController.utils.getVideoName(id) ?? id;
+    final filenameBuilderSettings = settings.youtube.downloadFilenameBuilder.value;
+    final filename =
+        filenameBuilderSettings.isNotEmpty ? filenameBuilderSettings : (defaultFilename ?? streamInfoItem?.title ?? YoutubeInfoController.utils.getVideoName(id) ?? id);
     return YoutubeItemDownloadConfig(
       index: index,
       totalLength: widget.playlistInfo?.videosCount ?? widget.ids.length,

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.4.84-beta+240926220
+version: 4.4.9-beta+240926220
 
 environment:
   sdk: ">=3.4.0 <4.0.0"