o

lib/apps/mac.dart

@@ -5,6 +5,17 @@ import 'package:path/path.dart' as path;
 import 'package:event_bus/event_bus.dart';
 import '../filesize.dart';
 
+const skipDirs = ["/Library/Caches/ColorSync",
+"/Library/logs/DiagnosticReports",
+"/Library/logs/CrashReporter",
+"/var/log/displaypolicy",
+"/var/log/powermanagement",
+"/var/log/asl",
+"/var/log/DiagnosticMessages",
+"/var/log/Bluetooth",
+"/var/log/com.apple.wifivelocity",
+];
+
 class MacTask extends Task{
    String  app = "Mac";
   MacTask(EventBus _globalBus) : super(_globalBus) {
@@ -29,7 +40,7 @@ class MacTask extends Task{
   scan(){
     int total = 0;
     var task = new DirsCleanTask(this.dirs);
-    task.eventBus.on<DirInfo>().listen( (event ) {
+    task.eventBus.on<DirInfo>().skipWhile((element) => skipDirs.indexOf(element.name) != -1 ).listen( (event ) {
       total += event.size;
 
       this.eventBus.fire( TaskData(this.app,event.toString() ) );

lib/apps/python.dart

@@ -32,12 +32,12 @@ class PythonTask extends Task {
     // );
 
     ReceivePort receivePort = ReceivePort();
-    var isolate = await Isolate.spawn(runGetDirectorySize, receivePort.sendPort,
-        onExit: receivePort.sendPort);
+    var isolate = await Isolate.spawn(runGetDirectorySize, receivePort.sendPort);
 
     receivePort.listen((data) {
-      _scan(data);
       isolate.kill(priority: 0);
+      _scan(data);
+
     });
   }
 

lib/apps/ruby.dart

@@ -7,7 +7,7 @@ import 'dart:convert';
 import './ruby_utils.dart';
 import 'dart:isolate';
 
-final RegExp re = new RegExp(r'\.rvm/gems/ruby\-(\d+\.\d+(?:\.\d+)?)/gems');
+// final RegExp re = new RegExp(r'\.rvm/gems/ruby\-(\d+\.\d+(?:\.\d+)?)/cache');
 
 void runGetDirectorySize(SendPort sendPort) {
   filesInDirectoryWithDepth(
@@ -30,21 +30,25 @@ class RubyTask extends Task {
     //   this.eventBus.fire(TaskData(this.app, e.toString()));
     // } );
     ReceivePort receivePort = ReceivePort();
-    var isolate = await Isolate.spawn(runGetDirectorySize, receivePort.sendPort,
-        onExit: receivePort.sendPort);
+    var isolate = await Isolate.spawn(runGetDirectorySize, receivePort.sendPort);
 
     receivePort.listen((data) {
-      _scan(data);
       isolate.kill(priority: 0);
+      _scan(data);
+
     });
   }
 
   _scan(out) async {
-    final days = new DateTime.now().subtract(new Duration(days: 90));
-    var dirs = await filesInDirectory(out, FileSystemEntityType.directory);
+    if(out == null){
+      return;
+    }
+    // final days = new DateTime.now().subtract(new Duration(days: 90));
+    // var dirs = await filesInDirectory(out, FileSystemEntityType.file);
     int total = 0;
-    Stream.fromIterable(dirs)
-        .skipWhile((element) => element.statSync().accessed.isAfter(days))
+    // Stream.fromFuture(dirs)
+    out.list(recursive: false, followLinks: false)
+        // .skipWhile((element) => element.statSync().accessed.isAfter(days))
         .asyncMap((event) async {
       var size = await directorySize(event);
       var data = {"dir": event, "size": size};

lib/apps/ruby_utils.dart

@@ -2,7 +2,7 @@ import 'package:path/path.dart' as path;
 import 'dart:io' show Directory, File, FileSystemEntity, FileSystemEntityType;
 import 'dart:isolate';
 
-final RegExp re = new RegExp(r'\.rvm/gems/ruby\-(\d+\.\d+(?:\.\d+)?)/gems');
+final RegExp re = new RegExp(r'\.rvm/gems/ruby\-(\d+\.\d+(?:\.\d+)?)/cache');
 
 filesInDirectoryWithDepth(Directory dir, FileSystemEntityType typ,
     int currentLevel, int maxLevel,SendPort sendPort)  {

lib/task.dart

@@ -49,6 +49,8 @@ class Task {
     Stream.fromIterable(cache).listen((element) {
       if (element["dir"] is Directory) {
         (element["dir"] as Directory).delete(recursive: true);
+      }else{
+        element["dir"].delete();
       }
     }).onDone(() {
       this
@@ -64,7 +66,12 @@ class Task {
         .asyncMap((event) => directorySize(event["dir"]))
         .reduce((previous, element) => previous + element)
         .then((value) {
-      this.eventBus.fire(TaskData(this.app, fileSizeHumanReadable(value)));
+          if(value == 0){
+            this.eventBus.fire(TaskData(this.app, "empty"));
+          }else{
+            this.eventBus.fire(TaskData(this.app, fileSizeHumanReadable(value)));
+          }
+
       this.cache.clear();
     });
   }

lib/utils.dart

@@ -1,7 +1,8 @@
-import 'dart:io' show Directory, File, FileSystemEntity, FileSystemEntityType,Platform;
+import 'dart:io'
+    show Directory, File, FileSystemEntity, FileSystemEntityType, Platform;
 
 final String userHome =
-      Platform.environment['HOME'] ?? Platform.environment['USERPROFILE'];
+    Platform.environment['HOME'] ?? Platform.environment['USERPROFILE'];
 
 filesInDirectory(Directory dir, FileSystemEntityType typ) async {
   List<dynamic> files = <dynamic>[];
@@ -19,21 +20,27 @@ filesInDirectory(Directory dir, FileSystemEntityType typ) async {
   return files;
 }
 
-
-directorySize(Directory dir) async {
-  if(!dir.existsSync()){
+directorySize( dir) async {
+  if (!dir.existsSync()) {
     return 0;
   }
   var total = 0;
-  await for (var entity in dir.list(recursive: true, followLinks: false)) {
-    FileSystemEntityType type =
-        await FileSystemEntity.type(entity.path, followLinks: false);
-
-    if (type == FileSystemEntityType.file) {
-      var stat = await entity.stat();
-      total += stat.size;
+  if (await FileSystemEntity.type(dir.path, followLinks: false) ==
+      FileSystemEntityType.directory) {
+    await for (var entity in dir.list(recursive: true, followLinks: false)) {
+      FileSystemEntityType type =
+          await FileSystemEntity.type(entity.path, followLinks: false);
+
+      if (type == FileSystemEntityType.file) {
+        var stat = await entity.stat();
+        total += stat.size;
+      }
     }
+  } else {
+    var stat = await dir.stat();
+    total += stat.size;
   }
+
   return total;
 }
 

macos/Podfile.lock

@@ -10,7 +10,7 @@ PODS:
 
 DEPENDENCIES:
   - disk_space (from `Flutter/ephemeral/.symlinks/plugins/disk_space/macos`)
-  - FlutterMacOS (from `Flutter/ephemeral/.symlinks/flutter/darwin-x64-release`)
+  - FlutterMacOS (from `Flutter/ephemeral/.symlinks/flutter/darwin-x64`)
   - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`)
   - url_launcher (from `Flutter/ephemeral/.symlinks/plugins/url_launcher/macos`)
   - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
@@ -19,7 +19,7 @@ EXTERNAL SOURCES:
   disk_space:
     :path: Flutter/ephemeral/.symlinks/plugins/disk_space/macos
   FlutterMacOS:
-    :path: Flutter/ephemeral/.symlinks/flutter/darwin-x64-release
+    :path: Flutter/ephemeral/.symlinks/flutter/darwin-x64
   path_provider_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos
   url_launcher: