Add --no-parent-folder flag (#9)

Author: eilzo

README.md

@@ -12,7 +12,7 @@ API access is available only to users with active subscriptions. Visit https://a
 
 ## Usage
 
-`flutterflow export-code --project <project id> --dest <output folder> --[no-]include-assets --token <token> --[no-]fix`
+`flutterflow export-code --project <project id> --dest <output folder> --[no-]include-assets --token <token> --[no-]fix --[no]-parent-folder`
 
 Alternatively, instead of passing `--token` you can set `FLUTTERFLOW_API_TOKEN` environment variable.
 
@@ -26,6 +26,7 @@ Alternatively, instead of passing `--token` you can set `FLUTTERFLOW_API_TOKEN`
 | `--[no-]include-assets`   | None        | [Optional] Whether to include media assets. Defaults to `false` |
 | `--branch-name`   | `-b`        | [Optional] Which branch to download. Defaults to `main` |
 | `--[no-]fix`   | None        | [Optional] Whether to run `dart fix` on the downloaded code. Defaults to `false`. |
+| `--[no-]parent-folder`   | None        | [Optional] Whether to download code into a project-named sub-folder. If true, downloads all project files directly to the specified directory. Defaults to `true`. |
 
 ## Issues
 

bin/flutterflow_cli.dart

@@ -28,6 +28,7 @@ void main(List<String> args) async {
     destinationPath: parsedArguments.command!['dest'],
     includeAssets: parsedArguments.command!['include-assets'],
     branchName: parsedArguments.command!['branch-name'],
+    unzipToParentFolder: parsedArguments.command!['parent-folder'],
     fix: parsedArguments.command!['fix'],
   );
 }
@@ -53,6 +54,15 @@ ArgResults _parseArgs(List<String> args) {
       negatable: true,
       help: 'Run "dart fix" on the downloaded code.',
       defaultsTo: false,
+    )
+    ..addFlag(
+      'parent-folder',
+      negatable: true,
+      help: 'Download into a sub-folder. By default, project is downloaded \n'
+          'into a folder named <project>.\nSetting this flag to false will '
+          'download all project code directly into the specified directory, '
+          'or the current directory if --dest is not set.',
+      defaultsTo: true,
     );
 
   final parser = ArgParser()
@@ -101,6 +111,7 @@ Future _exportCode({
   required String projectId,
   required String destinationPath,
   required bool includeAssets,
+  required bool unzipToParentFolder,
   required bool fix,
   String? branchName,
 }) async {
@@ -118,19 +129,26 @@ Future _exportCode({
     // Download actual code
     final projectZipBytes = base64Decode(result['project_zip']);
     final projectFolder = ZipDecoder().decodeBytes(projectZipBytes);
-    extractArchiveToDisk(projectFolder, destinationPath);
+
+    if (unzipToParentFolder) {
+      extractArchiveToDisk(projectFolder, destinationPath);
+    } else {
+      extractArchiveToCurrentDirectory(projectFolder, destinationPath);
+    }
 
     final postCodeGenerationFutures = <Future>[
       if (fix)
         _runFix(
           destinationPath: destinationPath,
           projectFolder: projectFolder,
+          unzipToParentFolder: unzipToParentFolder,
         ),
       if (includeAssets)
         _downloadAssets(
           client: client,
           destinationPath: destinationPath,
           assetDescriptions: result['assets'],
+          unzipToParentFolder: unzipToParentFolder,
         ),
     ];
 
@@ -142,6 +160,31 @@ Future _exportCode({
   }
 }
 
+// Extract files to the specified directory without a project-named
+// parent folder.
+void extractArchiveToCurrentDirectory(
+  Archive projectFolder,
+  String destinationPath,
+) {
+  for (final file in projectFolder.files) {
+    if (file.isFile) {
+      final data = file.content as List<int>;
+      final filename = file.name;
+
+      // Remove the `<project>` prefix from paths.
+      final path = path_util.join(
+          destinationPath,
+          path_util.joinAll(
+            path_util.split(filename).sublist(1),
+          ));
+
+      final fileOut = File(path);
+      fileOut.createSync(recursive: true);
+      fileOut.writeAsBytesSync(data);
+    }
+  }
+}
+
 Future<dynamic> _callExport({
   required final http.Client client,
   required String token,
@@ -192,9 +235,16 @@ Future _downloadAssets({
   required final http.Client client,
   required String destinationPath,
   required List<dynamic> assetDescriptions,
+  required unzipToParentFolder,
 }) async {
   final futures = assetDescriptions.map((assetDescription) async {
-    final path = assetDescription['path'];
+    String path = assetDescription['path'];
+
+    if (!unzipToParentFolder) {
+      path = path_util.joinAll(
+        path_util.split(path).sublist(1),
+      );
+    }
     final url = assetDescription['url'];
     final fileDest = path_util.join(destinationPath, path);
     try {
@@ -215,6 +265,7 @@ Future _downloadAssets({
 Future _runFix({
   required String destinationPath,
   required Archive projectFolder,
+  required unzipToParentFolder,
 }) async {
   try {
     if (projectFolder.isEmpty) {
@@ -223,10 +274,14 @@ Future _runFix({
     final firstFilePath = projectFolder.files.first.name;
     final directory = path_util.split(firstFilePath).first;
 
+    final workingDirectory = unzipToParentFolder
+        ? path_util.join(destinationPath, directory)
+        : destinationPath;
+
     final pubGetResult = await Process.run(
       'flutter',
       ['pub', 'get'],
-      workingDirectory: path_util.join(destinationPath, directory),
+      workingDirectory: workingDirectory,
       runInShell: true,
       stdoutEncoding: utf8,
       stderrEncoding: utf8,