From be09818ad3c1d9fdde1b7f54340c0437ead07114 Mon Sep 17 00:00:00 2001 From: Hofi Date: Thu, 21 Aug 2025 13:22:52 +0200 Subject: [PATCH 1/2] helpers: progress logging enhancements Signed-off-by: Hofi --- _plugins/generate_tooltips.rb | 3 ++- _tools/navgen | 9 ++++++--- _tools/serve | 9 ++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/_plugins/generate_tooltips.rb b/_plugins/generate_tooltips.rb index a83c0fd7..8a90e973 100644 --- a/_plugins/generate_tooltips.rb +++ b/_plugins/generate_tooltips.rb @@ -392,7 +392,6 @@ def gen_page_link_data(links_dir, link_files_pattern) def generate_tooltips(page, write_back) puts "collection: " + (page.respond_to?(:collection) ? page.collection.label : "") + ", ndx: #{page.data["nav_ndx"]}, relative_path: #{page.relative_path}" - puts "------------------------------------" process_page(page) #puts "\n\n\n" + page.content @@ -400,6 +399,8 @@ def generate_tooltips(page, write_back) if write_back write_to_file(page.path, page.content) end + + puts "-----------" end # def generate_tooltips end # class << self diff --git a/_tools/navgen b/_tools/navgen index 627ea1ea..111259a5 100755 --- a/_tools/navgen +++ b/_tools/navgen @@ -183,6 +183,7 @@ add_warning_header () gen_navigation() { + echo "Generating navigation data..." > "${OUTPUT_FILE}" add_warning_header "${OUTPUT_FILE}" @@ -200,20 +201,22 @@ gen_navigation() shift done - echo "YAML navigation structure is generated and saved to $OUTPUT_FILE" + echo -e "YAML navigation structure is generated and saved to $OUTPUT_FILE\n\n\n" } gen_links() { + echo "Generating Jekyll page links..." rm -Rf _data/links JEKYLL_BUILD_LINKS='yes' JEKYLL_BUILD_TOOLTIPS='no' bundle exec jekyll build - echo "Jekyll page links are generated and saved to _data/links" + echo -e "Jekyll page links are generated and saved to _data/links\n\n\n" } gen_tooltips() { + echo "Generating Jekyll tooltips..." JEKYLL_BUILD_LINKS='no' JEKYLL_BUILD_TOOLTIPS='yes' bundle exec jekyll build - echo "Jekyll tooltips are generated and saved" + echo -e "Jekyll tooltips are generated and saved\n\n\n" } process_params() diff --git a/_tools/serve b/_tools/serve index d9176ff4..97c52054 100755 --- a/_tools/serve +++ b/_tools/serve @@ -26,11 +26,11 @@ stop_dir_watcher() { # Function to start to serve in the background start_process() { + echo "" + # FIXME:This would report al the file changes, must parse and filter out waht we are really interested in #start_dir_watcher - echo -e "\nStarting to serve...\n" - reset_watcher rm -Rf _site @@ -42,13 +42,12 @@ start_process() { # as the output of it must already be presented to be able to serve a valid content # if [ "${JEKYLL_BUILD_LINKS}" == "yes" ]; then - echo -e "Generating navigation data..." ./_tools/navgen ./doc ./_data/navigation.yml fi + + echo -e "\nStarting to serve...\n" JEKYLL_BUILD_LINKS='no' bundle exec jekyll serve ${ALL_PARAMS} & PROC_PID=$! - - echo -e "\n\n\n" } stop_process() { From c01409b0429eab3f6c1f6d574d640d6bb6c3d5a4 Mon Sep 17 00:00:00 2001 From: Hofi Date: Thu, 21 Aug 2025 14:24:23 +0200 Subject: [PATCH 2/2] serve: do not run tooltip gen twice if not needed Signed-off-by: Hofi --- _tools/serve | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_tools/serve b/_tools/serve index 97c52054..b74b04b3 100755 --- a/_tools/serve +++ b/_tools/serve @@ -42,7 +42,8 @@ start_process() { # as the output of it must already be presented to be able to serve a valid content # if [ "${JEKYLL_BUILD_LINKS}" == "yes" ]; then - ./_tools/navgen ./doc ./_data/navigation.yml + # tooltips will be built at jekyll serve startup automatically if enabled, do not do it twice + JEKYLL_BUILD_TOOLTIPS='no' ./_tools/navgen ./doc ./_data/navigation.yml fi echo -e "\nStarting to serve...\n"