iterate on contents listing

Author: DenisaCG

jupyter_drives/manager.py

@@ -162,17 +162,12 @@ async def get_contents(self, drive_name, path):
             drive_name: name of drive to get the contents of
             path: path to file or directory (empty string for root listing)
         """
-        print('!!!!!!!!!!!!!!!!!!!', drive_name, 'path: ', path)
         if path == '/':
             path = ''
-        drive_name = 'jupyter-drives-test-bucket-1'
         try :
             currentObject = os.path.basename(path) if os.path.basename(path) is not None else ''
-            print('currentObject: ', currentObject)
             # check if we are listing contents of a directory
             if currentObject.find('.') == -1:
-                print('in if')
-                print('store: ', self._content_managers)
                 data = []
                 # using Arrow lists as they are recommended for large results
                 # sream will be an async iterable of RecordBatch
@@ -201,7 +196,6 @@ async def get_contents(self, drive_name, path):
                     "last_modified": metadata["last_modified"].isoformat(),
                     "size": metadata["size"]
                 }
-            print(data)
             response = {
                 "data": data
             }

src/contents.ts

@@ -3,7 +3,6 @@
 
 import { Signal, ISignal } from '@lumino/signaling';
 import { Contents, ServerConnection } from '@jupyterlab/services';
-import { PathExt } from '@jupyterlab/coreutils';
 import { IDriveInfo } from './token';
 import { getContents, mountDrive } from './requests';
 
@@ -208,21 +207,7 @@ export class Drive implements Contents.IDrive {
         }
       }
 
-      const resp = await getContents(currentDrive.name, { path: '' });
-      console.log('resp: ', resp);
-
-      data = {
-        name: PathExt.basename(localPath),
-        path: PathExt.basename(localPath),
-        last_modified: '',
-        created: '',
-        content: [],
-        format: 'json',
-        mimetype: '',
-        size: undefined,
-        writable: true,
-        type: 'directory'
-      };
+      data = await getContents(currentDrive.name, { path: '' });
     } else {
       const drivesList: Contents.IModel[] = [];
       for (const drive of this._drivesList) {

src/requests.ts

@@ -1,7 +1,26 @@
 import { ReadonlyJSONObject } from '@lumino/coreutils';
+import { Contents } from '@jupyterlab/services';
+import { PathExt } from '@jupyterlab/coreutils';
 
 import { requestAPI } from './handler';
 
+let data: Contents.IModel = {
+  name: '',
+  path: '',
+  last_modified: '',
+  created: '',
+  content: null,
+  format: null,
+  mimetype: '',
+  size: 0,
+  writable: true,
+  type: ''
+};
+
+interface IContentsList {
+  [fileName: string]: Contents.IModel;
+}
+
 /**
  * Fetch the list of available drives.
  * @returns list of drives
@@ -30,8 +49,44 @@ export async function getContents(
   driveName: string,
   options: { path: string }
 ) {
-  return await requestAPI<any>(
+  const response = await requestAPI<any>(
     'drives/' + driveName + '/' + options.path,
     'GET'
   );
+
+  if (response.data) {
+    const fileList: IContentsList = {};
+
+    response.data.forEach((row: any) => {
+      const fileName = PathExt.basename(row.path);
+
+      fileList[fileName] = fileList[fileName] ?? {
+        name: fileName,
+        path: driveName + '/' + row.path,
+        last_modified: row.last_modified,
+        created: '',
+        content: !fileName.split('.')[1] ? [] : null,
+        format: null, //fileFormat as Contents.FileFormat,
+        mimetype: 'null', //fileMimeType,
+        size: row.size,
+        writable: true,
+        type: 'directory' //fileType
+      };
+    });
+
+    data = {
+      name: options.path ? PathExt.basename(options.path) : '',
+      path: options.path ? options.path + '/' : '',
+      last_modified: '',
+      created: '',
+      content: Object.values(fileList),
+      format: 'json',
+      mimetype: '',
+      size: undefined,
+      writable: true,
+      type: 'directory'
+    };
+  }
+
+  return data;
 }