Skip to content
Snippets Groups Projects
Commit 7280be58 authored by François  LAURENT's avatar François LAURENT
Browse files

feat: LarvaTagger.jl's file browser with delete, download and create directory features

parent d00400d4
No related branches found
No related tags found
1 merge request!5Set of commits to be tagged v0.2
Pipeline #149216 passed
...@@ -103,10 +103,10 @@ uuid = "e1450e63-4bb3-523b-b2a4-4ffa8c0fd77d" ...@@ -103,10 +103,10 @@ uuid = "e1450e63-4bb3-523b-b2a4-4ffa8c0fd77d"
version = "1.2.2" version = "1.2.2"
[[deps.Bzip2_jll]] [[deps.Bzip2_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] deps = ["Artifacts", "JLLWrappers", "Libdl"]
git-tree-sha1 = "8873e196c2eb87962a2048b3b8e08946535864a1" git-tree-sha1 = "1b96ea4a01afe0ea4090c5c8039690672dd13f2e"
uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0" uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0"
version = "1.0.8+4" version = "1.0.9+0"
[[deps.CEnum]] [[deps.CEnum]]
git-tree-sha1 = "389ad5c84de1ae7cf0e28e381131c98ea87d54fc" git-tree-sha1 = "389ad5c84de1ae7cf0e28e381131c98ea87d54fc"
...@@ -367,9 +367,9 @@ version = "0.1.11" ...@@ -367,9 +367,9 @@ version = "0.1.11"
[[deps.Expat_jll]] [[deps.Expat_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"] deps = ["Artifacts", "JLLWrappers", "Libdl"]
git-tree-sha1 = "e51db81749b0777b2147fbe7b783ee79045b8e99" git-tree-sha1 = "d55dffd9ae73ff72f1c0482454dcf2ec6c6c4a63"
uuid = "2e619515-83b5-522b-bb60-26c02a35a201" uuid = "2e619515-83b5-522b-bb60-26c02a35a201"
version = "2.6.4+3" version = "2.6.5+0"
[[deps.Extents]] [[deps.Extents]]
git-tree-sha1 = "063512a13dbe9c40d999c439268539aa552d1ae6" git-tree-sha1 = "063512a13dbe9c40d999c439268539aa552d1ae6"
...@@ -834,9 +834,9 @@ version = "1.4.0" ...@@ -834,9 +834,9 @@ version = "1.4.0"
[[deps.LarvaTagger]] [[deps.LarvaTagger]]
deps = ["Bonito", "Colors", "Dates", "DocOpt", "Format", "LinearAlgebra", "Logging", "Makie", "Meshes", "NearestNeighbors", "NyxWidgets", "Observables", "ObservationPolicies", "OrderedCollections", "PlanarLarvae", "Random", "StaticArrays", "Statistics", "TidyObservables", "WGLMakie"] deps = ["Bonito", "Colors", "Dates", "DocOpt", "Format", "LinearAlgebra", "Logging", "Makie", "Meshes", "NearestNeighbors", "NyxWidgets", "Observables", "ObservationPolicies", "OrderedCollections", "PlanarLarvae", "Random", "StaticArrays", "Statistics", "TidyObservables", "WGLMakie"]
git-tree-sha1 = "69abc4e4dbd0aa87a07aa892be85e173b99eca7c" git-tree-sha1 = "e01ef8f5a2514689fe1750fb3a5168a2860901a1"
repo-rev = "dev" repo-rev = "dev"
repo-url = "https://gitlab.pasteur.fr/nyx/larvatagger.jl" repo-url = "https://gitlab.pasteur.fr/nyx/LarvaTagger.jl"
uuid = "8b3b36f1-dfed-446e-8561-ea19fe966a4d" uuid = "8b3b36f1-dfed-446e-8561-ea19fe966a4d"
version = "0.19.0" version = "0.19.0"
...@@ -1128,11 +1128,11 @@ version = "0.1.2" ...@@ -1128,11 +1128,11 @@ version = "0.1.2"
[[deps.NyxWidgets]] [[deps.NyxWidgets]]
deps = ["Bonito", "Colors", "Format", "LazyArtifacts", "Observables"] deps = ["Bonito", "Colors", "Format", "LazyArtifacts", "Observables"]
git-tree-sha1 = "936f80aa61413c47da00f96abbc0186078698bca" git-tree-sha1 = "e18ab14817871c54419e4cef12f9fc4dc589f6fe"
repo-rev = "main" repo-rev = "dev"
repo-url = "https://gitlab.com/dbc-nyx/NyxWidgets.jl" repo-url = "https://gitlab.com/dbc-nyx/NyxWidgets.jl"
uuid = "c288fd06-43d3-4b04-8307-797133353e2e" uuid = "c288fd06-43d3-4b04-8307-797133353e2e"
version = "0.1.1" version = "0.2.0"
[[deps.Observables]] [[deps.Observables]]
git-tree-sha1 = "7438a59546cf62428fc9d1bc94729146d37a7225" git-tree-sha1 = "7438a59546cf62428fc9d1bc94729146d37a7225"
...@@ -1337,9 +1337,9 @@ version = "1.0.1" ...@@ -1337,9 +1337,9 @@ version = "1.0.1"
[[deps.QuadGK]] [[deps.QuadGK]]
deps = ["DataStructures", "LinearAlgebra"] deps = ["DataStructures", "LinearAlgebra"]
git-tree-sha1 = "cda3b045cf9ef07a08ad46731f5a3165e56cf3da" git-tree-sha1 = "9da16da70037ba9d701192e27befedefb91ec284"
uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc"
version = "2.11.1" version = "2.11.2"
[deps.QuadGK.extensions] [deps.QuadGK.extensions]
QuadGKEnzymeExt = "Enzyme" QuadGKEnzymeExt = "Enzyme"
...@@ -1912,9 +1912,9 @@ version = "2.0.3+0" ...@@ -1912,9 +1912,9 @@ version = "2.0.3+0"
[[deps.libpng_jll]] [[deps.libpng_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"]
git-tree-sha1 = "d7b5bbf1efbafb5eca466700949625e07533aff2" git-tree-sha1 = "055a96774f383318750a1a5e10fd4151f04c29c5"
uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f"
version = "1.6.45+1" version = "1.6.46+0"
[[deps.libsixel_jll]] [[deps.libsixel_jll]]
deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "libpng_jll"] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "libpng_jll"]
......
...@@ -31,10 +31,28 @@ const bonito_app = NamedApp(:inherit, ...@@ -31,10 +31,28 @@ const bonito_app = NamedApp(:inherit,
bonito_models.cache[session] = Model(1.0, nothing, inputfile) bonito_models.cache[session] = Model(1.0, nothing, inputfile)
end end
end end
exportdir = joinpath("public", session)
function prepare_download(srcfile)
mkpath(exportdir)
filename = basename(srcfile)
tempfile = joinpath(exportdir, filename)
if !samefile(srcfile, tempfile)
open(tempfile, "w") do fout
open(srcfile, "r") do fin
write(fout, read(fin))
end
end
end
return "/$session/$filename"
end
isnothing(model.app) || close(model.app) isnothing(model.app) || close(model.app)
model.app = app = LT.larvaeditor(model.appdata; model.app = app = LT.larvaeditor(model.appdata;
root_directory=bucket, root_directory=bucket,
enable_uploads=true, enable_uploads=true,
enable_downloads=true,
prepare_download=prepare_download,
enable_new_directories=true,
enable_delete=true,
viewfactor=model.sizefactor) viewfactor=model.sizefactor)
return app return app
end end
...@@ -84,7 +102,7 @@ end ...@@ -84,7 +102,7 @@ end
function view() function view()
[ [
Html.div("Refresh the page if nothing appears here after a few seconds"; Html.div("Refresh the page if the present message does not disappear after a few seconds";
id="iframe_alt_text", id="iframe_alt_text",
style="width:$(appwidth["1.0"]);margin:auto;padding:2rem;"), style="width:$(appwidth["1.0"]);margin:auto;padding:2rem;"),
Html.iframe(; id="bonito", style="width:100%;height:0;border:none;"), Html.iframe(; id="bonito", style="width:100%;height:0;border:none;"),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment