perf: use splitFirst & splitLast methods

MSOB7YY · MSOB7YY · commit c556ceae1acd · 2024-06-21T15:58:10.000+03:00
diff --git a/lib/base/audio_handler.dart b/lib/base/audio_handler.dart
@@ -1226,7 +1226,7 @@ class NamidaAudioVideoHandler<Q extends Playable> extends BasicAudioHandler<Q> {
     final languagesAndBitrate = filenamewe.substring(12, filenamewe.length - 1).split('_');
     final languageCode = languagesAndBitrate.length >= 2 ? languagesAndBitrate[0] : null;
     final languageName = languagesAndBitrate.length >= 3 ? languagesAndBitrate[1] : null;
-    final bitrateText = filenamewe.split('_').last;
+    final bitrateText = filenamewe.splitLast('_');
     return AudioCacheDetails(
       file: file,
       bitrate: int.tryParse(bitrateText),
diff --git a/lib/class/track.dart b/lib/class/track.dart
@@ -334,7 +334,7 @@ extension TrackExtUtils on TrackExtended {
   String get extension => path.getExtension;
   String get folderPath => path.getDirectoryName;
   Folder get folder => Folder(folderPath);
-  String get folderName => folderPath.split(Platform.pathSeparator).last;
+  String get folderName => folderPath.splitLast(Platform.pathSeparator);
   String get pathToImage {
     final identifier = settings.groupArtworksByAlbum.value ? albumIdentifier : filename;
     return "${AppDirs.ARTWORKS}$identifier.png";
@@ -510,7 +510,7 @@ extension TrackUtils on Track {
   String get extension => path.getExtension;
   String get folderPath => path.getDirectoryName;
   Folder get folder => Folder(folderPath);
-  String get folderName => folderPath.split(Platform.pathSeparator).last;
+  String get folderName => folderPath.splitLast(Platform.pathSeparator);
   String get pathToImage {
     final identifier = settings.groupArtworksByAlbum.value ? albumIdentifier : filename;
     return "${AppDirs.ARTWORKS}$identifier.png";
diff --git a/lib/controller/file_browser.dart b/lib/controller/file_browser.dart
@@ -622,7 +622,7 @@ class _NamidaFileBrowserState<T extends FileSystemEntity> extends State<_NamidaF
 
     if (excludeHidden && extensions.isNotEmpty) {
       items.loop((e) {
-        final filename = e.path.split(_pathSeparator).last;
+        final filename = e.path.splitLast(_pathSeparator);
         if (e is Directory) {
           if (!filename.startsWith('.')) onAdd(e);
         } else {
@@ -631,13 +631,13 @@ class _NamidaFileBrowserState<T extends FileSystemEntity> extends State<_NamidaF
       });
     } else if (excludeHidden) {
       items.loop((e) {
-        final fileorDirName = e.path.split(_pathSeparator).last;
+        final fileorDirName = e.path.splitLast(_pathSeparator);
         if (!fileorDirName.startsWith('.')) onAdd(e);
       });
     } else if (extensions.isNotEmpty) {
       items.loop((e) {
         if (e is File) {
-          final filename = e.path.split(_pathSeparator).last;
+          final filename = e.path.splitLast(_pathSeparator);
           if (extensions.any((ext) => filename.endsWith(ext))) onAdd(e);
         } else {
           onAdd(e);
diff --git a/lib/controller/generators_controller.dart b/lib/controller/generators_controller.dart
@@ -22,9 +22,9 @@ class NamidaGenerator extends NamidaGeneratorBase<TrackWithDate, Track> {
         final l = Indexer.getTitleAndArtistFromFilename(trackFilename);
         final trackTitle = l.$1;
         final trackArtist = l.$2;
-        final matching1 = fileSystemFilenameCleaned.contains(trackFilename.cleanUpForComparison);
-        final matching2 = fileSystemFilenameCleaned.contains(trackTitle.split('(').first) && fileSystemFilenameCleaned.contains(trackArtist);
-        return matching1 || matching2;
+        if (fileSystemFilenameCleaned.contains(trackFilename.cleanUpForComparison)) return true;
+        if (fileSystemFilenameCleaned.contains(trackTitle.splitFirst('(')) && fileSystemFilenameCleaned.contains(trackArtist)) return true;
+        return false;
       },
     );
   }
diff --git a/lib/controller/indexer_controller.dart b/lib/controller/indexer_controller.dart
@@ -1044,8 +1044,8 @@ class Indexer {
     final artist = titleAndArtist.length >= 2 ? titleAndArtist[0].trimAll() : UnknownTags.ARTIST;
 
     // TODO: split by ( and ) too, but retain Remixes and feat.
-    final cleanedUpTitle = title.split('[').first.trimAll();
-    final cleanedUpArtist = artist.split(']').last.trimAll();
+    final cleanedUpTitle = title.splitFirst('[').trimAll();
+    final cleanedUpArtist = artist.splitLast(']').trimAll();
 
     return (cleanedUpTitle, cleanedUpArtist);
   }
diff --git a/lib/controller/json_to_history_parser.dart b/lib/controller/json_to_history_parser.dart
@@ -954,7 +954,7 @@ class JsonToHistoryParser {
               config: artistsSplitConfig,
             );
             final matchingArtist = artistsList.isNotEmpty && pieces[0].cleanUpForComparison.contains(artistsList.first.cleanUpForComparison);
-            final matchingTitle = pieces[2].cleanUpForComparison.contains(title.split('(').first.split('[').first.cleanUpForComparison);
+            final matchingTitle = pieces[2].cleanUpForComparison.contains(title.splitFirst('(').splitFirst('[').cleanUpForComparison);
             return matchingArtist && matchingTitle;
           },
         );
diff --git a/lib/controller/search_sort_controller.dart b/lib/controller/search_sort_controller.dart
@@ -965,7 +965,7 @@ class SearchSortController {
           while (pathN.isNotEmpty && pathN[pathN.length - 1] == Platform.pathSeparator) {
             pathN = pathN.substring(0, pathN.length);
           }
-          if (cleanupFunction(pathN.split(Platform.pathSeparator).last).contains(cleanupFunction(text))) {
+          if (cleanupFunction(pathN.splitLast(Platform.pathSeparator)).contains(cleanupFunction(text))) {
             results.add(pathN);
           }
         });
diff --git a/lib/controller/storage_cache_manager.dart b/lib/controller/storage_cache_manager.dart
@@ -423,7 +423,7 @@ class _VideoTrimmer {
     final filesMap = <File, int>{};
     void checkFile(FileSystemEntity e) {
       if (e is File) {
-        final filename = e.path.split(Platform.pathSeparator).last;
+        final filename = e.path.splitLast(Platform.pathSeparator);
         if (filename.startsWith(id)) {
           filesMap[e] = e.statSync().size;
         }
@@ -513,7 +513,7 @@ class _AudioTrimmer {
     Directory(dirPath).listSyncSafe().loop((e) {
       if (e.path.endsWith('.part')) {
         if (e is File) {
-          final filename = e.path.split(Platform.pathSeparator).last;
+          final filename = e.path.splitLast(Platform.pathSeparator);
           if (filename.startsWith(id)) {
             filesMap[e] = e.statSync().size;
           }
diff --git a/lib/controller/thumbnail_manager.dart b/lib/controller/thumbnail_manager.dart
@@ -43,9 +43,9 @@ class ThumbnailManager {
     String? finalUrl = url;
     final imageUrl = finalUrl?.split('i.ytimg.com/vi/');
     if (imageUrl != null && imageUrl.length > 1) {
-      finalUrl = imageUrl.last.split('?').first.replaceAll('/', '_');
+      finalUrl = imageUrl.last.splitFirst('?').replaceAll('/', '_');
     } else {
-      if (finalUrl != null) finalUrl = '${finalUrl.split('/').last.split('=').first}.png';
+      if (finalUrl != null) finalUrl = '${finalUrl.splitLast('/').splitFirst('=')}.png';
     }
 
     final dirPrefix = isTemp ? 'temp/' : '';
diff --git a/lib/core/constants.dart b/lib/core/constants.dart
@@ -11,6 +11,7 @@ import 'package:namida/class/lang.dart';
 import 'package:namida/class/track.dart';
 import 'package:namida/controller/indexer_controller.dart';
 import 'package:namida/controller/settings_controller.dart';
+import 'package:namida/core/extensions.dart';
 
 class NamidaDeviceInfo {
   static int sdkVersion = 21;
@@ -112,7 +113,7 @@ class NamidaLinkUtils {
       try {
         if (match.groupCount == 3) {
           dur = Duration(
-            hours: int.parse(match[1]!.split(':').first),
+            hours: int.parse(match[1]!.splitFirst(':')),
             minutes: int.parse(match[2]!),
             seconds: int.parse(match[3]!),
           );
diff --git a/lib/main.dart b/lib/main.dart
@@ -412,7 +412,7 @@ Future<void> setJiffyLocale(String code) async {
     await Jiffy.setLocale(code);
   } catch (e) {
     try {
-      await Jiffy.setLocale(code.split('_').first);
+      await Jiffy.setLocale(code.splitFirst('_'));
     } catch (_) {}
   }
 }
diff --git a/lib/packages/miniplayer.dart b/lib/packages/miniplayer.dart
@@ -203,7 +203,7 @@ class NamidaMiniPlayerTrack extends StatelessWidget {
             final videoQuality = currentVideo?.resolution ?? 0;
             final videoFramerate = currentVideo?.framerateText(30);
             final markText = VideoController.inst.isNoVideosAvailable.valueR ? 'x' : '?';
-            final fallbackQualityLabel = currentVideo?.nameInCache?.split('_').last;
+            final fallbackQualityLabel = currentVideo?.nameInCache?.splitLast('_');
             final qualityText = videoQuality == 0 ? fallbackQualityLabel ?? markText : '${videoQuality}p';
             final framerateText = videoFramerate ?? '';
             return !settings.enableVideoPlayback.valueR
diff --git a/lib/ui/pages/about_page.dart b/lib/ui/pages/about_page.dart
@@ -95,7 +95,7 @@ class _AboutPageState extends State<AboutPage> {
     const textTopPadding = 28.0 * 2;
     final version = _prettyVersion(NamidaDeviceInfo.version) ?? '';
     final buildDateDiff = _getDateDifferenceText();
-    final latestVersion = _prettyVersion(_latestCheckedVersion)?.split('+').first;
+    final latestVersion = _prettyVersion(_latestCheckedVersion)?.splitFirst('+');
     final isBeta = version.endsWith('beta');
 
     final fallbackAvatar = SizedBox(
diff --git a/lib/ui/widgets/settings/advanced_settings.dart b/lib/ui/widgets/settings/advanced_settings.dart
@@ -683,7 +683,14 @@ class __ClearImageCacheListTileState extends State<_ClearImageCacheListTile> {
                             active: dirsChoosen.contains(e),
                             dense: true,
                             icon: Broken.cpu_setting,
-                            title: e.split(Platform.pathSeparator).lastWhereEff((e) => e != '') ?? e,
+                            title: e.splitLastM(
+                                  Platform.pathSeparator,
+                                  onMatch: (part) {
+                                    if (part.isNotEmpty) return part;
+                                    return null;
+                                  },
+                                ) ??
+                                e,
                             subtitle: subtitle,
                             onTap: () => dirsChoosen.addOrRemove(e),
                           ),
diff --git a/lib/youtube/controller/youtube_controller.dart b/lib/youtube/controller/youtube_controller.dart
@@ -515,8 +515,8 @@ class YoutubeController {
     VideoStream? plsLoop(bool webm) {
       for (int i = 0; i < streams.length; i++) {
         final q = streams[i];
-        final webmCondition = webm ? true : q.formatSuffix != 'webm';
-        if (webmCondition && preferredQualities.contains(q.resolution?.split('p').first)) {
+        final webmCondition = webm ? true : !q.isWebm;
+        if (webmCondition && preferredQualities.contains(q.qualityLabel.splitFirst('p'))) {
           return q;
         }
       }
@@ -809,7 +809,7 @@ class YoutubeController {
   Future<void> loadDownloadTasksInfoFile() async {
     await for (final f in Directory(AppDirs.YT_DOWNLOAD_TASKS).list()) {
       if (f is File) {
-        final groupName = f.path.getFilename.split('.').first;
+        final groupName = f.path.getFilename.splitFirst('.');
         final res = await f.readAsJson() as Map<String, dynamic>?;
         if (res != null) {
           final fileModified = f.statSync().modified;
@@ -1276,7 +1276,7 @@ class YoutubeController {
   }) async {
     if (id == '') return null;
 
-    if (filename.split('.').last != fileExtension) filename = "$filename.$fileExtension";
+    if (filename.splitLast('.') != fileExtension) filename = "$filename.$fileExtension";
 
     final filenameClean = cleanupFilename(filename);
     if (filenameClean != filename) {
diff --git a/lib/youtube/controller/youtube_import_controller.dart b/lib/youtube/controller/youtube_import_controller.dart
@@ -135,7 +135,7 @@ class YoutubeImportController {
 
     _YTPlaylistDetails getPlaylistDetailsNew(List<String> header, List<String> split) {
       final map = <String, String>{};
-      header.loopAdv((part, index) => map[part.toLowerCase().split('playlist').last.split('(').first] ??= split[index]);
+      header.loopAdv((part, index) => map[part.toLowerCase().splitLast('playlist').splitFirst('(')] ??= split[index]);
       return (
         playlistID: map['playlist id'] ?? '',
         channelID: map['channel id'] ?? '',
diff --git a/lib/youtube/controller/youtube_subscriptions_controller.dart b/lib/youtube/controller/youtube_subscriptions_controller.dart
@@ -14,11 +14,11 @@ class YoutubeSubscriptionsController {
 
   YoutubeSubscription? getChannel(String channelId) => _availableChannels[channelId];
   void setChannel(String channelId, YoutubeSubscription channel) => _availableChannels[channelId] = channel;
-  String? idOrUrlToChannelID(String? idOrURL) => idOrURL?.split('/').last;
+  String? idOrUrlToChannelID(String? idOrURL) => idOrURL?.splitLast('/');
 
   /// Updates a channel subscription status, use null to toggle.
   Future<void> changeChannelStatus(String channelIDOrURL, {bool? subscribe}) async {
-    final channelID = channelIDOrURL.split('/').last;
+    final channelID = channelIDOrURL.splitLast('/');
     final valInMap = _availableChannels[channelID];
     final newSubscribed = subscribe ?? !(valInMap?.subscribed ?? false);
     _availableChannels[channelID] = YoutubeSubscription(
diff --git a/lib/youtube/functions/video_download_options.dart b/lib/youtube/functions/video_download_options.dart
@@ -259,7 +259,7 @@ class YTDownloadOptionFolderListTileState extends State<YTDownloadOptionFolderLi
     int rootFiles = 0;
     for (final d in Directory(AppDirs.YOUTUBE_DOWNLOADS).listSyncSafe()) {
       if (d is Directory) {
-        availableDirectoriesNames[d.path.split(Platform.pathSeparator).last] = Directory(d.path).listSyncSafe().length;
+        availableDirectoriesNames[d.path.splitLast(Platform.pathSeparator)] = Directory(d.path).listSyncSafe().length;
       } else {
         rootFiles++;
       }
diff --git a/lib/youtube/pages/yt_channel_subpage.dart b/lib/youtube/pages/yt_channel_subpage.dart
@@ -43,7 +43,7 @@ class YTChannelSubpage extends StatefulWidget with NamidaRouteWidget {
 class _YTChannelSubpageState extends YoutubeChannelController<YTChannelSubpage> {
   late final YoutubeSubscription ch = YoutubeSubscriptionsController.inst.getChannel(widget.channelID) ??
       YoutubeSubscription(
-        channelID: widget.channelID.split('/').last,
+        channelID: widget.channelID.splitLast('/'),
         subscribed: false,
       );
 
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: 2.7.45-beta+240620181
+version: 2.7.5-beta+240621129
 
 environment:
   sdk: ">=3.4.0 <4.0.0"

Original file line number	Diff line number	Diff line change
`@@ -1044,8 +1044,8 @@ class Indexer {`
`1044`	`1044`	`final artist = titleAndArtist.length >= 2 ? titleAndArtist[0].trimAll() : UnknownTags.ARTIST;`
`1045`	`1045`
`1046`	`1046`	`// TODO: split by ( and ) too, but retain Remixes and feat.`
`1047`		`- final cleanedUpTitle = title.split('[').first.trimAll();`
`1048`		`- final cleanedUpArtist = artist.split(']').last.trimAll();`
	`1047`	`+ final cleanedUpTitle = title.splitFirst('[').trimAll();`
	`1048`	`+ final cleanedUpArtist = artist.splitLast(']').trimAll();`
`1049`	`1049`
`1050`	`1050`	`return (cleanedUpTitle, cleanedUpArtist);`
`1051`	`1051`	`}`
Original file line number	Diff line number	Diff line change
`@@ -965,7 +965,7 @@ class SearchSortController {`
`965`	`965`	`while (pathN.isNotEmpty && pathN[pathN.length - 1] == Platform.pathSeparator) {`
`966`	`966`	`pathN = pathN.substring(0, pathN.length);`
`967`	`967`	`}`
`968`		`- if (cleanupFunction(pathN.split(Platform.pathSeparator).last).contains(cleanupFunction(text))) {`
	`968`	`+ if (cleanupFunction(pathN.splitLast(Platform.pathSeparator)).contains(cleanupFunction(text))) {`
`969`	`969`	`results.add(pathN);`
`970`	`970`	`}`
`971`	`971`	`});`