bugfix pluto export

Author: SKopecz

scripts/export_pluto.jl

@@ -4,97 +4,70 @@
 # - Run with: julia --project=. scripts/export_pluto.jl
 
 using Pkg
-Pkg.activate(".")  # prefer repo environment if present
-
-import Dates
-using Printf
 using Logging
 
-notebook_dir = joinpath(pwd(), "notebooks")
-output_dir   = joinpath(pwd(), "public")
-mkpath(output_dir)
-
-if !isdir(notebook_dir)
-    @info "No notebooks/ directory found; nothing to export."
-    exit(0)
-end
+const EXPORTER_PKG = "PlutoStaticHTML"
 
-notebooks = filter(f -> endswith(f, ".jl"), readdir(notebook_dir; join=true))
-if isempty(notebooks)
-    @info "No .jl notebooks found in notebooks/. Nothing to do."
-    exit(0)
-end
-
-const exporter_pkg = "PlutoStaticHTML"
-
-# Ensure exporter is available (try to load, otherwise add it)
 function ensure_exporter(pkg::String)
     try
         @eval using PlutoStaticHTML
         return true
-    catch
-        @info "$pkg not present in environment, trying to add it for this run..."
+    catch err
+        @info("$pkg not present in environment, trying to add it for this run...")
         try
             Pkg.add(pkg)
             @eval using PlutoStaticHTML
             return true
-        catch err
-            @error "Failed to install or load $pkg: $err"
+        catch err2
+            @error("Failed to install or load $pkg: $err2")
             return false
         end
     end
 end
 
-ok = ensure_exporter(exporter_pkg)
-if !ok
-    @error "Exporter $exporter_pkg not available. Add it to Project.toml or install it manually."
-    exit(1)
-end
-
-# Try several common export function names in PlutoStaticHTML
 function try_export_with_known_apis(mod, nbpath::String, outpath::String)
     # 1) export(nb, outpath)
     if isdefined(mod, :export)
         try
-            @info "Calling PlutoStaticHTML.export($(nbpath), $(outpath))"
+            @info("Calling PlutoStaticHTML.export($nbpath, $outpath)")
             getfield(mod, :export)(nbpath, outpath)
             return true
         catch err
-            @warn "PlutoStaticHTML.export failed: $err"
+            @warn("PlutoStaticHTML.export failed: $err")
         end
     end
 
     # 2) save_html(nb, outpath)
     if isdefined(mod, :save_html)
         try
-            @info "Calling PlutoStaticHTML.save_html($(nbpath), $(outpath))"
+            @info("Calling PlutoStaticHTML.save_html($nbpath, $outpath)")
             getfield(mod, :save_html)(nbpath, outpath)
             return true
         catch err
-            @warn "PlutoStaticHTML.save_html failed: $err"
+            @warn("PlutoStaticHTML.save_html failed: $err")
         end
     end
 
     # 3) notebook_to_html(nb) -> returns HTML string
     if isdefined(mod, :notebook_to_html)
         try
-            @info "Calling PlutoStaticHTML.notebook_to_html($(nbpath)) -> writing to $(outpath)"
+            @info("Calling PlutoStaticHTML.notebook_to_html($nbpath) -> writing to $outpath")
             html = getfield(mod, :notebook_to_html)(nbpath)
             open(outpath, "w") do io
                 write(io, html)
             end
             return true
         catch err
-            @warn "PlutoStaticHTML.notebook_to_html failed: $err"
+            @warn("PlutoStaticHTML.notebook_to_html failed: $err")
         end
     end
 
-    # 4) try to autodiscover any function name containing "html" or "export"
+    # 4) autodiscover candidate functions with "html", "export" or "render" in the name
     fnames = filter(n -> occursin("html", String(n)) || occursin("export", String(n)) || occursin("render", String(n)), names(mod, all=true))
     for fname in fnames
         try
             f = getfield(mod, fname)
-            @info "Attempting autodiscovered function: $(fname)"
+            @info("Attempting autodiscovered function: $(fname)")
             # Try calling with (nb, outpath) then with (nb) and write result if string-like
             try
                 f(nbpath, outpath)
@@ -107,39 +80,62 @@ function try_export_with_known_apis(mod, nbpath::String, outpath::String)
                 end
             end
         catch err
-            @warn "Autodiscovered attempt $(fname) failed: $err"
+            @warn("Autodiscovered attempt $(fname) failed: $err")
         end
     end
 
     return false
 end
 
-# Perform exports
-success_count = 0
-for nb in notebooks
-    name = splitext(basename(nb))[1]
-    outpath = joinpath(output_dir, "$(name).html")
-    @info "Exporting $(nb) -> $(outpath)"
+function main()
+    notebook_dir = joinpath(pwd(), "notebooks")
+    output_dir   = joinpath(pwd(), "public")
+    mkpath(output_dir)
 
-    try
-        ok = try_export_with_known_apis(PlutoStaticHTML, nb, outpath)
-        if ok
-            @info "Export succeeded for $(nb)"
-            success_count += 1
-            continue
-        else
-            @warn "No known export API succeeded for $(nb)."
-            @warn "Inspect PlutoStaticHTML.jl API or update this script to call the correct function."
+    if !isdir(notebook_dir)
+        @info "No notebooks/ directory found; nothing to export."
+        return
+    end
+
+    notebooks = filter(f -> endswith(f, ".jl"), readdir(notebook_dir; join=true))
+    if isempty(notebooks)
+        @info "No .jl notebooks found in notebooks/. Nothing to do."
+        return
+    end
+
+    ok = ensure_exporter(EXPORTER_PKG)
+    if !ok
+        @error "Exporter $EXPORTER_PKG not available. Add it to Project.toml or install it manually."
+        exit(1)
+    end
+
+    # Export loop with local counter
+    success_count = 0
+    for nb in notebooks
+        name = splitext(basename(nb))[1]
+        outpath = joinpath(output_dir, "$(name).html")
+        @info "Exporting $nb -> $outpath"
+
+        try
+            exported = try_export_with_known_apis(PlutoStaticHTML, nb, outpath)
+            if exported
+                @info "Export succeeded for $nb"
+                success_count += 1
+            else
+                @warn "No known export API succeeded for $nb. See logs above."
+            end
+        catch err
+            @error "Unexpected error exporting $nb: $err"
         end
-    catch err
-        @error "Unexpected error exporting $(nb): $err"
     end
-end
 
-if success_count == 0
-    @error "No notebooks were exported. See messages above to diagnose."
-    exit(1)
-else
-    @info "Export complete: $(success_count) notebook(s) exported to public/."
-    exit(0)
+    if success_count == 0
+        @error "No notebooks were exported. See messages above to diagnose."
+        exit(1)
+    else
+        @info "Export complete: $success_count notebook(s) exported to public/."
+        exit(0)
+    end
 end
+
+main()