Merge pull request #29 from DenisaCG/multiDrives

Support for inter-drives operations

Author: DenisaCG

jupyter_drives/manager.py

@@ -426,21 +426,39 @@ async def check_file(self, drive_name, path):
 
         return 
 
-    async def copy_file(self, drive_name, path, to_path):
+    async def copy_file(self, drive_name, path, to_path, to_drive):
         """Save file with new content.
         
         Args:
             drive_name: name of drive where file exists
             path: path where original content exists
             to_path: path where object should be copied
+            to_drive: name of drive where to copy object
         """
         data = {}
         try: 
             # eliminate leading and trailing backslashes
             path = path.strip('/')
 
-            await obs.copy_async(self._content_managers[drive_name]["store"], path, to_path)
-            metadata = await obs.head_async(self._content_managers[drive_name]["store"], to_path)
+            # copy object within same drive
+            if to_drive == drive_name:
+                await obs.copy_async(self._content_managers[drive_name]["store"], path, to_path)
+                metadata = await obs.head_async(self._content_managers[drive_name]["store"], to_path)
+            # copy object to another drive
+            else:
+                content = b''
+                try:
+                    # retrieving contents of file
+                    file = await obs.get_async(self._content_managers[drive_name]["store"], path)
+                    stream = file.stream(min_chunk_size=5 * 1024 * 1024) # 5MB sized chunks
+                    async for buf in stream: 
+                        content += buf
+                except: 
+                    # dealing with a directory, no contents to retrieve
+                    pass
+
+                await obs.put_async(self._content_managers[to_drive]["store"], to_path, content)                
+                metadata = await obs.head_async(self._content_managers[to_drive]["store"], to_path)
 
             data = {
                 "path": to_path,

src/contents.ts

@@ -597,6 +597,7 @@ export class Drive implements Contents.IDrive {
   ): Promise<Contents.IModel> {
     if (path !== '') {
       const currentDrive = extractCurrentDrive(path, this._drivesList);
+      const toDrive = extractCurrentDrive(toDir, this._drivesList);
 
       // eliminate drive name from path
       const relativePath = formatPath(path);
@@ -606,13 +607,14 @@ export class Drive implements Contents.IDrive {
       const newFileName = await this.incrementCopyName(
         relativePath,
         toRelativePath,
-        currentDrive.name
+        toDrive.name
       );
 
       data = await copyObjects(currentDrive.name, {
         path: relativePath,
         toPath: toRelativePath,
         newFileName: newFileName,
+        toDrive: toDrive.name,
         registeredFileTypes: this._registeredFileTypes
       });
     } else {

src/requests.ts

@@ -362,6 +362,7 @@ export async function copyObjects(
     path: string;
     toPath: string;
     newFileName: string;
+    toDrive: string;
     registeredFileTypes: IRegisteredFileTypes;
   }
 ) {
@@ -385,6 +386,7 @@ export async function copyObjects(
         const remainingFilePath = c.path.substring(options.path.length);
         Private.copySingleObject(
           driveName,
+          options.toDrive,
           PathExt.join(options.path, remainingFilePath),
           PathExt.join(formattedNewPath, remainingFilePath)
         );
@@ -395,12 +397,13 @@ export async function copyObjects(
   try {
     const copiedObject = await Private.copySingleObject(
       driveName,
+      options.toDrive,
       options.path,
       formattedNewPath
     );
     data = {
       name: options.newFileName,
-      path: PathExt.join(driveName, formattedNewPath),
+      path: PathExt.join(options.toDrive, formattedNewPath),
       last_modified: copiedObject.data.last_modified,
       created: '',
       content: PathExt.extname(options.newFileName) !== '' ? null : [], // TODO: add dir check
@@ -540,14 +543,16 @@ namespace Private {
    */
   export async function copySingleObject(
     driveName: string,
+    toDrive: string,
     objectPath: string,
     newObjectPath: string
   ) {
     return await requestAPI<any>(
       'drives/' + driveName + '/' + objectPath,
       'PUT',
       {
-        to_path: newObjectPath
+        to_path: newObjectPath,
+        to_drive: toDrive
       }
     );
   }