fix: fallback for faulty sd card path

ref #199
namidaco · May 18, 2024 · 0b00181 · 0b00181
1 parent 67f11e5
commit 0b00181
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/controller/file_browser.dart b/lib/controller/file_browser.dart
@@ -182,7 +182,8 @@ class _NamidaFileBrowserBase<T extends FileSystemEntity> extends StatefulWidget
       ),
     );
     final all = await completer.future;
-    return all.firstOrNull;
+    if (all.isEmpty) return null;
+    return _fixSDCardDirectory(all[0]);
   }
 
   static Future<List<Directory>> pickDirectories({
@@ -199,7 +200,14 @@ class _NamidaFileBrowserBase<T extends FileSystemEntity> extends StatefulWidget
         allowMultiple: true,
       ),
     );
-    return completer.future;
+    final res = await completer.future;
+    return res.map((e) => _fixSDCardDirectory(e)).toList();
+  }
+
+  static final _sdDirRegex = RegExp(r'/tree/(\w{4}-\w{4}):');
+  static Directory _fixSDCardDirectory(Directory dir) {
+    final replaced = dir.path.replaceFirstMapped(_sdDirRegex, (match) => '/storage/${match.group(1)}/');
+    return Directory(replaced);
   }
 
   @override

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.4.43-beta+240518207
+version: 2.4.44-beta+240518208
 
 environment:
   sdk: ">=3.1.4 <4.0.0"