🦉 Fix #45 and #55 and #57

Project.toml

@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fonsvdplas@gmail.com>", "Mikołaj Bochenski <iceflamecode@gmail.com>"]
-version = "0.5.10"
+version = "0.5.11"
 
 [deps]
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"

assets/client.js

@@ -148,6 +148,11 @@ class PlutoConnection {
         }
         this.psocket.onopen = () => {
             this.sendreceive("connect", {}).then(u => {
+                if(this.notebookID && !u.message.notebookExists){
+                    // https://github.com/fonsp/Pluto.jl/issues/55
+                    document.location.href = "/"
+                    return
+                }
                 this.currentlyConnected = true
                 console.log("socket opened")
                 onSucces()

assets/editor.js

@@ -400,7 +400,13 @@ document.addEventListener("DOMContentLoaded", () => {
             })
 
             Promise.all(promises).then(() => {
-                document.body.classList.remove("loading")
+                // We do a code completion request to trigger starting the workpsace
+                client.sendreceive("complete", {
+                    query: "nothinginparticular"
+                }).then(() => {
+                    document.body.classList.remove("loading")
+                    console.info("Workspace initialized")
+                })
             })
         }).catch(console.error)
 

assets/light.css

@@ -56,6 +56,14 @@ celloutput p:last-child {
 
 
 /* HEADER */
+header {
+    transition: background-color .5s ease-in-out;
+    background-color: white;
+}
+
+body.loading header {
+    background-color: hsla(290, 10%, 59%, 0.14);
+}
 
 
 /* MAIN */

src/notebookserver/Notebook.jl

@@ -150,17 +150,38 @@ function load_notebook(io, path)
 end
 
 function load_notebook(path::String)
+    backupPath = path
+    while isfile(backupPath)
+        backupPath = backupPath * ".backup"
+    end
+    cp(path, backupPath)
+
+    local loaded
     open(path, "r") do io
-        load_notebook(io, path)
+        loaded = load_notebook(io, path)
+    end
+
+    save_notebook(loaded)
+
+    if only_versions_differ(path, backupPath)
+        rm(backupPath)
+    else
+        @warn "Old Pluto notebook might not have loaded correctly. Backup saved to: " backupPath
     end
+
+    loaded
 end
 
 function move_notebook(notebook::Notebook, newpath::String)
     # Will throw exception and return if anything goes wrong, so at least one file is guaranteed to exist.
     oldpath = notebook.path
     save_notebook(notebook, oldpath)
     save_notebook(notebook, newpath)
-    @assert read(notebook.path, String) == read(newpath, String)
+    @assert only_versions_differ(oldpath, newpath)
     notebook.path = newpath
     rm(oldpath)
+end
+
+function only_versions_differ(pathA::AbstractString, pathB::AbstractString)
+    readlines(pathA)[3:end] == readlines(pathB)[3:end]
 end

src/webserver/Dynamic.jl

@@ -103,7 +103,7 @@ end
 
 
 responses[:connect] = (body, notebook=nothing; initiator::Union{Initiator, Missing}=missing) -> begin
-    putclientupdates!(initiator, UpdateMessage(:👋, Dict(), nothing, nothing, initiator))
+    putclientupdates!(initiator, UpdateMessage(:👋, Dict(:notebookExists => (notebook != nothing)), nothing, nothing, initiator))
 end
 
 responses[:getversion] = (body, notebook=nothing; initiator::Union{Initiator, Missing}=missing) -> begin