Plugin tool updates

tool/grind.dart

@@ -12,8 +12,8 @@ void main(List<String> args) => grind(args);
 @Task('Check plugin URLs for live-ness')
 void checkUrls() async {
   log('checking URLs in FlutterBundle.properties...');
-  var lines =
-      await File('flutter-idea/src/io/flutter/FlutterBundle.properties').readAsLines();
+  var lines = await File('flutter-idea/src/io/flutter/FlutterBundle.properties')
+      .readAsLines();
   for (var line in lines) {
     var split = line.split('=');
     if (split.length == 2) {

tool/plugin/lib/artifact.dart

@@ -23,9 +23,10 @@ class Artifact {
   bool get isZip => file.endsWith('.zip');
 
   bool exists() {
-    if (FileSystemEntity.isFileSync('artifacts/$file')) return true;
+    var artifactFilePath = p.join('artifacts', file);
+    if (FileSystemEntity.isFileSync(artifactFilePath)) return true;
     convertToTar();
-    return FileSystemEntity.isFileSync('artifacts/$file');
+    return FileSystemEntity.isFileSync(artifactFilePath);
   }
 
   String get outPath => p.join(rootPath, 'artifacts', output);
@@ -39,7 +40,7 @@ class Artifact {
 }
 
 class ArtifactManager {
-  final String base =
+  final String baseUri =
       'https://storage.googleapis.com/flutter_infra_release/flutter/intellij';
 
   final List<Artifact> artifacts = [];
@@ -72,42 +73,44 @@ class ArtifactManager {
         doDownload = false;
       }
 
-      var path = 'artifacts/${artifact.file}';
-      if (FileSystemEntity.isFileSync(path)) {
-        alreadyDownloaded(path);
+      var artifactFilePath = p.join('artifacts', artifact.file);
+      if (FileSystemEntity.isFileSync(artifactFilePath)) {
+        alreadyDownloaded(artifactFilePath);
       } else {
         if (artifact.isZip) {
-          var tarPath = _convertToTar(path);
+          var tarPath = _convertToTar(artifactFilePath);
           if (FileSystemEntity.isFileSync(tarPath)) {
             artifact.convertToTar();
             alreadyDownloaded(tarPath);
           }
         }
         if (doDownload) {
-          log('downloading $path...');
-          result = await curl('$base/${artifact.file}', to: path);
+          log('downloading $artifactFilePath...');
+          var artifactUri = p.join(baseUri, artifact.file);
+
+          result = await download(artifactUri, to: artifactFilePath);
           if (result != 0) {
             log('download failed');
           }
-          var archiveFile = File(path);
+          var archiveFile = File(artifactFilePath);
           if (!_isValidDownloadArtifact(archiveFile)) {
             // If the file is missing the server returns a small file containing
             // an error message. Delete it and try again. The smallest file we
             // store in the cloud is over 700K.
-            log('archive file not found: $base/${artifact.file}');
+            log('archive file not found: $artifactUri');
             archiveFile.deleteSync();
             if (artifact.isZip) {
               artifact.convertToTar();
-              path = 'artifacts/${artifact.file}';
-              result = await curl('$base/${artifact.file}', to: path);
+
+              result = await download(artifactUri, to: artifactFilePath);
               if (result != 0) {
                 log('download failed');
                 artifacts.remove(artifact);
                 continue;
               }
-              var archiveFile = File(path);
+              var archiveFile = File(artifactFilePath);
               if (!_isValidDownloadArtifact(archiveFile)) {
-                log('archive file not found: $base/${artifact.file}');
+                log('archive file not found: $artifactUri');
                 archiveFile.deleteSync();
                 artifacts.remove(artifact);
                 continue;
@@ -122,23 +125,17 @@ class ArtifactManager {
 
       // clear unpacked cache
       if (rebuildCache || !FileSystemEntity.isDirectorySync(artifact.outPath)) {
-        await removeAll(artifact.outPath);
+        removeAll(artifact.outPath);
       }
       if (isCacheDirectoryValid(artifact)) {
         continue;
       }
 
-      // expand
-      if (Directory(artifact.outPath).existsSync()) {
-        await removeAll(artifact.outPath);
-      }
-      createDir(artifact.outPath);
-
       if (artifact.isZip) {
         if (artifact.bareArchive) {
-          result = await exec(
-              'unzip', ['-q', '-d', artifact.output, artifact.file],
-              cwd: 'artifacts');
+          result = extractZip(artifact.file,
+              cwd: 'artifacts', targetDirectory: artifact.output);
+
           var files = Directory(artifact.outPath).listSync();
           if (files.length < 3) /* Might have .DS_Store */ {
             // This is the Mac zip case.
@@ -152,24 +149,15 @@ class ArtifactManager {
             Directory("${artifact.outPath}Temp").renameSync(artifact.outPath);
           }
         } else {
-          result = await exec('unzip', ['-q', artifact.file], cwd: 'artifacts');
+          result = extractZip(artifact.file, cwd: 'artifacts');
         }
       } else {
-        result = await exec(
-          'tar',
-          [
-            '--strip-components=1',
-            '-zxf',
-            artifact.file,
-            '-C',
-            artifact.output
-          ],
-          cwd: p.join(rootPath, 'artifacts'),
-        );
+        result = extractTar(artifact,
+            cwd: 'artifacts', targetDirectory: artifact.output);
       }
       if (result != 0) {
         log('unpacking failed');
-        await removeAll(artifact.output);
+        removeAll(artifact.output);
         break;
       }
 

tool/plugin/lib/edit.dart

@@ -10,6 +10,7 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:meta/meta.dart';
+import 'package:path/path.dart' as p;
 
 import 'build_spec.dart';
 import 'util.dart';
@@ -96,17 +97,20 @@ class Unused extends EditCommand {
 }
 
 class EditAndroidModuleLibraryManager extends EditCommand {
+  final _moduleManagerPath = p.join('flutter-studio', 'src', 'io', 'flutter',
+      'android', 'AndroidModuleLibraryManager.java');
+
   @override
-  String get path =>
-      'flutter-studio/src/io/flutter/android/AndroidModuleLibraryManager.java';
+  String get path => _moduleManagerPath;
 
   @override
   String convert(BuildSpec spec) {
     // Starting with 3.6 we need to call a simplified init().
     // This is where the $PROJECT_FILE$ macro is defined, #registerComponents.
+
+    var libMgrPath = _moduleManagerPath;
     if (spec.version.startsWith('4.2')) {
-      var processedFile = File(
-          'flutter-studio/src/io/flutter/android/AndroidModuleLibraryManager.java');
+      var processedFile = File(libMgrPath);
       var source = processedFile.readAsStringSync();
       var original = source;
       source = source.replaceAll("ProjectExImpl", "ProjectImpl");
@@ -133,8 +137,7 @@ class EditAndroidModuleLibraryManager extends EditCommand {
       return original;
     } else {
       if (spec.version.startsWith('2021.2')) {
-        var processedFile = File(
-            'flutter-studio/src/io/flutter/android/AndroidModuleLibraryManager.java');
+        var processedFile = File(libMgrPath);
         var source = processedFile.readAsStringSync();
         var original = source;
         source = source.replaceAll(

tool/plugin/lib/globals.dart

@@ -14,7 +14,7 @@ const int cloudErrorFileMaxSize = 1000; // In bytes.
 // Globals are initialized early in ProductCommand. These are used in various
 // top-level functions. This is not ideal, but the "proper" solution would be
 // to move nearly all the top-level functions to methods in ProductCommand.
-String rootPath;
+String rootPath = '';
 String lastReleaseName;
 DateTime lastReleaseDate;
 int pluginCount = 0;