From 8f8ca674585885d84a56296510af01723de8d7d5 Mon Sep 17 00:00:00 2001
From: "Salvador E. Tropea" <salvador@inti.gob.ar>
Date: Thu, 28 Dec 2023 14:06:50 -0300
Subject: [PATCH] [KiRi] Simplified the layout

- No more web/ and redirect.html
- No more favicon.ico (embedded)
- Now we check for blank.svg, that now is simplified
---
 kibot/out_kiri.py                  |   6 +++---
 kibot/resources/kiri/favicon.ico   | Bin 19518 -> 0 bytes
 kibot/resources/kiri/kiri.js       |  30 ++++++++++++++---------------
 kibot/resources/kiri/redirect.html |  11 -----------
 4 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100644 kibot/resources/kiri/favicon.ico
 delete mode 100644 kibot/resources/kiri/redirect.html

diff --git a/kibot/out_kiri.py b/kibot/out_kiri.py
index d6c20992..51ad3f2a 100644
--- a/kibot/out_kiri.py
+++ b/kibot/out_kiri.py
@@ -220,13 +220,13 @@ class KiRiOptions(VariantOptions):
 
     def create_kiri_files(self):
         src_dir = GS.get_resource_path('kiri')
-        copy2(os.path.join(src_dir, 'redirect.html'), os.path.join(self.cache_dir, 'index.html'))
         copy2(os.path.join(src_dir, 'kiri-server'), os.path.join(self.cache_dir, 'kiri-server'))
-        web_dir = os.path.join(self.cache_dir, 'web')
+        web_dir = self.cache_dir
         os.makedirs(web_dir, exist_ok=True)
-        copy2(os.path.join(src_dir, 'favicon.ico'), os.path.join(web_dir, 'favicon.ico'))
         copy2(os.path.join(src_dir, 'blank.svg'), os.path.join(web_dir, 'blank.svg'))
         self.copy_index(src_dir, os.path.join(src_dir, 'index.html'), os.path.join(web_dir, 'index.html'))
+        # copy2(os.path.join(src_dir, 'redirect.html'), os.path.join(self.cache_dir, 'index.html'))
+        # copy2(os.path.join(src_dir, 'favicon.ico'), os.path.join(web_dir, 'favicon.ico'))
         # copytree(os.path.join(src_dir, 'images'), os.path.join(web_dir, 'images'), dirs_exist_ok=True)
         # copy2(os.path.join(src_dir, 'kiri.css'), os.path.join(web_dir, 'kiri.css'))
         # copy2(os.path.join(src_dir, 'kiri.js'), os.path.join(web_dir, 'kiri.js'))
