From 2d8cf4ad95f74ffa4b1fb9c7617d355b32956ccf Mon Sep 17 00:00:00 2001 From: Fons van der Plas Date: Fri, 10 Dec 2021 22:15:31 +0100 Subject: [PATCH] Fix Export_exclude when SliderServer_enabled is true --- Project.toml | 2 +- src/HTTPRouter.jl | 2 +- src/PlutoSliderServer.jl | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index 01c7d5b..d59cbb1 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "PlutoSliderServer" uuid = "2fc8631c-6f24-4c5b-bca7-cbb509c42db4" authors = ["Fons van der Plas "] -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 index 82ce68f..53742d3 100644 --- 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 index f66e7e1..72f7ce4 100644 --- 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