vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: check if duplicate_file url matches incoming file url

Browse source
This commit is contained in:
sokumon 2025-02-20 19:20:20 +05:30
parent c600314b4c
commit 4ba8ec637d
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
frappe/core/doctype/file/file.py
View file

@ -386,8 +386,6 @@ class File(Document):
if self.name:
filters.update({"name": ("!=", self.name)})
else:
filters.update({"file_name": self.file_name})
if self.attached_to_doctype and self.attached_to_name:
filters.update(
@ -663,7 +661,8 @@ class File(Document):
if duplicate_file:
file_doc: File = frappe.get_cached_doc("File", duplicate_file.name)
if file_doc.exists_on_disk():
self.file_url = duplicate_file.file_url
if self.make_file() == duplicate_file.file_url:
self.file_url = duplicate_file.file_url
file_exists = True
if not file_exists:
@ -690,6 +689,15 @@ class File(Document):
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