perf: Directory.listAllIsolate()

easier to allow multiple dir listing in the same isolate
namidaco · Jan 22, 2024 · f227d05 · f227d05
1 parent 1b889ef
commit f227d05
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 39 deletions.
diff --git a/lib/controller/ffmpeg_controller.dart b/lib/controller/ffmpeg_controller.dart
@@ -206,7 +206,7 @@ class NamidaFFMPEG {
     final dirFiles = <FileSystemEntity>[];
 
     for (final d in dirs) {
-      dirFiles.addAll(Directory(d).listSyncSafe(recursive: recursive));
+      dirFiles.addAll(await Directory(d).listAllIsolate(recursive: recursive));
     }
 
     dirFiles.retainWhere((element) => element is File);
@@ -238,7 +238,7 @@ class NamidaFFMPEG {
     if (!await requestManageStoragePermission()) return;
 
     final dio = Dio();
-    final allFiles = Directory(directoryPath).listSyncSafe(recursive: recursive);
+    final allFiles = await Directory(directoryPath).listAllIsolate(recursive: recursive);
     final totalFilesLength = allFiles.length;
     int currentProgress = 0;
     int currentFailed = 0;

diff --git a/lib/core/extensions.dart b/lib/core/extensions.dart
@@ -429,6 +429,28 @@ extension DirectoryUtils on Directory {
       return [];
     }
   }
+
+  Future<List<FileSystemEntity>> listAllIsolate({bool recursive = false, bool followLinks = true}) async {
+    try {
+      final params = {
+        'dirPath': path,
+        'recursive': recursive,
+        'followLinks': followLinks,
+      };
+      final res = await compute(_listAllIsolate, params);
+      return res;
+    } catch (e) {
+      printy(e, isError: true);
+      return [];
+    }
+  }
+}
+
+List<FileSystemEntity> _listAllIsolate(Map params) {
+  final dirPath = params['dirPath'] as String;
+  final recursive = params['recursive'] as bool;
+  final followLinks = params['followLinks'] as bool;
+  return Directory(dirPath).listSync(recursive: recursive, followLinks: followLinks);
 }
 
 extension FileUtils on File {

diff --git a/lib/ui/dialogs/general_popup_dialog.dart b/lib/ui/dialogs/general_popup_dialog.dart
@@ -437,7 +437,7 @@ Future<void> showGeneralPopupDialog(
     final dirPath = await FilePicker.platform.getDirectoryPath();
     if (dirPath == null) return;
 
-    final files = Directory(dirPath).listSyncSafe();
+    final files = await Directory(dirPath).listAllIsolate();
     files.removeWhere((element) => element is! File);
     if (files.isEmpty) {
       snackyy(title: lang.ERROR, message: lang.NO_TRACKS_FOUND_IN_DIRECTORY);

diff --git a/lib/youtube/controller/youtube_controller.dart b/lib/youtube/controller/youtube_controller.dart
@@ -150,25 +150,37 @@ class YoutubeController {
     if (res.$2.isNotEmpty) tempChannelInfo = res.$2;
   }
 
-  static (Map<String, VideoInfo?> mv, Map<String, YoutubeChannel?> mc) _loadInfoToMemoryIsolate((String pv, String pc) paths) {
+  static Future<(Map<String, VideoInfo?>, Map<String, YoutubeChannel?>)> _loadInfoToMemoryIsolate((String pv, String pc) paths) async {
     final mv = <String, VideoInfo?>{};
     final mc = <String, YoutubeChannel?>{};
-    Directory(paths.$1).listSyncSafe().loop((e, index) {
-      if (e is File) {
-        try {
-          final map = e.readAsJsonSync();
-          mv[e.path.getFilenameWOExt] = VideoInfo.fromMap(map);
-        } catch (_) {}
-      }
+
+    final completer1 = Completer<void>();
+    final completer2 = Completer<void>();
+
+    Directory(paths.$1).listAllIsolate().then((value) {
+      value.loop((e, index) {
+        if (e is File) {
+          try {
+            final map = e.readAsJsonSync();
+            mv[e.path.getFilenameWOExt] = VideoInfo.fromMap(map);
+          } catch (_) {}
+        }
+      });
+      completer1.complete();
     });
-    Directory(paths.$2).listSyncSafe().loop((e, index) {
-      if (e is File) {
-        try {
-          final map = e.readAsJsonSync();
-          mc[e.path.getFilenameWOExt] = YoutubeChannel.fromMap(map);
-        } catch (_) {}
-      }
+    Directory(paths.$2).listAllIsolate().then((value) {
+      value.loop((e, index) {
+        if (e is File) {
+          try {
+            final map = e.readAsJsonSync();
+            mc[e.path.getFilenameWOExt] = YoutubeChannel.fromMap(map);
+          } catch (_) {}
+        }
+      });
+      completer2.complete();
     });
+    await completer1.future;
+    await completer2.future;
     return (mv, mc);
   }
 

diff --git a/lib/youtube/controller/youtube_local_search_controller.dart b/lib/youtube/controller/youtube_local_search_controller.dart
@@ -90,7 +90,7 @@ class YTLocalSearchController {
     isLoadingLookupLists.value = false;
   }
 
-  static void _prepareResourcesAndSearch(Map params) {
+  static void _prepareResourcesAndSearch(Map params) async {
     final tempStreamInfo = params['tempStreamInfo'] as Map<String, StreamInfoItem>;
     final dirStreamInfo = params['dirStreamInfo'] as String;
     final dirVideoInfo = params['dirVideoInfo'] as String;
@@ -230,30 +230,41 @@ class YTLocalSearchController {
       lookupItemAvailable[id] = (list: 1, index: lookupListStreamInfo.length - 1);
     }
 
-    Directory(dirStreamInfo).listSyncSafe().loop((file, _) {
-      try {
-        final res = (file as File).readAsJsonSync();
-        if (res != null) {
-          final id = res['id'];
-          if (id != null && lookupItemAvailable[id] == null) {
-            lookupListStreamInfoMap.add(res);
-            lookupItemAvailable[id] = (list: 2, index: lookupListStreamInfoMap.length - 1);
+    final completer1 = Completer<void>();
+    final completer2 = Completer<void>();
+
+    Directory(dirStreamInfo).listAllIsolate().then((value) {
+      value.loop((file, _) {
+        try {
+          final res = (file as File).readAsJsonSync();
+          if (res != null) {
+            final id = res['id'];
+            if (id != null && lookupItemAvailable[id] == null) {
+              lookupListStreamInfoMap.add(res);
+              lookupItemAvailable[id] = (list: 2, index: lookupListStreamInfoMap.length - 1);
+            }
           }
-        }
-      } catch (_) {}
+        } catch (_) {}
+      });
+      completer1.complete();
     });
-    Directory(dirVideoInfo).listSyncSafe().loop((file, _) {
-      try {
-        final res = (file as File).readAsJsonSync();
-        if (res != null) {
-          final id = res['id'];
-          if (id != null && lookupItemAvailable[id] == null) {
-            lookupListVideoInfoMap.add(res.cast());
-            lookupItemAvailable[id] = (list: 3, index: lookupListVideoInfoMap.length - 1);
+    Directory(dirVideoInfo).listAllIsolate().then((value) {
+      value.loop((file, _) {
+        try {
+          final res = (file as File).readAsJsonSync();
+          if (res != null) {
+            final id = res['id'];
+            if (id != null && lookupItemAvailable[id] == null) {
+              lookupListVideoInfoMap.add(res.cast());
+              lookupItemAvailable[id] = (list: 3, index: lookupListVideoInfoMap.length - 1);
+            }
           }
-        }
-      } catch (_) {}
+        } catch (_) {}
+      });
+      completer2.complete();
     });
+    await completer1.future;
+    await completer2.future;
     for (final id in tempBackupYTVH.keys) {
       if (lookupItemAvailable[id] == null) {
         final val = tempBackupYTVH[id]!;