From f67c4ddca0c78c40ca1fe57b44b477e3812ea758 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Mon, 26 Sep 2022 08:54:12 +0200
Subject: [PATCH] :bug: Fix woff2 generation

---
 backend/src/app/media.clj                | 20 +++-----------------
 backend/test/app/services_fonts_test.clj |  2 --
 backend/test/app/storage_test.clj        |  6 +++---
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/backend/src/app/media.clj b/backend/src/app/media.clj
index 99cbe15cd..9434d8f2b 100644
--- a/backend/src/app/media.clj
+++ b/backend/src/app/media.clj
@@ -229,17 +229,6 @@
               (when (zero? (:exit res))
                 foutput)))
 
-          (ttf-or-otf->woff2 [data]
-            ;; NOTE: foutput is not used directly, it represents the
-            ;; default output of the exection of the underlying
-            ;; command.
-            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix ".tmp")
-                  foutput (fs/path (str (fs/base finput) ".woff2"))
-                  _       (bs/write-to-file! data finput)
-                  res      (sh/sh "woff2_compress" (str finput))]
-              (when (zero? (:exit res))
-                foutput)))
-
           (woff->sfnt [data]
             (let [finput  (tmp/tempfile :prefix "penpot" :suffix "")
                   _       (bs/write-to-file! data finput)
@@ -271,15 +260,13 @@
         (let [data (get input "font/ttf")]
           (-> input
               (update "font/otf" gen-if-nil #(ttf->otf data))
-              (update "font/woff" gen-if-nil #(ttf-or-otf->woff data))
-              (assoc "font/woff2" (ttf-or-otf->woff2 data))))
+              (update "font/woff" gen-if-nil #(ttf-or-otf->woff data))))
 
         (contains? current "font/otf")
         (let [data (get input "font/otf")]
           (-> input
               (update "font/woff" gen-if-nil #(ttf-or-otf->woff data))
-              (assoc "font/ttf" (otf->ttf data))
-              (assoc "font/woff2" (ttf-or-otf->woff2 data))))
+              (assoc "font/ttf" (otf->ttf data))))
 
         (contains? current "font/woff")
         (let [data (get input "font/woff")
@@ -291,8 +278,7 @@
           (let [stype (get-sfnt-type sfnt)]
             (cond-> input
               true
-              (-> (assoc "font/woff" data)
-                  (assoc "font/woff2" (ttf-or-otf->woff2 sfnt)))
+              (-> (assoc "font/woff" data))
 
               (= stype :otf)
               (-> (assoc "font/otf" sfnt)
diff --git a/backend/test/app/services_fonts_test.clj b/backend/test/app/services_fonts_test.clj
index dfe87e569..62619ae56 100644
--- a/backend/test/app/services_fonts_test.clj
+++ b/backend/test/app/services_fonts_test.clj
@@ -46,7 +46,6 @@
       (t/is (uuid? (:ttf-file-id result)))
       (t/is (uuid? (:otf-file-id result)))
       (t/is (uuid? (:woff1-file-id result)))
-      (t/is (uuid? (:woff2-file-id result)))
       (t/are [k] (= (get params k)
                     (get result k))
         :team-id
@@ -82,7 +81,6 @@
       (t/is (uuid? (:ttf-file-id result)))
       (t/is (uuid? (:otf-file-id result)))
       (t/is (uuid? (:woff1-file-id result)))
-      (t/is (uuid? (:woff2-file-id result)))
       (t/are [k] (= (get params k)
                     (get result k))
         :team-id
diff --git a/backend/test/app/storage_test.clj b/backend/test/app/storage_test.clj
index 3a921c8aa..f2c276c9c 100644
--- a/backend/test/app/storage_test.clj
+++ b/backend/test/app/storage_test.clj
@@ -233,7 +233,7 @@
     ;; run the touched gc task
     (let [task (:app.storage/gc-touched-task th/*system*)
           res  (task {})]
-      (t/is (= 6 (:freeze res)))
+      (t/is (= 5 (:freeze res)))
       (t/is (= 0 (:delete res)))
 
       (let [result-1 (:result out1)
@@ -248,7 +248,7 @@
         ;; Run the task again
         (let [res  (task {})]
           (t/is (= 2 (:freeze res)))
-          (t/is (= 4 (:delete res))))
+          (t/is (= 3 (:delete res))))
 
         ;; now check that there are no touched objects
         (let [res (db/exec-one! th/*pool* ["select count(*) from storage_object where touched_at is not null"])]
@@ -256,7 +256,7 @@
 
         ;; now check that all objects are marked to be deleted
         (let [res (db/exec-one! th/*pool* ["select count(*) from storage_object where deleted_at is not null"])]
-          (t/is (= 4 (:count res))))))))
+          (t/is (= 3 (:count res))))))))
 
 (t/deftest test-touched-gc-task-3
   (let [storage (-> (:app.storage/storage th/*system*)