Modify folder open for GDrive to load empty folders into BrowserFS

Author: sumomomomomo

src/commons/fileSystem/FileSystemUtils.ts

@@ -225,7 +225,8 @@ export const rmdirRecursively = (fileSystem: FSModule, directoryPath: string): P
 export const writeFileRecursively = (
   fileSystem: FSModule,
   filePath: string,
-  fileContents: string
+  fileContents: string,
+  onlyCreateFolder?: boolean
 ): Promise<void> => {
   return new Promise((resolve, reject) => {
     // Create directories along the path if they do not exist.
@@ -255,15 +256,16 @@ export const writeFileRecursively = (
       promise.catch(err => reject(err));
     }
 
-    // Write to the file.
-    fileSystem.writeFile(filePath, fileContents, err => {
-      if (err) {
-        reject(err);
-        return;
-      }
-
-      resolve();
-    });
+    if (!onlyCreateFolder) {
+      // Write to the file.
+      fileSystem.writeFile(filePath, fileContents, err => {
+        if (err) {
+          reject(err);
+          return;
+        }
+      });
+    }
+    resolve();
   });
 };
 

src/commons/sagas/PersistenceSaga.tsx

@@ -136,9 +136,6 @@ export function* persistenceSaga(): SagaIterator {
       }
 
       yield call(store.dispatch, actions.disableFileSystemContextMenus());
-
-      // Note: for mimeType, text/plain -> file, application/vnd.google-apps.folder -> folder
-
       if (mimeType === MIME_FOLDER) {
         // handle folders
         toastKey = yield call(showMessage, {
@@ -148,27 +145,20 @@ export function* persistenceSaga(): SagaIterator {
         });
 
         const fileList = yield call(getFilesOfFolder, id, name); // this needed the extra scope mimetypes to have every file
-        // TODO: add type for each resp?
         yield call(console.log, 'fileList', fileList);
 
         const fileSystem: FSModule | null = yield select(
           (state: OverallState) => state.fileSystem.inBrowserFileSystem
         );
         // If the file system is not initialised, do nothing.
         if (fileSystem === null) {
-          yield call(console.log, 'no filesystem!');
-          return;
+          throw new Error("No filesystem!");
         }
 
-        // Begin
-
-        // rm everything TODO replace everything hardcoded with playground?
         yield call(rmFilesInDirRecursively, fileSystem, '/playground');
-
-        // clear all persistence files
         yield call(store.dispatch, actions.deleteAllPersistenceFiles());
 
-        // add tlrf
+        // add top level root folder
         yield put(
           actions.addPersistenceFile({
             id,
@@ -179,6 +169,8 @@ export function* persistenceSaga(): SagaIterator {
           })
         );
 
+        yield call(store.dispatch, actions.updateRefreshFileViewKey());
+
         for (const currFile of fileList) {
           if (currFile.isFolder === true) {
             yield call(console.log, 'not file ', currFile);
@@ -191,6 +183,14 @@ export function* persistenceSaga(): SagaIterator {
                 isFolder: true
               })
             );
+            yield call(
+              writeFileRecursively,
+              fileSystem,
+              '/playground' + currFile.path + "/dummy", // workaround to make empty folders
+              "",
+              true
+            );
+            yield call(store.dispatch, actions.updateRefreshFileViewKey());
             continue;
           }
           yield put(
@@ -206,50 +206,39 @@ export function* persistenceSaga(): SagaIterator {
             fileId: currFile.id,
             alt: 'media'
           });
-          console.log(currFile.path);
-          console.log(contents.body === '');
           yield call(
             writeFileRecursively,
             fileSystem,
             '/playground' + currFile.path,
             contents.body
           );
           yield call(showSuccessMessage, `Loaded file ${currFile.path}.`, 1000);
+          yield call(store.dispatch, actions.updateRefreshFileViewKey());
         }
 
         // set source to chapter 4 TODO is there a better way of handling this
         yield put(
           actions.chapterSelect(parseInt('4', 10) as Chapter, Variant.DEFAULT, 'playground')
         );
-        // open folder mode TODO enable button
-        //yield call(store.dispatch, actions.setFolderMode("playground", true));
-        yield call(store.dispatch, actions.enableFileSystemContextMenus());
-
-        // DDDDDDDDDDDDDDDebug
-        const test = yield select((state: OverallState) => state.fileSystem.persistenceFileArray);
-        yield call(console.log, test);
 
-        // refresh needed
+        yield call(store.dispatch, actions.enableFileSystemContextMenus());
         yield call(
           store.dispatch,
           actions.removeEditorTabsForDirectory('playground', WORKSPACE_BASE_PATHS['playground'])
-        ); // TODO hardcoded
-        // TODO find a file to open instead of deleting all active tabs?
-        // TODO without modifying WorkspaceReducer in one function this would cause errors - called by onChange of Playground.tsx?
-        // TODO change behaviour of WorkspaceReducer to not create program.js every time folder mode changes with 0 tabs existing?
-        yield call(store.dispatch, actions.updateRefreshFileViewKey());
-
-        yield call(showSuccessMessage, `Loaded folder ${name}.`, 1000);
+        );
 
-        // TODO does not update playground on loading folder
-        yield call(console.log, 'ahfdaskjhfkjsadf', parentId);
         yield put(
           actions.playgroundUpdatePersistenceFolder({ id, name, parentId, lastSaved: new Date() })
         );
 
+        // delay to increase likelihood addPersistenceFile for last loaded file has completed
+        // and for the toasts to not overlap
+        yield call(() => new Promise( resolve => setTimeout(resolve, 1000)));
+        yield call(showSuccessMessage, `Loaded folder ${name}.`, 1000);
         return;
       }
 
+      // Below is for handling opening of single files
       toastKey = yield call(showMessage, {
         message: 'Opening file...',
         timeout: 0,
@@ -286,15 +275,15 @@ export function* persistenceSaga(): SagaIterator {
           )
         );
       }
-
       yield call(showSuccessMessage, `Loaded ${name}.`, 1000);
     } catch (ex) {
       console.error(ex);
-      yield call(showWarningMessage, `Error while opening file.`, 1000);
+      yield call(showWarningMessage, `Error while opening file/folder.`, 1000);
     } finally {
       if (toastKey) {
         dismiss(toastKey);
       }
+      yield call(store.dispatch, actions.updateRefreshFileViewKey());
     }
   });