diff --git a/kibot/resources/kiri/favicon.ico b/kibot/resources/kiri/favicon.ico
deleted file mode 100644
index 0e1fef160b10400c86f58dab3cc3968ad554f6a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19518
zcmeI2J8~R15QclaRbEHh%#liyDsrrVRlI;MqKu&emv>I##FyDK_ykks3v9@M#c?+t
z4K&aga5yiCOQ@v5-;L=H{m)}p5&;_g)pdY>{sy1F0{jjDpYb<_C}`p|)yBW@D~A7p
zKmPuvrQc)k4!k??h8<|8kApg1>Ctq2qv8+m{8u?}BmVO}lbW<e{|vViv4suz3H~4+
zmG$`<UTk1>zQg}whg0Datj)JTN2h}g@CFv+yUx@@giklH1z+Hk4Q#+q@NNU{3M|Uc
zNP56rqaFG79<&?a{?!{N3i86j=PxeRyH%o*0bDjhsZ(C~!}66zOCjoTasNv&CH@xq
zN}HvSxxo_u!~Ip8nX~ghN-!n<Bk-4g|AaPEYeL4&qV}O?wvtclTOBA_KBUad<`?ci
zFfx4dVifqr`WJlH8yzeyWZm}<{tl@4TMH=-#w}tx<A;w1cQUW2!IZql4-Hb5tFr;g
zIbnfPzZObr87cUoI?a^j(SjOG$twkezjS@0@@ATxAks?xS|}+;Qna7(g$II;|28>&
z)c6U(Npn`7nvPe#f7IH~u^d^R&!t~9c?<j*_Ahe(3I2;*4~v%Ye`mhHD-VBYR+%l(
zzu+r~(a@57dc};wl;nK=to9eU|99pK{ABy*_b>R$1+Ii<U;mx?0zcjU+5QWD#cM4+
z*MH`}=HbT;&EzxQe6QCUti+b&S5Rtt9)EWGGyNBQwZB?$!TxI~H9w0l+JD8vk2_k9
zueMhW{>=OZ?4RYo;8&g27tHWq;9qz5&AR_?oG;to-v1ltC+%<U|IYjrzjgmN&d=K4
z*#8^n=k0In|DJsMix%@q*r9*Ds79xM|3Dn${r{$5tV+@sOy*O!JM%UCmi_O^FWF!2
zpUx=X9#gMBmQvfl5k6VT{gdFKKVBHMD@y5!{$nx5M-M-SOMpfB)XUEN0)Dgp_vDY*
zze)e)tG~_tw*j9lrlCET6fa%=W&9@sk8BH=DdLylGucn%4k)@N-&3Qb*uW@$e*cWc
z9(f*bU|qgLvcXP=4N!oyVTW#A)W4669{tCKuWuKJ`mqUID5N>W6JOAO;Bi8q_~njo
z7lry}mYo^$S!!ngrd}v-XBi|c$Wm+Y(~CTYpT}3*54dcWw;%ESrFBQUHVLw{*MA~k
z!O!PsO_l>U&ez)C(*L)~k6!NOJC8DI`}6(ZlW%{fEo)ovRFCo-C7syiY1HfZ^C#u&
zphDCa%#JVTr&pjr(!&|o2VTT?KU63jFem!&2hnjAzW=F4-hrb;Tt8ih?>At+WHG`s
z<0B`<#M_-6?W!#70#RX6&Wb1-rph`Dl>ig|{+|{ONHI&7SzY9hCq(6N4XCC}1+^l-
z;T;5AHd~dS(el7MUvpsmHY;Xxd#e$RKJxq((I!!)<qO^v-@4NdLl^tBjBW;B)7Co;
zy$e{~4p*V?hex5$&6Chi@K?~ofUEC?zCzpC0M^IR!zpM}I@QMuoN-~-4t6Uex~IyA
zu)d}*v>xl3f%VNS(;eq=4`RQlML$69ME$}Sc!IM%9k4#?XZ+>sJ;QfwE%^5g52ixM
zKR|pvp5O`xz6n}9vj_OomBadv4Qd{wFRZ}irM{w7VPG$ZE=XLT>i#J6{V`gO>-&?`
zmk;B*`y}(-$8imJGLLpfqaD!BXtZQ+G*CZ85?Zn|8mRk7QeJ9lFSOF$TuXbQm3Bfa
z?X2sIe=_VY+nVnDljhc^8tyxraruh=1ZT0nrauDTss@niyGG`}B>H=zAHuC~>ZST>
z^8V=q=#NytsGI&I^36r+L#n%0tUo0Bm}-2KWBxJL1HdWL2Yju3z*m7^f5O)Y+RK_A
zb+nK5{eRCwpYbJgM|ph5;9CY?I`r_fZXWS966<TGkNB|j`a=&mNL&A`J_dcEd`+K{
z^&`5cdbsy4<^|nc35LVvQDd=4Q-6`B{^NS+&RJ;kFXG`8U&1Zd$7=Xyu$p#;R`fyx
LdK~9z&5HVeuBs1H

diff --git a/kibot/resources/kiri/kiri.js b/kibot/resources/kiri/kiri.js
index 7a17dedf..c480b9f7 100644
--- a/kibot/resources/kiri/kiri.js
+++ b/kibot/resources/kiri/kiri.js
@@ -546,13 +546,13 @@ function update_selected_page()
     var image_path_2;
 
     if (sheet_pages_commit1.has(page_filename)) {
-        image_path_1 = "../" + commit1.value + "/_KIRI_/sch/" + page_filename + ".svg";
+        image_path_1 = commit1.value + "/_KIRI_/sch/" + page_filename + ".svg";
     } else {
         image_path_1 = "blank.svg";
     }
 
     if (sheet_pages_commit2.has(page_filename)) {
-        image_path_2 = "../" + commit2.value + "/_KIRI_/sch/" + page_filename + ".svg";
+        image_path_2 = commit2.value + "/_KIRI_/sch/" + page_filename + ".svg";
     } else {
         image_path_2 = "blank.svg";
     }
@@ -593,11 +593,11 @@ function update_page()
 
 function update_sheets_list() {
 
-    // File = ../[COMMIT]/_KIRI_/sch_sheets
+    // File = [COMMIT]/_KIRI_/sch_sheets
     // Data format: Name_without_extension|Relative_file_name|UUID|Instance_name|Sheet_Path_Name
 
-    data1 = loadFile("../" + commit1.value + "/_KIRI_/sch_sheets" + url_timestamp(commit1));
-    data2 = loadFile("../" + commit2.value + "/_KIRI_/sch_sheets" + url_timestamp(commit2));
+    data1 = loadFile(commit1.value + "/_KIRI_/sch_sheets" + url_timestamp(commit1));
+    data2 = loadFile(commit2.value + "/_KIRI_/sch_sheets" + url_timestamp(commit2));
 
     var sheets = [];
     var new_sheets_list = [];
@@ -704,7 +704,7 @@ function pad(num, size)
 function load_commits()
 {
     commit1 = commit2 = -1;
-    commits = loadFile("../commits");
+    commits = loadFile("commits");
     var i = 1;
     var all_commits_html = "";
     for (const line of commits)
@@ -761,7 +761,7 @@ function load_project_data()
     // Data format: TITLE
     //              SCH_TITLE|SCH_REVISION|SCH_DATE
     //              PCB_TITLE|PCB_REVISION|PCB_DATE
-    data = loadFile("../project");
+    data = loadFile("project");
     document.title = data[0];
     splitted = data[1].split("|");
     document.getElementById("sch_title_text").innerHTML = splitted[0];
@@ -788,11 +788,11 @@ function update_layers_list()
     var new_layers_list = [];
     var form_inputs_html;
 
-    // File = ../[COMMIT]/_KIRI_/pcb_layers
+    // File = [COMMIT]/_KIRI_/pcb_layers
     // Format = ID|LAYER
 
-    var used_layers_1 = loadFile("../" + commit1.value + "/_KIRI_/pcb_layers" + url_timestamp(commit1));
-    var used_layers_2 = loadFile("../" + commit2.value + "/_KIRI_/pcb_layers" + url_timestamp(commit2));
+    var used_layers_1 = loadFile(commit1.value + "/_KIRI_/pcb_layers" + url_timestamp(commit1));
+    var used_layers_2 = loadFile(commit2.value + "/_KIRI_/pcb_layers" + url_timestamp(commit2));
 
     layers_commit1 = new Set();
     for (const line of used_layers_1)
@@ -901,16 +901,16 @@ function update_layer()
 function update_selected_layer() {
 
     var layer_id = layers[selected_layer].id.split("-")[1];
-    var image_path_1 = "../" + commit1.value + "/_KIRI_/pcb/layer" + "-" + layer_id + ".svg";
-    var image_path_2 = "../" + commit2.value + "/_KIRI_/pcb/layer" + "-" + layer_id + ".svg";
+    var image_path_1;
+    var image_path_2;
 
     if (layers_commit1.has(layer_id)) {
-        image_path_1 = "../" + commit1.value + "/_KIRI_/pcb/layer" + "-" + layer_id + ".svg";
+        image_path_1 = commit1.value + "/_KIRI_/pcb/layer" + "-" + layer_id + ".svg";
     } else {
         image_path_1 = "blank.svg";
     }
     if (layers_commit2.has(layer_id)) {
-        image_path_2 = "../" + commit2.value + "/_KIRI_/pcb/layer" + "-" + layer_id + ".svg";
+        image_path_2 = commit2.value + "/_KIRI_/pcb/layer" + "-" + layer_id + ".svg";
     } else {
         image_path_2 = "blank.svg";
     }
@@ -1055,7 +1055,7 @@ function check_server_status()
         server_is_offline();
     };
 
-    img.src = "favicon.ico" + url_timestamp();
+    img.src = "blank.svg" + url_timestamp();
 
     setTimeout(check_server_status, 5000);
 }
diff --git a/kibot/resources/kiri/redirect.html b/kibot/resources/kiri/redirect.html
deleted file mode 100644
index 722adbe5..00000000
--- a/kibot/resources/kiri/redirect.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv='refresh' content='0; URL=/web/index.html'>
-</head>
-<body>
-</body>
-</html>
-
-
-