Fix Export_exclude when SliderServer_enabled is true

behinger · Dec 10, 2021 · 2d8cf4a · 2d8cf4a
1 parent 1421b4f
commit 2d8cf4a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "PlutoSliderServer"
 uuid = "2fc8631c-6f24-4c5b-bca7-cbb509c42db4"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.3.2"
+version = "0.3.3"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

diff --git a/src/HTTPRouter.jl b/src/HTTPRouter.jl
@@ -45,7 +45,7 @@ function make_router(
 
             This means that the notebook file used by the web client does not precisely match any of the notebook files running in this server. 
 
-            If this is an automated setup, then this could happen inotebooketween deployments. 
+            If this is an automated setup, then this could happen inbetween deployments. 
 
             If this is a manual setup, then running the .jl notebook file might have caused a small change (e.g. the version number or a whitespace change). Copy notebooks to a temporary directory before running them using the bind server. =#
             @info "Request hash not found. See errror hint in my source code." notebook_hash

diff --git a/src/PlutoSliderServer.jl b/src/PlutoSliderServer.jl
@@ -189,8 +189,13 @@ function run_directory(
         all_nbs =
             notebook_paths !== nothing ? notebook_paths :
             find_notebook_files_recursive(start_dir)
+
         if settings.Export.enabled
-            setdiff(all_nbs, settings.SliderServer.exclude ∩ settings.Export.exclude)
+            if settings.SliderServer.enabled
+                setdiff(all_nbs, settings.SliderServer.exclude ∩ settings.Export.exclude)
+            else
+                setdiff(all_nbs, settings.Export.exclude)
+            end
         else
             s = setdiff(all_nbs, settings.SliderServer.exclude)
             filter(s) do f