From 620c8bfef2658c92e0b537cf65db165d26ada526 Mon Sep 17 00:00:00 2001 From: sokumon Date: Sat, 22 Feb 2025 13:23:26 +0530 Subject: [PATCH] fix: cleanup copied methods and simpler fix --- frappe/core/doctype/file/file.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index b7ce007650..4eefd86cfe 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -661,7 +661,9 @@ class File(Document): if duplicate_file: file_doc: File = frappe.get_cached_doc("File", duplicate_file.name) if file_doc.exists_on_disk(): - if self.make_file_url() == duplicate_file.file_url: + if self.exists_on_disk(): + self.file_url = self.save_file_on_filesystem(make_file_url=True) + else: self.file_url = duplicate_file.file_url file_exists = True @@ -678,26 +680,19 @@ class File(Document): return write_file_method(self) return self.save_file_on_filesystem() - def save_file_on_filesystem(self): + def save_file_on_filesystem(self, make_file_url=None): safe_file_name = re.sub(r"[/\\%?#]", "_", self.file_name) if self.is_private: self.file_url = f"/private/files/{safe_file_name}" else: self.file_url = f"/files/{safe_file_name}" + if make_file_url: + return fpath = self.write_file() return {"file_name": os.path.basename(fpath), "file_url": self.file_url} - def make_file_url(self): - file_url = None - safe_file_name = re.sub(r"[/\\%?#]", "_", self.file_name) - if self.is_private: - file_url = f"/private/files/{safe_file_name}" - else: - file_url = f"/files/{safe_file_name}" - return file_url - def check_max_file_size(self): from frappe.core.api.file import get_max_file_size