chore: disallow and skip download for drive_document

frappe · Aug 16, 2023 · 2ce2c6d · 2ce2c6d
1 parent b095cd5
commit 2ce2c6d
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 57 deletions.
diff --git a/drive/api/files.py b/drive/api/files.py
@@ -299,7 +299,13 @@ def get_file_content(entity_name, trigger_download=0):
         # status_code = status.HTTP_206_PARTIAL_CONTENT
         # Figure out a sane way to handle blob range streaming requests
 
+        try:
         file = open(drive_entity.path, "rb")
+        except TypeError:
+            response = Response(frappe.request.environ)
+            response.status_code = 204
+            return response
+
         response = Response(
             wrap_file(frappe.request.environ, file), direct_passthrough=True
         )

diff --git a/drive/api/permissions.py b/drive/api/permissions.py
@@ -69,6 +69,7 @@ def get_shared_with_me(get_all=False, order_by="modified"):
         DriveEntity.parent_drive_entity,
         DriveEntity.allow_comments,
         DriveEntity.color,
+        DriveEntity.document,
         DriveEntity.allow_download,
         DocShare.read,
         DocShare.write,

diff --git a/frontend/src/pages/Favourites.vue b/frontend/src/pages/Favourites.vue
@@ -162,10 +162,14 @@ export default {
             window.location.href = `/api/method/drive.api.files.get_file_content?entity_name=${this.selectedEntities[0].name}&trigger_download=1`;
           },
           isEnabled: () => {
-            return (
-              this.selectedEntities.length === 1 &&
-              !this.selectedEntities[0].is_group
-            );
+            if (this.selectedEntities.length === 1) {
+              if (
+                this.selectedEntities.length === 1 &&
+                !this.selectedEntities[0].is_group
+              ) {
+                return !this.selectedEntities[0].document;
+              }
+            }
           },
         },
         // {

diff --git a/frontend/src/pages/Folder.vue b/frontend/src/pages/Folder.vue
@@ -221,10 +221,14 @@ export default {
             window.location.href = `/api/method/drive.api.files.get_file_content?entity_name=${this.selectedEntities[0].name}&trigger_download=1`;
           },
           isEnabled: () => {
-            return (
-              this.selectedEntities.length === 1 &&
-              !this.selectedEntities[0].is_group
-            );
+            if (this.selectedEntities.length === 1) {
+              if (
+                this.selectedEntities.length === 1 &&
+                !this.selectedEntities[0].is_group
+              ) {
+                return !this.selectedEntities[0].document;
+              }
+            }
           },
         },
         {

diff --git a/frontend/src/pages/FolderShare.vue b/frontend/src/pages/FolderShare.vue
@@ -221,10 +221,14 @@ export default {
             window.location.href = `/api/method/drive.api.files.get_file_content?entity_name=${this.selectedEntities[0].name}&trigger_download=1`;
           },
           isEnabled: () => {
-            return (
-              this.selectedEntities.length === 1 &&
-              !this.selectedEntities[0].is_group
-            );
+            if (this.selectedEntities.length === 1) {
+              if (
+                this.selectedEntities.length === 1 &&
+                !this.selectedEntities[0].is_group
+              ) {
+                return !this.selectedEntities[0].document;
+              }
+            }
           },
         },
         {

diff --git a/frontend/src/pages/Home.vue b/frontend/src/pages/Home.vue
@@ -202,10 +202,14 @@ export default {
             window.location.href = `/api/method/drive.api.files.get_file_content?entity_name=${this.selectedEntities[0].name}&trigger_download=1`;
           },
           isEnabled: () => {
-            return (
-              this.selectedEntities.length === 1 &&
-              !this.selectedEntities[0].is_group
-            );
+            if (this.selectedEntities.length === 1) {
+              if (
+                this.selectedEntities.length === 1 &&
+                !this.selectedEntities[0].is_group
+              ) {
+                return !this.selectedEntities[0].document;
+              }
+            }
           },
         },
         {

diff --git a/frontend/src/pages/Shared.vue b/frontend/src/pages/Shared.vue
@@ -140,12 +140,17 @@ export default {
             window.location.href = `/api/method/drive.api.files.get_file_content?entity_name=${this.selectedEntities[0].name}&trigger_download=1`;
           },
           isEnabled: () => {
-            return (
-              this.selectedEntities.length === 1 &&
-              !this.selectedEntities[0].is_group &&
-              (this.selectedEntities[0].allow_download ||
-                this.selectedEntities[0].write)
-            );
+            if (this.selectedEntities.length === 1) {
+              if (
+                this.selectedEntities.length === 1 &&
+                !this.selectedEntities[0].is_group &&
+                (this.selectedEntities[0].allow_download ||
+                  this.selectedEntities[0].write)
+              ) {
+                console.log(this.selectedEntities[0]);
+                return !this.selectedEntities[0].document;
+              }
+            }
           },
         },
         // {

