implement new param initialDirectory for macOS

philenius · philenius · commit 958c92c5342d · 2022-01-27T21:45:25.000+01:00
diff --git a/lib/src/file_picker_macos.dart b/lib/src/file_picker_macos.dart
@@ -5,6 +5,7 @@ class FilePickerMacOS extends FilePicker {
   @override
   Future<FilePickerResult?> pickFiles({
     String? dialogTitle,
+    String? initialDirectory,
     FileType type = FileType.any,
     List<String>? allowedExtensions,
     Function(FilePickerStatus)? onFileLoading,
@@ -22,6 +23,7 @@ class FilePickerMacOS extends FilePicker {
     final List<String> arguments = generateCommandLineArguments(
       escapeDialogTitle(dialogTitle ?? defaultDialogTitle),
       fileFilter: fileFilter,
+      initialDirectory: initialDirectory ?? '',
       multipleFiles: allowMultiple,
       pickDirectory: false,
     );
@@ -50,10 +52,12 @@ class FilePickerMacOS extends FilePicker {
   Future<String?> getDirectoryPath({
     String? dialogTitle,
     bool lockParentWindow = false,
+    String? initialDirectory,
   }) async {
     final String executable = await isExecutableOnPath('osascript');
     final List<String> arguments = generateCommandLineArguments(
       escapeDialogTitle(dialogTitle ?? defaultDialogTitle),
+      initialDirectory: initialDirectory ?? '',
       pickDirectory: true,
     );
 
@@ -72,6 +76,7 @@ class FilePickerMacOS extends FilePicker {
   Future<String?> saveFile({
     String? dialogTitle,
     String? fileName,
+    String? initialDirectory,
     FileType type = FileType.any,
     List<String>? allowedExtensions,
     bool lockParentWindow = false,
@@ -85,6 +90,7 @@ class FilePickerMacOS extends FilePicker {
       escapeDialogTitle(dialogTitle ?? defaultDialogTitle),
       fileFilter: fileFilter,
       fileName: fileName ?? '',
+      initialDirectory: initialDirectory ?? '',
       saveFile: true,
     );
 
@@ -122,6 +128,7 @@ class FilePickerMacOS extends FilePicker {
     String dialogTitle, {
     String fileFilter = '',
     String fileName = '',
+    String initialDirectory = '',
     bool multipleFiles = false,
     bool pickDirectory = false,
     bool saveFile = false,
@@ -141,14 +148,20 @@ class FilePickerMacOS extends FilePicker {
           argument += 'default name "$fileName" ';
         }
       } else {
-        argument += 'of type {$fileFilter} ';
+        if (fileFilter.isNotEmpty) {
+          argument += 'of type {$fileFilter} ';
+        }
 
         if (multipleFiles) {
           argument += 'with multiple selections allowed ';
         }
       }
     }
 
+    if (initialDirectory.isNotEmpty) {
+      argument += 'default location "$initialDirectory" ';
+    }
+
     argument += 'with prompt "$dialogTitle"';
     arguments.add(argument);
 
diff --git a/test/file_picker_macos_test.dart b/test/file_picker_macos_test.dart
@@ -243,7 +243,7 @@ void main() {
 
       expect(
         cliArguments.join(' '),
-        equals('-e choose file of type {} with prompt "Select a file:"'),
+        equals('-e choose file with prompt "Select a file:"'),
       );
     });
 
@@ -277,7 +277,7 @@ void main() {
       expect(
         cliArguments.join(' '),
         equals(
-          '-e choose file of type {} with multiple selections allowed with prompt "Select files:"',
+          '-e choose file with multiple selections allowed with prompt "Select files:"',
         ),
       );
     });
@@ -334,5 +334,51 @@ void main() {
         equals('-e choose folder with prompt "Select a directory:"'),
       );
     });
+
+    test('should generate the arguments for picking a file when an initial directory is given', () {
+      final picker = FilePickerMacOS();
+
+      final cliArguments = picker.generateCommandLineArguments(
+        'Pick a file:',
+        initialDirectory: '/Users/john/Desktop',
+      );
+
+      expect(
+        cliArguments.join(' '),
+        equals('-e choose file default location "/Users/john/Desktop" with prompt "Pick a file:"'),
+      );
+    });
+
+    test('should generate the arguments for picking a directory when an initial directory is given', () {
+      final picker = FilePickerMacOS();
+
+      final cliArguments = picker.generateCommandLineArguments(
+        'Pick directory:',
+        fileName: 'output.pdf',
+        initialDirectory: '/Users/john/workspace',
+        pickDirectory: true,
+      );
+
+      expect(
+        cliArguments.join(' '),
+        equals('-e choose folder default location "/Users/john/workspace" with prompt "Pick directory:"'),
+      );
+    });
+
+    test('should generate the arguments for saving a file when an initial directory is given', () {
+      final picker = FilePickerMacOS();
+
+      final cliArguments = picker.generateCommandLineArguments(
+        'Save as:',
+        fileName: 'output.pdf',
+        initialDirectory: '/Users/john/Downloads',
+        saveFile: true,
+      );
+
+      expect(
+        cliArguments.join(' '),
+        equals('-e choose file name default name "output.pdf" default location "/Users/john/Downloads" with prompt "Save as:"'),
+      );
+    });
   });
 }
