chore: cleanup & shi

- fix download folders not listing properly
- fix error trying to sort folders with names having BIG numbers at the end
- fix question mark in filename breaking downloads
- fix download stuck sometimes (silly code mistake)
- force thumbnail calculated scale to not exceed certain value
- other useless small refactors

.gitignore

@@ -56,4 +56,6 @@ chlog_hash.dart
 temp_changelog.md
 temp_changelog_hash.md
 test.dart
-CHANGELOG_pretty.txt
+CHANGELOG_pretty.txt
+
+windows/flutter/generated_**

lib/controller/folders_controller.dart

@@ -194,19 +194,23 @@ class Folders<T extends Folder> {
     }
     if (charCodes.isNotEmpty) {
       final startIndex = codes.length - charCodes.length;
-      return _ParsedResult(
-        extractedNumber: int.parse(String.fromCharCodes(charCodes.reversed)),
-        charactersCount: charCodes.length,
-        startAtIndex: startIndex,
-        textPart: text.substring(0, startIndex),
-      );
+      try {
+        return _ParsedResult(
+          extractedNumber: num.parse(String.fromCharCodes(charCodes.reversed)),
+          charactersCount: charCodes.length,
+          startAtIndex: startIndex,
+          textPart: text.substring(0, startIndex),
+        );
+      } catch (_) {
+        // -- big numbers and format exception
+      }
     }
     return null;
   }
 }
 
 class _ParsedResult {
-  final int extractedNumber;
+  final num extractedNumber;
   final int charactersCount;
   final int startAtIndex;
   final String textPart;

lib/controller/json_to_history_parser.dart

@@ -439,10 +439,12 @@ class JsonToHistoryParser {
     HistoryController.inst.updateMostPlayedPlaylist();
 
     // -- youtube history --
-    YoutubeHistoryController.inst.removeDuplicatedItems(datesAddedYoutube);
-    YoutubeHistoryController.inst.sortHistoryTracks(datesAddedYoutube);
-    await YoutubeHistoryController.inst.saveHistoryToStorage(datesAddedYoutube);
-    YoutubeHistoryController.inst.updateMostPlayedPlaylist();
+    if (datesAddedYoutube.isNotEmpty) {
+      YoutubeHistoryController.inst.removeDuplicatedItems(datesAddedYoutube);
+      YoutubeHistoryController.inst.sortHistoryTracks(datesAddedYoutube);
+      await YoutubeHistoryController.inst.saveHistoryToStorage(datesAddedYoutube);
+      YoutubeHistoryController.inst.updateMostPlayedPlaylist();
+    }
 
     isParsing.value = false;
 
@@ -597,8 +599,8 @@ class JsonToHistoryParser {
     if (isMatchingTypeLink) {
       tracksIdsMap = <String, List<Track>>{};
       allTracks.loop((trMap) {
-        String? videoId = NamidaLinkUtils.extractYoutubeId(trMap['comment'] as String);
-        videoId ??= NamidaLinkUtils.extractYoutubeId(trMap['filename'] as String);
+        String? videoId = NamidaLinkUtils.extractYoutubeId(trMap['comment'] as String? ?? '');
+        videoId ??= NamidaLinkUtils.extractYoutubeId(trMap['filename'] as String? ?? '');
         if (videoId != null && videoId.isNotEmpty) {
           tracksIdsMap!.addForce(videoId, Track.decide(trMap['path'], trMap['v']));
         }
@@ -767,8 +769,8 @@ class JsonToHistoryParser {
     Iterable<Track> tracks = <Track>[];
 
     if (tracksIdsMap != null) {
-      final match = tracksIdsMap[vh.id] ?? [];
-      if (match.isNotEmpty) {
+      final match = tracksIdsMap[vh.id];
+      if (match != null && match.isNotEmpty) {
         tracks = matchAll ? match : [match.first];
       }
     }

lib/controller/platform/waveform_extractor/waveform_extractor_windows.dart

@@ -7,7 +7,10 @@ class _WaveformExtractorWindows extends WaveformExtractor {
   late String ffmpegExePath;
   late String waveformExePath;
 
-  static const _supportedFormats = <String>{'wav', 'flac', 'mp3', 'ogg', 'opus', 'webm'};
+  static const _supportedFormats = <String>{
+    'wav', 'flac', 'mp3', 'ogg', 'opus', 'webm', //
+    'WAV', 'FLAC', 'MP3', 'OGG', 'OPUS', 'WEBM',
+  };
 
   @override
   void init() {

lib/controller/waveform_controller.dart

@@ -109,8 +109,8 @@ class WaveformController {
     final dynamicScale = _currentScaleMap[posInMap] ?? 0.01;
     final intensity = settings.animatingThumbnailIntensity.value;
     final finalScale = dynamicScale * intensity * 0.00005;
-
-    return finalScale.isNaN ? 0.01 : finalScale;
+    if (finalScale.isNaN || finalScale > 0.3) return 0.01;
+    return finalScale;
   }
 
   final _waveformExtractor = WaveformExtractor.platform()..init();

lib/youtube/controller/youtube_controller.dart

@@ -310,7 +310,7 @@ class YoutubeController {
     }
   }
 
-  static const String cleanupFilenameRegex = r'[*#\$|/\\!^:"]';
+  static const String cleanupFilenameRegex = r'[*#\$|/\\!^:"\?]';
   String cleanupFilename(String filename) => filename.replaceAll(RegExp(cleanupFilenameRegex, caseSensitive: false), '_');
 
   // -- things here are not refreshed. should be called in startup only.
@@ -582,7 +582,7 @@ class YoutubeController {
     latestEditedGroupDownloadTask[groupName] = DateTime.now().millisecondsSinceEpoch;
   }
 
-  final _completersVAI = <YoutubeItemDownloadConfig, Completer<VideoStreamsResult>>{};
+  final _completersVAI = <YoutubeItemDownloadConfig, Completer<VideoStreamsResult?>>{};
 
   Future<void> downloadYoutubeVideos({
     required List<YoutubeItemDownloadConfig> itemsConfig,

lib/youtube/functions/video_download_options.dart

@@ -2,7 +2,6 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 
-import 'package:namida/class/file_parts.dart';
 import 'package:namida/controller/ffmpeg_controller.dart';
 import 'package:namida/controller/navigator_controller.dart';
 import 'package:namida/controller/settings_controller.dart';
@@ -288,7 +287,7 @@ class YTDownloadOptionFolderListTileState extends State<YTDownloadOptionFolderLi
     int rootFiles = 0;
     Directory(AppDirs.YOUTUBE_DOWNLOADS).listSyncSafe().loop((d) {
       if (d is Directory) {
-        availableDirectoriesNames[d.path.getDirectoryName] = 0;
+        availableDirectoriesNames[d.path.splitLast(Platform.pathSeparator)] = 0;
       } else {
         rootFiles++;
       }
@@ -312,7 +311,7 @@ class YTDownloadOptionFolderListTileState extends State<YTDownloadOptionFolderLi
   void onFolderAdd(String name) {
     onGroupNameChanged(name);
     try {
-      availableDirectoriesNames[name] = Directory(FileParts.joinPath(AppDirs.YOUTUBE_DOWNLOADS, name)).listSyncSafe().length; // prolly 0 but eghh maybe edge cases
+      availableDirectoriesNames[name] = 0;
     } catch (_) {}
     widget.onDownloadFolderAdded?.call(name);
   }

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.6.06-beta+241027216
+version: 4.6.1-beta+241027217
 
 environment:
   sdk: ">=3.4.0 <4.0.0"