skip some files to be synced

arduino-ide-extension/src/browser/create/create-api.ts

@@ -93,7 +93,11 @@ export class CreateApi {
 
   async readDirectory(
     posixPath: string,
-    options: { recursive?: boolean; match?: string } = {}
+    options: {
+      recursive?: boolean;
+      match?: string;
+      skipSketchCache?: boolean;
+    } = {}
   ): Promise<Create.Resource[]> {
     const url = new URL(
       `${this.domain()}/files/d/$HOME/sketches_v2${posixPath}`
@@ -106,21 +110,29 @@ export class CreateApi {
     }
     const headers = await this.headers();
 
-    return this.run<Create.RawResource[]>(url, {
-      method: 'GET',
-      headers,
-    })
-      .then(async (result) => {
-        // add arduino_secrets.h to the results, when reading a sketch main folder
-        if (posixPath.length && posixPath !== posix.sep) {
-          const sketch = this.sketchCache.getSketch(posixPath);
+    const cachedSketch = this.sketchCache.getSketch(posixPath);
 
+    const sketchPromise = options.skipSketchCache
+      ? (cachedSketch && this.sketch(cachedSketch.id)) || Promise.resolve(null)
+      : Promise.resolve(this.sketchCache.getSketch(posixPath));
+
+    return Promise.all([
+      sketchPromise,
+      this.run<Create.RawResource[]>(url, {
+        method: 'GET',
+        headers,
+      }),
+    ])
+      .then(async ([sketch, result]) => {
+        if (posixPath.length && posixPath !== posix.sep) {
           if (sketch && sketch.secrets && sketch.secrets.length > 0) {
             result.push(this.getSketchSecretStat(sketch));
           }
         }
 
-        return result;
+        return result.filter(
+          (res) => !Create.do_not_sync_files.includes(res.name)
+        );
       })
       .catch((reason) => {
         if (reason?.status === 404) return [] as Create.Resource[];

arduino-ide-extension/src/browser/create/create-fs-provider.ts

@@ -30,8 +30,6 @@ import { SketchesService } from '../../common/protocol';
 import { ArduinoPreferences } from '../arduino-preferences';
 import { Create } from './typings';
 
-export const REMOTE_ONLY_FILES = ['sketch.json'];
-
 @injectable()
 export class CreateFsProvider
   implements
@@ -109,9 +107,7 @@ export class CreateFsProvider
     const resources = await this.getCreateApi.readDirectory(
       uri.path.toString()
     );
-    return resources
-      .filter((res) => !REMOTE_ONLY_FILES.includes(res.name))
-      .map(({ name, type }) => [name, this.toFileType(type)]);
+    return resources.map(({ name, type }) => [name, this.toFileType(type)]);
   }
 
   async delete(uri: URI, opts: FileDeleteOptions): Promise<void> {

arduino-ide-extension/src/browser/create/typings.ts

@@ -21,7 +21,7 @@ export namespace Create {
 
   export type ResourceType = 'sketch' | 'folder' | 'file';
   export const arduino_secrets_file = 'arduino_secrets.h';
-  export const do_not_sync_files = ['.theia'];
+  export const do_not_sync_files = ['.theia', 'sketch.json'];
   export interface Resource {
     readonly name: string;
     /**

arduino-ide-extension/src/browser/widgets/cloud-sketchbook/cloud-sketchbook-tree.ts

@@ -32,7 +32,8 @@ import { ArduinoPreferences } from '../../arduino-preferences';
 import { SketchesServiceClientImpl } from '../../../common/protocol/sketches-service-client-impl';
 import { FileStat } from '@theia/filesystem/lib/common/files';
 import { WorkspaceNode } from '@theia/navigator/lib/browser/navigator-tree';
-import { splitSketchPath } from '../../create/create-paths';
+import { posix, splitSketchPath } from '../../create/create-paths';
+import { Create } from '../../create/typings';
 
 const MESSAGE_TIMEOUT = 5 * 1000;
 const deepmerge = require('deepmerge').default;
@@ -234,7 +235,7 @@ export class CloudSketchbookTree extends SketchbookTree {
     if (CreateUri.is(uri)) {
       const resources = await this.createApi.readDirectory(
         uri.path.toString(),
-        { recursive: true }
+        { recursive: true, skipSketchCache: true }
       );
       return resources.map((resource) =>
         CreateUri.toUri(splitSketchPath(resource.path)[1])
@@ -269,6 +270,14 @@ export class CloudSketchbookTree extends SketchbookTree {
         return prev;
       }
 
+      // do not map "do_not_sync" files/directoris and their descendants
+      const segments = path[1].split(posix.sep) || [];
+      if (
+        segments.some((segment) => Create.do_not_sync_files.includes(segment))
+      ) {
+        return prev;
+      }
+
       return { ...prev, [path[1]]: curr };
     }, {});
   }