Deploying to notebook-exports from @ c34b793 🚀

JuliaPluto · Nov 4, 2023 · 7dc644b · 7dc644b
1 parent 8dac5f6
commit 7dc644b
Show file tree

Hide file tree

Showing 26 changed files with 32 additions and 5 deletions.
diff --git a/pluto_state_cache/0_19_32-i-5w3pSkmIv4eG53-qx2hWOArKmu-YPzVTSkF9qOTY.plutostate b/pluto_state_cache/0_19_32-i-5w3pSkmIv4eG53-qx2hWOArKmu-YPzVTSkF9qOTY.plutostate
diff --git a/pluto_state_cache/0_19_321BT1NDaW7DD-n1n76yH3EcL90EcF8NUt-bWxmRticbc.plutostate b/pluto_state_cache/0_19_321BT1NDaW7DD-n1n76yH3EcL90EcF8NUt-bWxmRticbc.plutostate
diff --git a/pluto_state_cache/0_19_3241IQj6SuNGg6oScvXLjMSK_J4322m3skjL-9Hg277TE.plutostate b/pluto_state_cache/0_19_3241IQj6SuNGg6oScvXLjMSK_J4322m3skjL-9Hg277TE.plutostate
diff --git a/pluto_state_cache/0_19_3267WMi08M6X6E15b_6QXTDeBl6n6V-4QfidfYVCgY57A.plutostate b/pluto_state_cache/0_19_3267WMi08M6X6E15b_6QXTDeBl6n6V-4QfidfYVCgY57A.plutostate
diff --git a/pluto_state_cache/0_19_32BTRH7QC_EA0OZrYrLa8yYxbnK0VhQAdoMDHEL4vOIG8.plutostate b/pluto_state_cache/0_19_32BTRH7QC_EA0OZrYrLa8yYxbnK0VhQAdoMDHEL4vOIG8.plutostate
diff --git a/pluto_state_cache/0_19_32KRQ9M8fcdkT4bgALBgUaHiOu5MRtsoxweMd1y2EiBF4.plutostate b/pluto_state_cache/0_19_32KRQ9M8fcdkT4bgALBgUaHiOu5MRtsoxweMd1y2EiBF4.plutostate
diff --git a/pluto_state_cache/0_19_32NFFwqMjsWOYeWw08Qh2edO4CF4SNg7CgasoYlY-qlHQ.plutostate b/pluto_state_cache/0_19_32NFFwqMjsWOYeWw08Qh2edO4CF4SNg7CgasoYlY-qlHQ.plutostate
diff --git a/pluto_state_cache/0_19_32OfJ4BXH7_xy1IDdIpQSLhuJwws1AvsKrECwhkT5Xxlw.plutostate b/pluto_state_cache/0_19_32OfJ4BXH7_xy1IDdIpQSLhuJwws1AvsKrECwhkT5Xxlw.plutostate
diff --git a/pluto_state_cache/0_19_32dD9jscUtfaYaL9POrAJksUA8k8IrPRAn6dzPp0glvak.plutostate b/pluto_state_cache/0_19_32dD9jscUtfaYaL9POrAJksUA8k8IrPRAn6dzPp0glvak.plutostate
diff --git a/pluto_state_cache/0_19_32dSz8XM9ttBM9HyWugq5NCwEtDItdCVsOBNvmN77QKKU.plutostate b/pluto_state_cache/0_19_32dSz8XM9ttBM9HyWugq5NCwEtDItdCVsOBNvmN77QKKU.plutostate
diff --git a/pluto_state_cache/0_19_32eESv9gp9ljW8yMrLH2qGfKG0pd3CAZyP4frO8l48rng.plutostate b/pluto_state_cache/0_19_32eESv9gp9ljW8yMrLH2qGfKG0pd3CAZyP4frO8l48rng.plutostate
diff --git a/pluto_state_cache/0_19_32iUvZwy_jEKRNqLirUqQyk409XKfVDa2FSdhA-nKjhec.plutostate b/pluto_state_cache/0_19_32iUvZwy_jEKRNqLirUqQyk409XKfVDa2FSdhA-nKjhec.plutostate
diff --git a/src/Builtins.plutostate b/src/Builtins.plutostate
diff --git a/src/Clock.plutostate b/src/Clock.plutostate
diff --git a/src/Combine.plutostate b/src/Combine.plutostate
diff --git a/src/Confirm.plutostate b/src/Confirm.plutostate
diff --git a/src/Layout.plutostate b/src/Layout.plutostate
diff --git a/src/MultiCheckBox.plutostate b/src/MultiCheckBox.plutostate
diff --git a/src/RangeSlider.plutostate b/src/RangeSlider.plutostate
diff --git a/src/Resource.jl b/src/Resource.jl
@@ -138,25 +138,41 @@ struct DownloadButton
 end
 DownloadButton(data) = DownloadButton(data, "result")
 
-
 function Base.show(io::IO, m::MIME"text/html", db::DownloadButton)
-	write(io, "<a href=\"data:")
-	write(io, string(mime_fromfilename(db.filename, default="")))
+    mime = mime_fromfilename(db.filename)
+    data = if db.data isa String || db.data isa AbstractVector{UInt8} || isnothing(mime)
+        db.data
+    else
+        repr(mime, db.data)
+    end
+
+    write(io, "<a href=\"data:")
+	write(io, string(!isnothing(mime) ? mime : ""))
 	write(io, ";base64,")
-	write(io, Base64.base64encode(db.data))
+	write(io, Base64.base64encode(data))
 	write(io, "\" download=\"")
 	write(io, Markdown.htmlesc(db.filename))
 	write(io, "\" style=\"text-decoration: none; font-weight: normal; font-size: .75em; font-family: sans-serif;\"><button>Download...</button> ")
 	write(io, db.filename)
 	write(io, "</a>")
 end
 
+function downloadbutton_data(object::Any, mime::Union{MIME, Nothing})::String
+    data = if object isa String || object isa AbstractVector{UInt8} || isnothing(mime)
+        object
+    else
+        repr(mime, object)
+    end
+    Base64.base64encode(data)
+end
+
+
 ###
 # MIMES
 ###
 
 "Attempt to find the MIME pair corresponding to the extension of a filename. Defaults to `text/plain`."
-function mime_fromfilename(filename; default=nothing, filename_maxlength=2000)
+function mime_fromfilename(filename; default::T=nothing, filename_maxlength=2000)::Union{MIME, T} where T
 	if length(filename) > filename_maxlength
 		default
     else

diff --git a/src/Scrubbable.plutostate b/src/Scrubbable.plutostate
diff --git a/src/TableOfContents.plutostate b/src/TableOfContents.plutostate
diff --git a/src/TerminalNotebook.plutostate b/src/TerminalNotebook.plutostate
diff --git a/src/TransformedValue.plutostate b/src/TransformedValue.plutostate
diff --git a/src/WebcamInput.plutostate b/src/WebcamInput.plutostate
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -133,6 +133,17 @@ end
 
 end
 
+@testset "DownloadButton" begin
+    data = "test"
+    db1 = DownloadButton(data, "test.txt")
+    db2 = DownloadButton(html"<b>test</b>", "test.html")
+
+    hr(x) = repr(MIME"text/html"(), x)
+
+    hr(db1)
+    hr(db2)
+end
+
 function default(x)
     new = AbstractPlutoDingetjes.Bonds.initial_value(x)
     if Core.applicable(Base.get, x)