diff --git a/frontend/src/utils/folderDownload.js b/frontend/src/utils/folderDownload.js
@@ -1,39 +1,43 @@
-import JSZip from 'jszip';
+import JSZip from "jszip";
 
 export function selectedEntitiesDownload(selected_entities) {
-  const generateRandomString = () => [...Array(5)].map(() => Math.random().toString(36)[2]).join('');
+  const generateRandomString = () =>
+    [...Array(5)].map(() => Math.random().toString(36)[2]).join("");
   const randomString = generateRandomString();
   const folderName = "FDrive_" + randomString;
 
   const zip = new JSZip();
 
   const processEntity = (entity, parentFolder) => {
-    console.log(entity.title);
     if (entity.is_group) {
       const folder = parentFolder.folder(entity.title);
-      return get_children(entity.name)
-        .then((children) => {
-          const promises = children.map((childEntity) => processEntity(childEntity, folder));
-          return Promise.all(promises);
-        });
+      return get_children(entity.name).then((children) => {
+        const promises = children.map((childEntity) =>
+          processEntity(childEntity, folder)
+        );
+        return Promise.all(promises);
+      });
+    } else if (entity.document) {
+      return;
     } else {
-      return get_file_content(entity.name)
-        .then((fileContent) => {
-          parentFolder.file(entity.title, fileContent);
-        });
+      return get_file_content(entity.name).then((fileContent) => {
+        parentFolder.file(entity.title, fileContent);
+      });
     }
   };
 
-  const promises = selected_entities.map((entity) => processEntity(entity, zip));
+  const promises = selected_entities.map((entity) =>
+    processEntity(entity, zip)
+  );
 
   Promise.all(promises)
     .then(() => {
-      return zip.generateAsync({ type: 'blob', streamFiles: true });
+      return zip.generateAsync({ type: "blob", streamFiles: true });
     })
     .then(function (content) {
-      var downloadLink = document.createElement('a');
+      var downloadLink = document.createElement("a");
       downloadLink.href = URL.createObjectURL(content);
-      downloadLink.download = folderName + '.zip';
+      downloadLink.download = folderName + ".zip";
 
       document.body.appendChild(downloadLink);
       downloadLink.click();
@@ -50,12 +54,12 @@ export function folderDownload(root_entity) {
 
   temp(root_entity.name, zip)
     .then(() => {
-      return zip.generateAsync({ type: 'blob', streamFiles: true });
+      return zip.generateAsync({ type: "blob", streamFiles: true });
     })
     .then((content) => {
-      const downloadLink = document.createElement('a');
+      const downloadLink = document.createElement("a");
       downloadLink.href = URL.createObjectURL(content);
-      downloadLink.download = folderName + '.zip';
+      downloadLink.download = folderName + ".zip";
 
       document.body.appendChild(downloadLink);
       downloadLink.click();
@@ -75,10 +79,9 @@ function temp(entity_name, parentZip) {
             const folder = parentZip.folder(entity.title);
             return temp(entity.name, folder);
           } else {
-            return get_file_content(entity.name)
-              .then((fileContent) => {
-                parentZip.file(entity.title, fileContent);
-              });
+            return get_file_content(entity.name).then((fileContent) => {
+              parentZip.file(entity.title, fileContent);
+            });
           }
         });
 
@@ -97,22 +100,26 @@ function temp(entity_name, parentZip) {
 }
 
 function get_file_content(entity_name) {
-  const fileUrl = "/api/method/" + `drive.api.files.get_file_content?entity_name=${entity_name}`;
-
-  return fetch(fileUrl)
-    .then(response => {
-      if (response.ok) {
-        return response.blob();
-      } else {
-        throw new Error(`Request failed with status ${response.status}`);
-      }
-    });
+  const fileUrl =
+    "/api/method/" +
+    `drive.api.files.get_file_content?entity_name=${entity_name}`;
+
+  return fetch(fileUrl).then((response) => {
+    if (response.ok) {
+      return response.blob();
+    } else if (response.status === 204) {
+      console.log(response);
+    } else {
+      throw new Error(`Request failed with status ${response.status}`);
+    }
+  });
 }
 
-
 function get_children(entity_name) {
   return new Promise((resolve, reject) => {
-    const url = "/api/method/" + `drive.api.nested_folder.folder_contents?entity_name=${entity_name}`;
+    const url =
+      "/api/method/" +
+      `drive.api.nested_folder.folder_contents?entity_name=${entity_name}`;
 
     const xhr = new XMLHttpRequest();
     xhr.open("GET", url);