Refactor file browser restore method and fix instantiation logic.

jupyterlab · Dec 23, 2019 · b7fabfa · b7fabfa
1 parent d8c72ee
commit b7fabfa
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 21 deletions.
diff --git a/packages/filebrowser/src/browser.ts b/packages/filebrowser/src/browser.ts
@@ -99,7 +99,9 @@ export class FileBrowser extends Widget {
     layout.addWidget(this._listing);
     this.layout = layout;
 
-    void model.restore(this.id, options.restore !== false);
+    if (options.restore !== false) {
+      void model.restore(this.id);
+    }
   }
 
   /**

diff --git a/packages/filebrowser/src/model.ts b/packages/filebrowser/src/model.ts
@@ -348,38 +348,43 @@ export class FileBrowserModel implements IDisposable {
    * times, all subsequent invocations are no-ops.
    */
   async restore(id: string, populate = true): Promise<void> {
+    const { manager } = this;
     const key = `file-browser-${id}:cwd`;
     const state = this._state;
-    const restored = this._key !== key;
+    const restored = !!this._key;
+
+    if (restored) {
+      return;
+    }
 
     // Set the file browser key for state database fetch/save.
     this._key = key;
 
-    if (!populate || !state || restored) {
+    if (!populate || !state) {
       this._restored.resolve(undefined);
       return;
     }
 
-    const manager = this.manager;
-    const ready = manager.services.ready;
-    return Promise.all([state.fetch(key), ready])
-      .then(async ([value]) => {
-        if (!value) {
-          this._restored.resolve(undefined);
-          return;
-        }
+    await manager.services.ready;
 
-        const path = (value as ReadonlyJSONObject)['path'] as string;
-        const localPath = manager.services.contents.localPath(path);
-        return manager.services.contents
-          .get(path)
-          .then(() => this.cd(localPath))
-          .catch(() => state.remove(key));
-      })
-      .catch(() => state.remove(key))
-      .then(() => {
+    try {
+      const value = await state.fetch(key);
+
+      if (!value) {
         this._restored.resolve(undefined);
-      });
+        return;
+      }
+
+      const path = (value as ReadonlyJSONObject)['path'] as string;
+      const localPath = manager.services.contents.localPath(path);
+
+      await manager.services.contents.get(path);
+      await this.cd(localPath);
+    } catch (error) {
+      await state.remove(key);
+    }
+
+    this._restored.resolve(undefined);
   }
 
   /**