fix: fine grained progress update messages

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

arduino-ide-extension/src/browser/contributions/create-contribution.ts

@@ -18,28 +18,29 @@ import { SketchContribution } from './contribution';
 
 export function sketchAlreadyExists(input: string): string {
   return nls.localize(
-    'arduino/cloudSketch/sketchAlreadyExists',
+    'arduino/cloudSketch/alreadyExists',
     "Cloud sketch '{0}' already exists.",
     input
   );
 }
-
-export function notFound(input: string): string {
+export function sketchNotFound(input: string): string {
   return nls.localize(
     'arduino/cloudSketch/notFound',
     "Could not pull the cloud sketch '{0}'. It does not exist.",
     input
   );
 }
-
+export const synchronizingSketchbook = nls.localize(
+  'arduino/cloudSketch/synchronizingSketchbook',
+  'Synchronizing sketchbook...'
+);
 export function pullingSketch(input: string): string {
   return nls.localize(
     'arduino/cloudSketch/pulling',
     "Synchronizing sketchbook, pulling '{0}'...",
     input
   );
 }
-
 export function pushingSketch(input: string): string {
   return nls.localize(
     'arduino/cloudSketch/pushing',
@@ -123,7 +124,7 @@ export abstract class CloudSketchContribution extends SketchContribution {
     } catch (err) {
       if (isNotFound(err)) {
         await treeModel.refresh();
-        this.messageService.error(notFound(sketch.name));
+        this.messageService.error(sketchNotFound(sketch.name));
         return undefined;
       }
       throw err;

arduino-ide-extension/src/browser/contributions/rename-cloud-sketch.ts

@@ -17,6 +17,7 @@ import {
   CloudSketchContribution,
   pushingSketch,
   sketchAlreadyExists,
+  synchronizingSketchbook,
 } from './create-contribution';
 
 export interface RenameCloudSketchParams {
@@ -99,6 +100,7 @@ export class RenameCloudSketch extends CloudSketchContribution {
     value: string
   ): (progress: Progress) => Promise<unknown> {
     return async (progress: Progress) => {
+      const fromName = params.cloudUri.path.name;
       const fromPosixPath = params.cloudUri.path.toString();
       const toPosixPath = params.cloudUri.parent.resolve(value).path.toString();
       let result: Create.Sketch | ConflictError | undefined;
@@ -111,19 +113,16 @@ export class RenameCloudSketch extends CloudSketchContribution {
         progress.report({
           message: nls.localize(
             'arduino/cloudSketch/renaming',
-            "Renaming cloud sketch '{0}'...",
+            "Renaming cloud sketch from '{0}' to '{1}'...",
+            fromName,
             value
           ),
         });
         await this.createApi.rename(fromPosixPath, toPosixPath);
 
         // sync
         progress.report({
-          message: nls.localize(
-            'arduino/cloudSketch/renaming',
-            "Renaming cloud sketch '{0}'...",
-            value
-          ),
+          message: synchronizingSketchbook,
         });
         this.createApi.sketchCache.init(); // invalidate the cache
         await this.createApi.sketches(); // IDE2 must pull all sketches to find the new one

i18n/en.json

@@ -120,13 +120,14 @@
       "visitArduinoCloud": "Visit Arduino Cloud to create Cloud Sketches."
     },
     "cloudSketch": {
+      "alreadyExists": "Cloud sketch '{0}' already exists.",
       "creating": "Creating cloud sketch '{0}'...",
       "new": "New Cloud Sketch",
       "notFound": "Could not pull the cloud sketch '{0}'. It does not exist.",
       "pulling": "Synchronizing sketchbook, pulling '{0}'...",
       "pushing": "Synchronizing sketchbook, pushing '{0}'...",
-      "renaming": "Renaming cloud sketch '{0}'...",
-      "sketchAlreadyExists": "Cloud sketch '{0}' already exists."
+      "renaming": "Renaming cloud sketch from '{0}' to '{1}'...",
+      "synchronizingSketchbook": "Synchronizing sketchbook..."
     },
     "common": {
       "all": "All",