v2-Beta4 release

kid1194 · Dec 13, 2022 · 19db9c6 · 19db9c6
1 parent 2bceb06
commit 19db9c6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/frappe_better_attach_control/api/file_manager.py b/frappe_better_attach_control/api/file_manager.py
@@ -5,7 +5,6 @@
 
 
 import os
-import mimetypes
 
 import frappe
 from frappe import _
@@ -88,10 +87,8 @@ def _get_files_by_search_text(text):
 def _prepare_files(files):
     for i in range(len(files)):
         file = files[i]
-        file["type"] = ""
         file["size"] = 0
         if not cint(file["is_folder"]):
-            file["type"] = mimetypes.guess_type(f.file_url)[0] or ""
             file["size"] = flt(file["file_size"])
             if not file["size"]:
                 try:

diff --git a/frappe_better_attach_control/public/js/uploader/index.js b/frappe_better_attach_control/public/js/uploader/index.js
@@ -161,6 +161,12 @@ frappe.ui.FileUploader = class FileUploader extends frappe.ui.FileUploader {
             ).then(fn(function(r) {
                 let { files = [], has_more = false } = r.message || {};
                 if (!isEmpty(files)) {
+                    files = files.map(function(f) {
+                        if (f.name == null) f.name = f.file_name || get_filename(f.file_url);
+                        if (f.type == null) f.type = get_file_type(get_file_ext(f.file_url)) || '';
+                        if (f.size == null) f.size = 0;
+                        return f;
+                    });
                     files = files.filter(this.check_restrictions);
                     files.sort(function(a, b) {
                         if (a.is_folder && b.is_folder) {
@@ -189,6 +195,12 @@ frappe.ui.FileUploader = class FileUploader extends frappe.ui.FileUploader {
             ).then(fn(function(r) {
                 let files = r.message || [];
                 if (!isEmpty(files)) {
+                    files = files.map(function(f) {
+                        if (f.name == null) f.name = f.file_name || get_filename(f.file_url);
+                        if (f.type == null) f.type = get_file_type(get_file_ext(f.file_url)) || '';
+                        if (f.size == null) f.size = 0;
+                        return f;
+                    });
                     files = files.filter(this.check_restrictions);
                     if (!isEmpty(files)) {
                         files = files.map(fn(function(file) {

diff --git a/frappe_better_attach_control/public/js/uploader/v12/index.js b/frappe_better_attach_control/public/js/uploader/v12/index.js
@@ -146,6 +146,12 @@ frappe.ui.FileUploader = class FileUploader extends frappe.ui.FileUploader {
             ).then(fn(function(r) {
                 let files = r.message || [];
                 if (!isEmpty(files)) {
+                    files = files.map(function(f) {
+                        if (f.name == null) f.name = f.file_name || get_filename(f.file_url);
+                        if (f.type == null) f.type = get_file_type(get_file_ext(f.file_url)) || '';
+                        if (f.size == null) f.size = 0;
+                        return f;
+                    });
                     files = files.filter(this.check_restrictions);
                     files.sort(function(a, b) {
                         if (a.is_folder && b.is_folder) {

diff --git a/frappe_better_attach_control/public/js/uploader/v13/index.js b/frappe_better_attach_control/public/js/uploader/v13/index.js
@@ -150,6 +150,12 @@ frappe.ui.FileUploader = class FileUploader extends frappe.ui.FileUploader {
             ).then(fn(function(r) {
                 let { files = [], has_more = false } = r.message || {};
                 if (!isEmpty(files)) {
+                    files = files.map(function(f) {
+                        if (f.name == null) f.name = f.file_name || get_filename(f.file_url);
+                        if (f.type == null) f.type = get_file_type(get_file_ext(f.file_url)) || '';
+                        if (f.size == null) f.size = 0;
+                        return f;
+                    });
                     files = files.filter(this.check_restrictions);
                     files.sort(function(a, b) {
                         if (a.is_folder && b.is_folder) {
@@ -178,6 +184,12 @@ frappe.ui.FileUploader = class FileUploader extends frappe.ui.FileUploader {
             ).then(fn(function(r) {
                 let files = r.message || [];
                 if (!isEmpty(files)) {
+                    files = files.map(function(f) {
+                        if (f.name == null) f.name = f.file_name || get_filename(f.file_url);
+                        if (f.type == null) f.type = get_file_type(get_file_ext(f.file_url)) || '';
+                        if (f.size == null) f.size = 0;
+                        return f;
+                    });
                     files = files.filter(this.check_restrictions)
                         .map(fn(function(file) {
                             return this.make_file_node(file);