use noOverwrite when install built-in libraries and platform

Alberto Iannaccone · Alberto Iannaccone · commit 1db02e9d6b52 · 2022-07-11T12:33:37.000+02:00
diff --git a/arduino-ide-extension/package.json b/arduino-ide-extension/package.json
@@ -156,7 +156,11 @@
   ],
   "arduino": {
     "cli": {
-      "version": "0.24.0"
+      "version": {
+        "owner": "arduino",
+        "repo": "arduino-cli",
+        "commitish": "ffe4232b359fcfa87238d68acf1c3b64a1621f14"  
+      }
     },
     "fwuploader": {
       "version": "2.2.0"
diff --git a/arduino-ide-extension/src/browser/contributions/init-libs-platforms.ts b/arduino-ide-extension/src/browser/contributions/init-libs-platforms.ts
@@ -31,12 +31,16 @@ export class InitLibsPlatforms extends Contribution {
       )[0];
 
       if (avrPackage) {
-        await this.boardsService.install({ item: avrPackage });
+        await this.boardsService.install({
+          item: avrPackage,
+          noOverwrite: true, // We don't want to automatically replace custom platforms the user might already have in place
+        });
       }
       if (builtInLibrary) {
         await this.libraryService.install({
           item: builtInLibrary,
           installDependencies: true,
+          noOverwrite: true, // We don't want to automatically replace custom libraries the user might already have in place
         });
       }
     }
diff --git a/arduino-ide-extension/src/common/protocol/installable.ts b/arduino-ide-extension/src/common/protocol/installable.ts
@@ -17,6 +17,7 @@ export interface Installable<T extends ArduinoComponent> {
     item: T;
     progressId?: string;
     version?: Installable.Version;
+    noOverwrite?: boolean;
   }): Promise<void>;
 
   /**
diff --git a/arduino-ide-extension/src/common/protocol/library-service.ts b/arduino-ide-extension/src/common/protocol/library-service.ts
@@ -16,6 +16,7 @@ export interface LibraryService
     progressId?: string;
     version?: Installable.Version;
     installDependencies?: boolean;
+    noOverwrite?: boolean;
   }): Promise<void>;
   installZip(options: {
     zipUri: string;
diff --git a/arduino-ide-extension/src/node/boards-service-impl.ts b/arduino-ide-extension/src/node/boards-service-impl.ts
@@ -399,6 +399,7 @@ export class BoardsServiceImpl
     item: BoardsPackage;
     progressId?: string;
     version?: Installable.Version;
+    noOverwrite?: boolean;
   }): Promise<void> {
     const item = options.item;
     const version = !!options.version
@@ -415,6 +416,7 @@ export class BoardsServiceImpl
     req.setArchitecture(architecture);
     req.setPlatformPackage(platform);
     req.setVersion(version);
+    req.setNoOverwrite(Boolean(options.noOverwrite));
 
     console.info('>>> Starting boards package installation...', item);
 
diff --git a/arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/core_pb.d.ts b/arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/core_pb.d.ts
@@ -26,6 +26,9 @@ export class PlatformInstallRequest extends jspb.Message {
     getSkipPostInstall(): boolean;
     setSkipPostInstall(value: boolean): PlatformInstallRequest;
 
+    getNoOverwrite(): boolean;
+    setNoOverwrite(value: boolean): PlatformInstallRequest;
+
 
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): PlatformInstallRequest.AsObject;
@@ -44,6 +47,7 @@ export namespace PlatformInstallRequest {
         architecture: string,
         version: string,
         skipPostInstall: boolean,
+        noOverwrite: boolean,
     }
 }
 
diff --git a/arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/core_pb.js b/arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/core_pb.js
@@ -339,7 +339,8 @@ proto.cc.arduino.cli.commands.v1.PlatformInstallRequest.toObject = function(incl
     platformPackage: jspb.Message.getFieldWithDefault(msg, 2, ""),
     architecture: jspb.Message.getFieldWithDefault(msg, 3, ""),
     version: jspb.Message.getFieldWithDefault(msg, 4, ""),
-    skipPostInstall: jspb.Message.getBooleanFieldWithDefault(msg, 5, false)
+    skipPostInstall: jspb.Message.getBooleanFieldWithDefault(msg, 5, false),
+    noOverwrite: jspb.Message.getBooleanFieldWithDefault(msg, 6, false)
   };
 
   if (includeInstance) {
@@ -397,6 +398,10 @@ proto.cc.arduino.cli.commands.v1.PlatformInstallRequest.deserializeBinaryFromRea
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setSkipPostInstall(value);
       break;
+    case 6:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setNoOverwrite(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -462,6 +467,13 @@ proto.cc.arduino.cli.commands.v1.PlatformInstallRequest.serializeBinaryToWriter
       f
     );
   }
+  f = message.getNoOverwrite();
+  if (f) {
+    writer.writeBool(
+      6,
+      f
+    );
+  }
 };
 
 
@@ -574,6 +586,24 @@ proto.cc.arduino.cli.commands.v1.PlatformInstallRequest.prototype.setSkipPostIns
 };
 
 
+/**
+ * optional bool no_overwrite = 6;
+ * @return {boolean}
+ */
+proto.cc.arduino.cli.commands.v1.PlatformInstallRequest.prototype.getNoOverwrite = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 6, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.cc.arduino.cli.commands.v1.PlatformInstallRequest} returns this
+ */
+proto.cc.arduino.cli.commands.v1.PlatformInstallRequest.prototype.setNoOverwrite = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 6, value);
+};
+
+
 
 
 
