From 2d887187d207d0b38cd033c8d49a4babc388f6a5 Mon Sep 17 00:00:00 2001
From: MitulDavid <mituldavid@gmail.com>
Date: Fri, 6 Aug 2021 18:31:41 +0530
Subject: [PATCH] refactor: Toggle optimization using checkbox

---
 frappe/public/icons/timeless/symbol-defs.svg      |  3 ---
 .../js/frappe/file_uploader/FilePreview.vue       | 15 +++++++++------
 frappe/utils/image.py                             |  7 +++++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg
index 555ea6ee7e..6108daa938 100644
--- a/frappe/public/icons/timeless/symbol-defs.svg
+++ b/frappe/public/icons/timeless/symbol-defs.svg
@@ -702,7 +702,4 @@
 	<symbol xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" id="icon-crop">
 		<path d="M14.88,11.63H4.33V1.12m7.34,10.51v3.25M6,4.37h5.64V10M1.13,4.37h3.2" stroke-linecap="round" stroke-linejoin="round"/>
 	</symbol>
-	<symbol xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" id="icon-optimized">
-		<path d="M4.88,11.91,7.63,9.15m-2.39,0H7.63v2.4m3.49-5.9L8.37,8.41m2.39,0H8.37V6m.94-4.58H3.63A1.31,1.31,0,0,0,2.32,2.75v10.5a1.31,1.31,0,0,0,1.31,1.31h8.74a1.31,1.31,0,0,0,1.31-1.31V5.81Z" stroke-linecap="round" stroke-linejoin="round"/>
-	</symbol>
 </svg>
diff --git a/frappe/public/js/frappe/file_uploader/FilePreview.vue b/frappe/public/js/frappe/file_uploader/FilePreview.vue
index 9e2fafb1e9..73adeb6fbb 100644
--- a/frappe/public/js/frappe/file_uploader/FilePreview.vue
+++ b/frappe/public/js/frappe/file_uploader/FilePreview.vue
@@ -20,9 +20,6 @@
 					<button class="ml-2 btn-reset" @click="$emit('toggle_private')" :title="__('Toggle Public/Private')">
 						<div v-html="private_icon"></div>
 					</button>
-					<button class="ml-2 btn-reset" v-if="is_optimizable" @click="$emit('toggle_optimize')" :title="__('Toggle optimization on/off')">
-						<div v-html="optimize_icon"></div>
-					</button>
 				</span>
 			</div>
 
@@ -31,6 +28,7 @@
 					{{ file.file_obj.size | file_size }}
 				</span>
 			</div>
+			<label v-if="is_optimizable" class="optimize-checkbox"><input type="checkbox" @change="$emit('toggle_optimize')">Optimize</label>
 		</div>
 		<div class="file-actions">
 			<ProgressRing
@@ -86,9 +84,6 @@ export default {
 		private_icon() {
 			return frappe.utils.icon(this.is_private ? 'lock' : 'unlock');
 		},
-		optimize_icon() {
-			return frappe.utils.icon(this.file.optimize ? 'optimized' : 'image');
-		},
 		is_private() {
 			return this.file.doc ? this.file.doc.is_private : this.file.private;
 		},
@@ -204,4 +199,12 @@ export default {
 .muted:hover {
 	opacity: 1;
 }
+
+.optimize-checkbox {
+	font-size: var(--text-sm);
+	color: var(--text-light);
+	display: flex;
+	align-items: center;
+	padding-top: 0.25rem;
+}
 </style>
diff --git a/frappe/utils/image.py b/frappe/utils/image.py
index 556c5e4a32..88d885e442 100644
--- a/frappe/utils/image.py
+++ b/frappe/utils/image.py
@@ -40,6 +40,9 @@ def strip_exif_data(content, content_type):
 	return content
 
 def optimize_image(content, content_type, max_width=1920, max_height=1080, optimize=True, quality=85):
+	if content_type == 'image/svg+xml':
+		return content
+
 	image = Image.open(io.BytesIO(content))
 	image_format = content_type.split('/')[1]
 	size = max_width, max_height
@@ -48,5 +51,5 @@ def optimize_image(content, content_type, max_width=1920, max_height=1080, optim
 	output = io.BytesIO()
 	image.save(output, format=image_format, optimize=optimize, quality=quality, save_all=True if image_format=='gif' else None)
 
-	content = output.getvalue()
-	return content
\ No newline at end of file
+	optimized_content = output.getvalue()
+	return optimized_content if len(optimized_content) < len(content) else content
\ No newline at end of file