From dee694368ae6895553d6fde0f5d1f72ea558274f Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 2 Aug 2021 11:15:48 +0530 Subject: [PATCH 1/4] fix: Better error message while getting web image --- frappe/core/doctype/file/file.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index b4bfe1d21b..62da523110 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -703,7 +703,10 @@ def get_web_image(file_url): frappe.msgprint(_("Unable to read file format for {0}").format(file_url)) raise - image = Image.open(StringIO(frappe.safe_decode(r.content))) + try: + image = Image.open(StringIO(frappe.safe_decode(r.content))) + except: + frappe.throw(_("Image link {0} is not valid").format(file_url), IOError) try: filename, extn = file_url.rsplit("/", 1)[1].rsplit(".", 1) From 6fbdfab7832a0ea5c6819c3f6ccbfbcd99b40ad9 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 2 Aug 2021 11:30:37 +0530 Subject: [PATCH 2/4] fix: minor fix --- frappe/core/doctype/file/file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 62da523110..4bc277f246 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -706,7 +706,7 @@ def get_web_image(file_url): try: image = Image.open(StringIO(frappe.safe_decode(r.content))) except: - frappe.throw(_("Image link {0} is not valid").format(file_url), IOError) + frappe.throw(_("Image link '{0}' is not valid").format(file_url), IOError) try: filename, extn = file_url.rsplit("/", 1)[1].rsplit(".", 1) From e4a46deb8b5df1d8f440dceef89fdb9e2c7f2a1e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 2 Aug 2021 11:37:00 +0530 Subject: [PATCH 3/4] fix: sider fix --- frappe/core/doctype/file/file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 4bc277f246..49fef82321 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -705,7 +705,7 @@ def get_web_image(file_url): try: image = Image.open(StringIO(frappe.safe_decode(r.content))) - except: + except ValueError: frappe.throw(_("Image link '{0}' is not valid").format(file_url), IOError) try: From 383483022d1aecfefebc76f5e905a85be53ebe0f Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 2 Aug 2021 19:26:48 +0530 Subject: [PATCH 4/4] fix: corrected exception --- frappe/core/doctype/file/file.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 49fef82321..95c33879e6 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -705,8 +705,8 @@ def get_web_image(file_url): try: image = Image.open(StringIO(frappe.safe_decode(r.content))) - except ValueError: - frappe.throw(_("Image link '{0}' is not valid").format(file_url), IOError) + except Exception as e: + frappe.msgprint(_("Image link '{0}' is not valid").format(file_url), raise_exception=e) try: filename, extn = file_url.rsplit("/", 1)[1].rsplit(".", 1)