diff --git a/arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/lib_pb.d.ts b/arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/lib_pb.d.ts
@@ -79,6 +79,9 @@ export class LibraryInstallRequest extends jspb.Message {
     getNoDeps(): boolean;
     setNoDeps(value: boolean): LibraryInstallRequest;
 
+    getNoOverwrite(): boolean;
+    setNoOverwrite(value: boolean): LibraryInstallRequest;
+
 
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): LibraryInstallRequest.AsObject;
@@ -96,6 +99,7 @@ export namespace LibraryInstallRequest {
         name: string,
         version: string,
         noDeps: boolean,
+        noOverwrite: boolean,
     }
 }
 
diff --git a/arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/lib_pb.js b/arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/lib_pb.js
@@ -967,7 +967,8 @@ proto.cc.arduino.cli.commands.v1.LibraryInstallRequest.toObject = function(inclu
     instance: (f = msg.getInstance()) && cc_arduino_cli_commands_v1_common_pb.Instance.toObject(includeInstance, f),
     name: jspb.Message.getFieldWithDefault(msg, 2, ""),
     version: jspb.Message.getFieldWithDefault(msg, 3, ""),
-    noDeps: jspb.Message.getBooleanFieldWithDefault(msg, 4, false)
+    noDeps: jspb.Message.getBooleanFieldWithDefault(msg, 4, false),
+    noOverwrite: jspb.Message.getBooleanFieldWithDefault(msg, 5, false)
   };
 
   if (includeInstance) {
@@ -1021,6 +1022,10 @@ proto.cc.arduino.cli.commands.v1.LibraryInstallRequest.deserializeBinaryFromRead
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setNoDeps(value);
       break;
+    case 5:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setNoOverwrite(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -1079,6 +1084,13 @@ proto.cc.arduino.cli.commands.v1.LibraryInstallRequest.serializeBinaryToWriter =
       f
     );
   }
+  f = message.getNoOverwrite();
+  if (f) {
+    writer.writeBool(
+      5,
+      f
+    );
+  }
 };
 
 
@@ -1173,6 +1185,24 @@ proto.cc.arduino.cli.commands.v1.LibraryInstallRequest.prototype.setNoDeps = fun
 };
 
 
