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 0e1fef16..00000000 Binary files a/kibot/resources/kiri/favicon.ico and /dev/null differ 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 @@ - - - - - - - - - - -