From 47f98d74421ffa2c458b1d8f0faca01b6cdc36a2 Mon Sep 17 00:00:00 2001
From: cage <cage@invalid>
Date: Sun, 16 Jul 2023 14:38:16 +0200
Subject: [PATCH] - [GUI] added custom error pages for gemini errors code.

---
 data/error-pages/51                          |   8 ++++
 data/icons/fmw_text.png                      | Bin 0 -> 1476 bytes
 src/gui/server/public-api-gemini-stream.lisp |  47 ++++++++++++++-----
 3 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 data/error-pages/51
 create mode 100644 data/icons/fmw_text.png

diff --git a/data/error-pages/51 b/data/error-pages/51
new file mode 100644
index 0000000..c636147
--- /dev/null
+++ b/data/error-pages/51
@@ -0,0 +1,8 @@
+# Error!
+
+### {url}
+### not found
+
+### Server replied:
+
+### {meta}
diff --git a/data/icons/fmw_text.png b/data/icons/fmw_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5be01e34773c4a10bd0226e535957406273d187
GIT binary patch
literal 1476
zcmV;#1v~nQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%W=TXrRCwCFS4&J>RT%#6YX%0a*b+^<
zkP+g8vS3peHZm19HtEKs6q5?JKttQ1b)@3LCbT}HO&S8Ci?)g3Ifh3<(uJ(LsJ4|N
z8x|%KHwCGwu~2y$dEI;c|8wUIckaxf7|WUdIoxyp^FO}-aZVKgdTVRzb=$TN*|vr4
z7>c42DMJkn4R7f5oyp4S0}G2w+hV|uC$d3KA7b5XK!#;Go<Df-8{0?L{TnY7kl|ZW
z?6BL|@#6D{>CDiDMjDo7vsCe+{DTFWrU_yprfF`$5SxCAqbufznjlzJNU#c(=5(a%
zD*S#QPS(|8a$<tMwN3fm#Ijk3d+3R<Y6<W&5)K-QuwJg|x&g!R!AFMZx{ub@1qzZ9
z&pN~LIvFW-gTW#T-JWXj`3z)cW{@CT7{-6|8t-YUN(T6ml^wwJ^g{#!nejb&E-Nb#
zKW7+P3<X8TKNSKS7OSLSWOx{TeZ5#-SrLbGcjY1yIfr0=5Sp%IbYvKxe)6&KEH^h7
zXU;^hd(UpH5Pwg17jECWC4638T}5YiPXa<o2#60#2{#4v3s8Ud9Sja$M>N`t7YbiO
zd&gJs`~1S#(H}<9bm2oZUHk~k%PZ*X??qN13j_WA7#kbI>2N(h|KdwDoO=%hA}Mp^
zrq2PHAT((N<sS0p#*H8Gb+j8ZGml`9*A{uedko{z$|@8T<clMR50|5>s}ueVKknSQ
zjq>s%cxC^7tgNn}xVV_kS;AeX&e9klt>f88Np|VdXZZF06pkIQM$z8An4O=;#S2Xo
zf5(7b1iNKA@q9KfPt1QUFAEigMMYxIHf<;OY$SP~6aq#-5G4wGIX?aq&PLwFt0g7K
z*|`%73ya`(&2m%<!R#N8L?tlYpPCZ!&Cbpi`hFfC7wZNmrlAXYQhr(kG!m-1h|T_G
za+1(6u(q~_@4meW38F$tIyg9piF@}14Gi>S-@cczP6=07ScsvaZ!j`)7c&p1F?{!X
z5k9UQO-U01n>VPtDYnxQO@g@mNChQdH@YdK1AzcuKX_1N_#7d@bC6&^fBpk;J{ZhH
zI2;xg)7bbvE;nCBTWhPx8G{gb?LeuJX-i#*ryHJbZf^cP5{Y1LZa!Wn9A}13C(C8u
zcN3SX(`-~MEiF>5XJUPQU9@K2GYB<q*F1QQOOa<jlauo#+S=O4(8gzU*`u9HNZIHI
z^iK-hxJ>N0G47thMskRx@tmNnQ1bAyJmc-Gx@6!Dw%BR4y6}t>P73vU?rtjb94lt>
z@=2p)2XxlcbV3$ZUmq58C=`kvvYom=T8UGqPNKB5R0y^#Q>=x<r-i~$sDx1CwYL)Z
z_`FFaSyAz3QYX~i%2^1Ht5>gynzg(L(1pT#-ki8{<(jA(<`)Qf_{4cyGc7ael1eau
ze|&)B&OfO*VVEgyc^0mCc+Hg0f%FD&UT_0q&vnXRHD<kNp|<yB<E*RB+b+%P$BtiW
zG6&)bt)vP;tOe_ujuW-Do*eKfr?u+p8gz8D$CJ&=V-rtJ%?TW@J|=R3E2^sMZKoPG
zyNoD`Xz%QFAz%ZZFo-bOCJC?J6anVxAX#n%6lK%PD5jLGwcLTTH@bxzG4C_pcJIlD
zPK-yCdW!d^?v5ANzI+X(deO>Pt*R<p+Lw*U+tiW}aGqou#i~je5eglM_W|bTzw7Gi
zP+3`tva+&xjY}oz_IYCEyywj+-FrJTb5BptrjP4rH2R<R`C+Q0dJ)O6q=NSU9B%n>
zoz8}a?H*F69=lAIT3TAN-AVE|N9=!AOR{2eh@K;QDzQgB*1_31OEkd>4WcX}-!?~K
emFUmE1sDM4U&H%<mj6@$0000<MNUMnLSTXk2DYOB

literal 0
HcmV?d00001

diff --git a/src/gui/server/public-api-gemini-stream.lisp b/src/gui/server/public-api-gemini-stream.lisp
index 02799e3..849b892 100644
--- a/src/gui/server/public-api-gemini-stream.lisp
+++ b/src/gui/server/public-api-gemini-stream.lisp
@@ -518,7 +518,7 @@
   (encode-flat-array-of-plists (unbox object) stream))
 
 (defun gemini-parse-string (string)
-  (let ((parsed-lines (gemini-parser:parse-gemini-file string)))
+  (let ((parsed-lines (gemini-parser:parse-gemini-file string :initialize-parser t)))
     (make-instance 'parsed-lines-slice
                    :contents (rearrange-parsed-line-for-encoding parsed-lines))))
 
@@ -530,19 +530,40 @@
 (defun gemini-slurp-local-file (path)
   (fs:slurp-file path))
 
+(a:define-constant +error-pages-path+                "/data/error-pages" :test #'string=)
+
+(a:define-constant +error-template-url-placeholder+  "{url}"       :test #'string=)
+
+(a:define-constant +error-template-meta-placeholder+ "{meta}"      :test #'string=)
+
+(defun construct-error-page (iri code meta)
+  (ignore-errors
+   (a:when-let* ((file-path (res:get-data-file (fs:cat-parent-dir +error-pages-path+
+                                                                  (to-s code))))
+                 (template  (fs:slurp-file file-path)))
+     (setf template (cl-ppcre:regex-replace-all +error-template-url-placeholder+
+                                                template
+                                                iri))
+     (setf template (cl-ppcre:regex-replace-all +error-template-meta-placeholder+
+                                                template
+                                                meta)))))
+
 (defun make-error-page (iri code description meta)
-  (let* ((separator (make-string 10 :initial-element gemini-parser::+h2-underline+))
-         (gemtext   (with-output-to-string (stream)
-                      (write-sequence (gemini-parser:geminize-h2 (format nil
-                                                                         "~a ~a~%"
-                                                                         code
-                                                                         description))
-                                      stream)
-                      (write-sequence (gemini-parser:geminize-preformatted separator)
-                                      stream)
-                      (write-sequence (format nil "Error connecting to: ~a:~2%" iri) stream)
-                      (write-sequence (format nil "~a~%" meta) stream))))
-    (gemini-parse-string gemtext)))
+  (let ((error-gemtext (construct-error-page iri code meta)))
+    (if error-gemtext
+        (gemini-parse-string error-gemtext)
+        (let* ((separator (make-string 10 :initial-element gemini-parser::+h2-underline+))
+               (gemtext   (with-output-to-string (stream)
+                            (write-sequence (gemini-parser:geminize-h2 (format nil
+                                                                               "~a ~a~%"
+                                                                               code
+                                                                               description))
+                                            stream)
+                            (write-sequence (gemini-parser:geminize-preformatted separator)
+                                            stream)
+                            (write-sequence (format nil "Error connecting to: ~a:~2%" iri) stream)
+                            (write-sequence (format nil "~a~%" meta) stream))))
+          (gemini-parse-string gemtext)))))
 
 (defun gemini-save-url-db-history (iri)
   (db:insert-in-history (ui:open-url-prompt) iri))