+/**
+ * optional bool no_overwrite = 5;
+ * @return {boolean}
+ */
+proto.cc.arduino.cli.commands.v1.LibraryInstallRequest.prototype.getNoOverwrite = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 5, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.cc.arduino.cli.commands.v1.LibraryInstallRequest} returns this
+ */
+proto.cc.arduino.cli.commands.v1.LibraryInstallRequest.prototype.setNoOverwrite = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 5, value);
+};
+
+
 
 
 
diff --git a/arduino-ide-extension/src/node/library-service-server-impl.ts b/arduino-ide-extension/src/node/library-service-server-impl.ts
@@ -255,6 +255,7 @@ export class LibraryServiceImpl
     progressId?: string;
     version?: Installable.Version;
     installDependencies?: boolean;
+    noOverwrite?: boolean;
   }): Promise<void> {
     const item = options.item;
     const version = !!options.version
@@ -269,6 +270,7 @@ export class LibraryServiceImpl
     req.setName(item.name);
     req.setVersion(version);
     req.setNoDeps(!options.installDependencies);
+    req.setNoOverwrite(Boolean(options.noOverwrite));
 
     console.info('>>> Starting library package installation...', item);
 

Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,16 @@ export class InitLibsPlatforms extends Contribution {`
`31`	`31`	`)[0];`
`32`	`32`
`33`	`33`	`if (avrPackage) {`
`34`		`- await this.boardsService.install({ item: avrPackage });`
	`34`	`+ await this.boardsService.install({`
	`35`	`+ item: avrPackage,`
	`36`	`+ noOverwrite: true, // We don't want to automatically replace custom platforms the user might already have in place`
	`37`	`+ });`
`35`	`38`	`}`
`36`	`39`	`if (builtInLibrary) {`
`37`	`40`	`await this.libraryService.install({`
`38`	`41`	`item: builtInLibrary,`
`39`	`42`	`installDependencies: true,`
	`43`	`+ noOverwrite: true, // We don't want to automatically replace custom libraries the user might already have in place`
`40`	`44`	`});`
`41`	`45`	`}`
`42`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ export class PlatformInstallRequest extends jspb.Message {`
`26`	`26`	`getSkipPostInstall(): boolean;`
`27`	`27`	`setSkipPostInstall(value: boolean): PlatformInstallRequest;`
`28`	`28`
	`29`	`+ getNoOverwrite(): boolean;`
	`30`	`+ setNoOverwrite(value: boolean): PlatformInstallRequest;`
	`31`	`+`
`29`	`32`
`30`	`33`	`serializeBinary(): Uint8Array;`
`31`	`34`	`toObject(includeInstance?: boolean): PlatformInstallRequest.AsObject;`
`@@ -44,6 +47,7 @@ export namespace PlatformInstallRequest {`
`44`	`47`	`architecture: string,`
`45`	`48`	`version: string,`
`46`	`49`	`skipPostInstall: boolean,`
	`50`	`+ noOverwrite: boolean,`
`47`	`51`	`}`
`48`	`52`	`}`
`49`	`53`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,9 @@ export class LibraryInstallRequest extends jspb.Message {`
`79`	`79`	`getNoDeps(): boolean;`
`80`	`80`	`setNoDeps(value: boolean): LibraryInstallRequest;`
`81`	`81`
	`82`	`+ getNoOverwrite(): boolean;`
	`83`	`+ setNoOverwrite(value: boolean): LibraryInstallRequest;`
	`84`	`+`
`82`	`85`
`83`	`86`	`serializeBinary(): Uint8Array;`
`84`	`87`	`toObject(includeInstance?: boolean): LibraryInstallRequest.AsObject;`
`@@ -96,6 +99,7 @@ export namespace LibraryInstallRequest {`
`96`	`99`	`name: string,`
`97`	`100`	`version: string,`
`98`	`101`	`noDeps: boolean,`
	`102`	`+ noOverwrite: boolean,`
`99`	`103`	`}`
`100`	`104`	`}`
`101`	`105`