refactor get contents request

Author: DenisaCG

src/contents.ts

@@ -243,10 +243,35 @@ export class Drive implements Contents.IDrive {
         }
       }
 
-      data = await getContents(currentDrive.name, {
-        path: formatPath(localPath),
+      const currentPath = formatPath(localPath);
+      const result = await getContents(currentDrive.name, {
+        path: currentPath,
         registeredFileTypes: this._registeredFileTypes
       });
+
+      data = {
+        name: result.isDir
+          ? currentPath
+            ? PathExt.basename(currentPath)
+            : currentDrive.name
+          : PathExt.basename(currentPath),
+        path: PathExt.join(
+          currentDrive.name,
+          result.isDir
+            ? currentPath
+              ? currentPath + '/'
+              : ''
+            : result.response.data.path
+        ),
+        last_modified: result.isDir ? '' : result.response.data.last_modified,
+        created: '',
+        content: result.isDir ? result.files : result.response.data.content,
+        format: result.isDir ? 'json' : result.format!,
+        mimetype: result.isDir ? '' : result.mimetype!,
+        size: result.isDir ? undefined : result.response.data.size,
+        writable: true,
+        type: result.isDir ? 'directory' : result.type!
+      };
     } else {
       // retriving list of contents from root
       // in our case: list available drives
@@ -314,11 +339,27 @@ export class Drive implements Contents.IDrive {
         path.indexOf('/') !== -1 ? path.substring(path.indexOf('/') + 1) : '';
 
       // get current list of contents of drive
-      const old_data = await getContents(currentDrive.name, {
+      const result = await getContents(currentDrive.name, {
         path: relativePath,
         registeredFileTypes: this._registeredFileTypes
       });
 
+      const old_data: Contents.IModel = {
+        name: relativePath ? PathExt.basename(relativePath) : currentDrive.name,
+        path: PathExt.join(
+          currentDrive.name,
+          relativePath ? relativePath + '/' : ''
+        ),
+        last_modified: '',
+        created: '',
+        content: result.files,
+        format: 'json'!,
+        mimetype: '',
+        size: undefined,
+        writable: true,
+        type: 'directory'
+      };
+
       if (options.type !== undefined) {
         // get incremented untitled name
         const name = this.incrementUntitledName(old_data, options);

src/requests.ts

@@ -10,22 +10,6 @@ import {
   IDriveInfo
 } from './token';
 
-/**
- * The data contents model.
- */
-let data: Contents.IModel = {
-  name: '',
-  path: '',
-  last_modified: '',
-  created: '',
-  content: null,
-  format: null,
-  mimetype: '',
-  size: 0,
-  writable: true,
-  type: ''
-};
-
 /**
  * Set new limit for number of objects to be listed inside the DriveBrowser, given any path.
  *
@@ -147,17 +131,10 @@ export async function getContents(
         }
       });
 
-      data = {
-        name: options.path ? PathExt.basename(options.path) : driveName,
-        path: PathExt.join(driveName, options.path ? options.path + '/' : ''),
-        last_modified: '',
-        created: '',
-        content: Object.values(fileList),
-        format: 'json',
-        mimetype: '',
-        size: undefined,
-        writable: true,
-        type: 'directory'
+      return {
+        isDir: isDir,
+        response: response,
+        files: Object.values(fileList)
       };
     }
     // getting the contents of a file
@@ -167,22 +144,17 @@ export async function getContents(
         options.registeredFileTypes
       );
 
-      data = {
-        name: PathExt.basename(options.path),
-        path: PathExt.join(driveName, response.data.path),
-        last_modified: response.data.last_modified,
-        created: '',
-        content: response.data.content,
+      return {
+        isDir: isDir,
+        response: response,
         format: fileFormat as Contents.FileFormat,
         mimetype: fileMimeType,
-        size: response.data.size,
-        writable: true,
         type: fileType
       };
     }
   }
 
-  return data;
+  return {};
 }
 
 /**