redir to /ui/files for about page, fix root+ button

.gitignore

@@ -1,9 +1,13 @@
 **/*.sw*
+server/exec-server
 server/ezmded
+server/exec-ezmded
 server/server
 server/testdata/files/**/*
 server/testdata/workd/**/*
 server/testdata/media/**/*
 server/testdata/index.html
 ui/render
-ui/**/.*.html
+server/public/ui/**/.*.html
+**/*.ctmpl.html
+server/public/ui/render

crawler/README.md

@@ -0,0 +1,10 @@
+## running
+
+export RCLONE_CONFIG=/tmp/rclone.temp.conf
+export RCLONE_CONFIG_PASS=abc
+export CACHE=/tmp/notea-team3
+export NOTES_ADDR=${NOTES_ADDR:-http://localhost:3004}
+export GITLAB_PAT=$(get_secret GITLAB_PAT)
+mkdir -p $CACHE
+bash main.sh
+echo $?

crawler/main.sh

@@ -123,6 +123,7 @@ crawl_with() {
 		export CONTENT="$(
 			echo "**!! WARNING !! This page is autogenerated and prone to destruction and replacement**"
 			echo "**[See the original]($human_url)**"
+			echo ""
 			$backend get "$crawlable_source" "$i" \
 				| sed 's/](\([^#h]\)/]\(%%%\1/g'
 		)"
@@ -147,6 +148,10 @@ crawl_with() {
 			echo "$sum"
 		)"
 		ID="${ID%/}"
+		if [ "${#expanded[@]}" == 1 ]; then
+			ID="$pid"
+			CONTENT="$(printf "%s\n\n%s", "$crawlable_source" "$CONTENT")"
+		fi
 		log "	$ID ($TITLE): ${#CONTENT}"
 		push_crawled "$ID" "$TITLE" "$CONTENT"
 		log "	/$ID ($TITLE): ${#CONTENT}"

crawler/notes.sh

@@ -106,6 +106,7 @@ notes() (
       _nncurl \
          -X PUT \
 			-H "Title: $title" \
+			-H "Read-Only: true" \
          -d "$body" \
          $NOTES_ADDR/api/v0/files/$id >&2
    }

server/README.md

@@ -0,0 +1,9 @@
+## running with docker
+
+d1=${d1:-$(mktemp -d)}
+d2=${d2:-$(mktemp -d)}
+docker run \
+	-v $d1:/main/public/files \
+	-v $d2:/main/public/media \
+	-p 3004:3004 \
+	--rm -it registry-app.eng.qops.net:5001/bel/work-notes:latest

server/go.mod

@@ -12,7 +12,10 @@ require (
 	local/simpleserve v0.0.0-00010101000000-000000000000
 )
 
-require github.com/go-stack/stack v1.8.0 // indirect
+require (
+	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/gomarkdown/markdown v0.0.0-20220114203417-14399d5448c4 // indirect
+)
 
 replace local/args => ../../../../args
 

server/go.sum

@@ -57,6 +57,8 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gomarkdown/markdown v0.0.0-20210208175418-bda154fe17d8/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU=
+github.com/gomarkdown/markdown v0.0.0-20220114203417-14399d5448c4 h1:6GlsnS3GQYfrJZTJEUsheoyLE6kLXQJDvQKIKxgL/9Q=
+github.com/gomarkdown/markdown v0.0.0-20220114203417-14399d5448c4/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
 github.com/gomodule/redigo v1.8.5/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
 github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

server/id.go

@@ -47,5 +47,9 @@ func (id ID) withClean() ID {
 			splits[i] = t
 		}
 	}
-	return ID(path.Join(splits...))
+	clean := path.Join(splits...)
+	if clean == "" || clean == "." {
+		clean = ""
+	}
+	return ID(clean)
 }

server/leaf.go

@@ -0,0 +1,68 @@
+package main
+
+import (
+	"io"
+	"io/ioutil"
+	"net/http"
+	"strconv"
+	"strings"
+)
+
+type Leaf struct {
+	Meta    Meta
+	Content string
+}
+
+type Meta struct {
+	Title    string
+	ReadOnly bool
+	Deleted  bool
+}
+
+func NewHTTPRequestLeaf(r *http.Request) (Leaf, error) {
+	var leaf Leaf
+	if b, err := ioutil.ReadAll(r.Body); err != nil {
+		return leaf, err
+	} else {
+		leaf.Content = string(b)
+	}
+	if leaf.Meta.Title = r.Header.Get("Title"); leaf.Meta.Title == "" {
+		leaf.Meta.Title = "Untitled"
+	}
+	if readOnly := r.Header.Get("Read-Only"); readOnly == "true" {
+		leaf.Meta.ReadOnly = true
+	} else if readOnly == "false" {
+		leaf.Meta.ReadOnly = false
+	}
+	leaf.Meta.Deleted = r.Method == http.MethodDelete
+	return leaf, nil
+}
+
+func NewLeaf(title string, content string) (Leaf, error) {
+	return NewHTTPRequestLeaf(&http.Request{
+		Header: http.Header{
+			"Title": []string{title},
+		},
+		Body: io.NopCloser(strings.NewReader(content)),
+	})
+}
+
+func (leaf Leaf) WriteHTTP(w http.ResponseWriter) error {
+	w.Header().Set("Title", leaf.Meta.Title)
+	w.Header().Set("Read-Only", strconv.FormatBool(leaf.Meta.ReadOnly))
+	_, err := w.Write([]byte(leaf.Content))
+	return err
+}
+
+func (base Leaf) Merge(updated Leaf) Leaf {
+	if updated.Meta.Title != "" {
+		base.Meta.Title = updated.Meta.Title
+	}
+	if base.Meta.Title == "" {
+		base.Meta.Title = "Untitled"
+	}
+	base.Meta.Deleted = updated.Meta.Deleted
+	base.Meta.ReadOnly = updated.Meta.ReadOnly
+	base.Content = updated.Content
+	return base
+}

server/public/ui/.index.html

@@ -0,0 +1,456 @@
+<!DOCTYPE html>
+<html>
+	<header>
+		<title>Notes</title>
+	 	<meta charset="utf-8">
+	 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/easymde/dist/easymde.min.css">
+		<script src="https://cdn.jsdelivr.net/npm/easymde/dist/easymde.min.js"></script>
+		<script src="https://cdn.jsdelivr.net/highlight.js/latest/highlight.min.js"></script>
+		<link rel="stylesheet" href="https://cdn.jsdelivr.net/highlight.js/latest/styles/github.min.css">
+
+		<link rel="stylesheet" href="https://unpkg.com/turretcss/dist/turretcss.min.css" crossorigin="anonymous">
+		<!-- todo css
+		<link rel="stylesheet" href="https://cdn.concisecss.com/concise.min.css">
+		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/water.css@2/out/light.css">
+		<link rel="stylesheet" href="https://cdn.simplecss.org/simple.min.css">
+		-->
+
+		<style>
+			html, body {
+				background-color: #f8f8f8;
+			}
+			.EasyMDEContainer button {
+				color: black;
+			}
+			img {
+				max-width: 100%;
+				max-height: 100%;
+			}
+			.filetree {
+				max-width: 15em;
+				width: 15em;
+				min-width: 15em;
+				overflow-x: scroll;
+				white-space: nowrap;
+			}
+			.filesummary {
+				min-width: 10em;
+			}
+			.filedetails {
+				padding-inline-start: 2em;
+			}
+			.filetree > .filedetails,
+			.filetree > .filedetails > .filedetails {
+				padding-inline-start: 0em;
+			}
+			.fileleaf {
+				display: inline-flex;
+				flex-direction: row;
+				width: calc(100% - 1em);
+			}
+			.fileleaf > input {
+				border: none;
+				border-radius: 0;
+				background: none;
+				outline: none;
+			}
+			.fileleaf > input:hover,
+			input.live_leaf {
+				background: #ddd;
+			}
+			.lr_fullscreen {
+				width: 90%;
+				max-width: 1024px;
+				margin-right: auto;
+				margin-left: auto;
+			}
+			.tb_fullscreen {
+				margin-top: 1em;
+			}
+			.columns {
+				display: flex;
+				flex-direction: row;
+			}
+			.rows {
+				width: 100%;
+				display: flex;
+				flex-direction: column;
+			}
+			.thic_flex {
+				text-align: left;
+				flex-grow: 1;
+			}
+			.mia {
+				display: none;
+			}
+			.align_left {
+				text-align: left;
+			}
+			.tb_buffer {
+				margin-top: 1em;
+				margin-bottom: 1em;
+			}
+			.r_buffer {
+				margin-right: 1em;
+			}
+			.l_buffer {
+				margin-left: 1em;
+			}
+			.monospace {
+				font-family: Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace;
+			}
+			.lil_btn {
+				width: initial;
+				display: inline-block;
+			}
+			input, label, textarea {
+				margin: initial;
+			}
+			.editor-toolbar > button.preview {
+				color: #08c;
+			}
+		</style>
+		<script>
+			function init() {
+				drawTree()
+				setInterval(drawTree, 100000)
+				navigateToQueryParams()
+			}
+
+			function navigateToQueryParams() {
+				var queryF = getParameterByName("f")
+				var queryQ = getParameterByName("q")
+				console.log("init query f:", queryF, "q:", queryQ)
+				if (queryF && queryF.length > 0) {
+					drawFile(queryF)
+				} else if (queryQ && queryQ.length > 0) {
+					searchFilesFor(queryQ)
+				}
+			}
+
+			function getParameterByName(name, url = window.location.href) {
+				name = name.replace(/[\[\]]/g, '\\$&');
+				var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'),
+					results = regex.exec(url);
+				if (!results) return null;
+				if (!results[2]) return '';
+				return decodeURIComponent(results[2].replace(/\+/g, ' '));
+			}
+
+			function deleteFile() {
+				if (!confirm("would you like to delete this file?"))
+					return
+				const id = easyMDE.meta.id
+				if (!id || id.length == 0)
+					return
+				http("DELETE", "/api/v0/files/" + id, (body, status) => {
+					if (status != 200) {
+						alert(`failed to delete file ${id}: ${status}: ${body}`)
+						throw `failed to delete file ${id}: ${status}: ${body}`
+					}
+					drawTree()
+					var pid = id.slice(0, id.lastIndexOf("/"))
+					if (pid) {
+						drawFile(pid)
+					} else {
+						disableMDE()
+					}
+				})
+			}
+
+			function searchFiles() {
+				const q = document.getElementById("searchbox").value
+				searchFilesFor(q)
+			}
+
+			function searchFilesFor(q) {
+				http("GET", "/api/v0/search?q=" + q, (body, status) => {
+					var results = JSON.parse(body)
+					console.log(q, results)
+					results.sort()
+					var innerHTML = "<ul>"
+					for (var result in results)
+						innerHTML += `<li><input class="align_left" type="button" onclick="drawFile('${results[result]}');" value="${idsToFullTitle(results[result].split("/"))}"</li>`
+					innerHTML += "</ul>"
+					if (!results || results.length == 0)
+						innerHTML = "no results"
+					disableMDE()
+					navigateToQuery("q", q)
+					document.getElementById("searchResults").innerHTML = innerHTML
+				})
+			}
+
+			var saveFeedbackInterval = null
+			function pushFile() {
+				const title = document.getElementById("title").innerHTML ? document.getElementById("title").innerHTML : ""
+				const body = easyMDE.value() ? easyMDE.value() : ""
+				const id = easyMDE.meta.id ? easyMDE.meta.id : ""
+				headers = {}
+				if (title)
+					headers["Title"] = title
+				http("PUT", "/api/v0/files/" + id, (body, status) => {
+					if (status != 200) {
+						alert(`failed to push file ${id}: ${status}: ${body}`)
+						throw `failed to push file ${id}: ${status}: ${body}`
+					}
+					drawTree()
+					//drawFile(id)
+					document.getElementById("saveFeedback").innerHTML = "success!"
+					if (saveFeedbackInterval) {
+						clearTimeout(saveFeedbackInterval)
+					}
+					saveFeedbackInterval = setTimeout(() => {document.getElementById("saveFeedback").innerHTML = ""}, 5000)
+				}, body, headers)
+			}
+
+			function drawFile(id) {
+				if (!id || id.length < 1) {
+					return
+				}
+				http("GET", "/api/v0/files/"+id, (body, status, headers) => {
+					if (status != 200) {
+						throw `ERR loading file: ${status}: ${body}`
+					}
+					const title = headers("title") ? headers("title") : ""
+					setMDE(id, title, body)
+				})
+			}
+
+			function drawNewFile(pid) {
+				setMDE(pid + "/" + crypto.randomUUID().substr(0, 5), "", "")
+				if (easyMDE.isPreviewActive()) {
+					easyMDE.togglePreview()
+				}
+			}
+
+			function enableMDE() {
+				document.getElementById("searchResults").className = "mia";
+				document.getElementById("article").className = "";
+			}
+
+			function disableMDE() {
+				document.getElementById("article").className = "mia";
+				document.getElementById("searchResults").className = "";
+			}
+
+			var liveLeafTimeout = null
+
+			function setMDE(id, title, body) {
+				if (id[0] == "/")
+					id = id.slice(1, id.length)
+				if (id[id.length-1] == "/")
+					id = id.slice(0, id.length-1)
+				var pids = id.split("/")
+				pids = pids.slice(0, pids.length-1)
+
+				var titlePath = "/"
+				for (var i = 0; i < pids.length; i++) {
+					const fullPid = pids.slice(0, i+1)
+					titlePath = `/ <input type="button" class="lil_btn" value="${idsToTitle(fullPid)}" onclick="drawFile('${fullPid.join("/")}');"/> /`
+				}
+				if (pids.length > 1) {
+					titlePath = "/ ... "+titlePath
+				}
+
+				enableMDE()
+				document.getElementById("titlePath").innerHTML = titlePath
+				document.getElementById("title").innerHTML = title
+				easyMDE.value(body)
+				easyMDE.meta = {
+					id: id,
+				}
+				if (!easyMDE.isPreviewActive()) {
+					easyMDE.togglePreview()
+					var previews = document.getElementsByClassName("preview")
+				}
+				const previouslyHighlighted = document.getElementsByClassName("live_leaf")
+				for (var i in previouslyHighlighted)
+					if (previouslyHighlighted && previouslyHighlighted[i] && previouslyHighlighted[i].classList)
+						previouslyHighlighted[i].classList.remove("live_leaf")
+				if (liveLeafTimeout)
+					clearTimeout(liveLeafTimeout)
+				liveLeafTimeout = setTimeout(() => {
+					const toHighlight = document.getElementsByClassName(btoa("/"+id))
+					for (var i = 0; i < toHighlight.length; i++) {
+						if (toHighlight && toHighlight[i] && toHighlight[i].classList)
+							toHighlight[i].classList.add("live_leaf")
+					}
+				}, 100)
+				navigateToQuery("f", id)
+			}
+
+			var lastNavigateToQuery = new Date()
+
+			function navigateToQuery(k, v) {
+				if (new Date() - lastNavigateToQuery < .1)
+					return
+				lastNavigateToQuery = new Date()
+				const url = new URL(window.location)
+				url.searchParams.set(k, v)
+				var hash = "#?"
+				const it = url.searchParams.entries()
+				let result = it.next()
+				while (!result.done) {
+					hash = hash + result.value[0] + "=" + result.value[1] + "&"
+					result = it.next()
+				}
+				window.location.hash = hash
+			}
+
+			var lastTree = {}
+
+			function idsToTitle(original_ids) {
+				const fullTitle = idsToFullTitle(original_ids)
+				return fullTitle.slice(fullTitle.lastIndexOf("/")+1, fullTitle.length)
+			}
+
+			function idsToFullTitle(original_ids) {
+				var ids = original_ids.slice(0, original_ids.length)
+				var subtree = lastTree
+				var fullTitle = ""
+				while (ids && ids.length > 0) {
+					if (!subtree || !subtree["Branches"] || !subtree["Branches"][ids[0]])
+						break
+					subtree = subtree["Branches"][ids[0]]
+					if (subtree && subtree.Leaf && subtree.Leaf.Title)
+						fullTitle += "/" + subtree.Leaf.Title
+					ids = ids.slice(1, ids.length)
+					if (ids.length == 0) {
+						return fullTitle.slice(1, fullTitle.length)
+					}
+				}
+				return ids[ids.length-1]
+			}
+
+			function drawTree() {
+				function htmlifyBranch(id, branch) {
+					const maxTreeTitleLength = 35
+					var parent = `
+						<input class="thic_flex ${btoa(id)}" type="button" value="${branch.Leaf.Title.substr(0, maxTreeTitleLength)}" onclick="drawFile('${id}');"/>
+						<input type="button" class="lil_btn" value="+" onclick="drawNewFile('${id}');"/>
+					`
+					if (id == "") {
+						parent = `
+							<span class="thic_flex"></span>
+							<input type="button" value="+" onclick="drawNewFile('${id}');"/>
+						`
+					}
+					var children = []
+					for (var child in branch.Branches)
+						children.push({title: branch.Branches[child].Leaf.Title, content: htmlifyBranch(id + "/" + child, branch.Branches[child])})
+					children = children.map((e) => `<!--${e.title}-->${e.content}`)
+					children.sort();
+					children = children.join("\n")
+					return `
+						<details class="filedetails" open>
+							<summary class="filesummary">
+								<div class="fileleaf">${parent}</div>
+							</summary>
+							${children}
+						</details>
+					`
+				}
+				http("GET", "/api/v0/tree", (body, status) => {
+					if (status != 200)
+						throw `bad status getting tree: ${status}: ${body}`
+					lastTree = JSON.parse(body)
+					document.getElementById("tree").innerHTML = htmlifyBranch("", lastTree)
+				})
+			}
+
+			function http(method, remote, callback, body, headers) {
+				var xmlhttp = new XMLHttpRequest();
+				xmlhttp.onreadystatechange = function() {
+					if (xmlhttp.readyState == XMLHttpRequest.DONE) {
+						callback(xmlhttp.responseText, xmlhttp.status, (key) => xmlhttp.getResponseHeader(key))
+					}
+				};
+				xmlhttp.open(method, remote, true);
+				if (typeof body == "undefined") {
+					body = null
+				}
+				if (headers) {
+					for (var key in headers)
+						xmlhttp.setRequestHeader(key, headers[key])
+				}
+				xmlhttp.send(body);
+			}
+		</script>
+	</header>
+	<body class="lr_fullscreen tb_fullscreen" onload="init(); return false;">
+		<br>
+		<div class="rows">
+			<form class="columns" action="return false;">
+				<input class="thic_flex" type="text" id="searchbox" placeholder="search regexp"/>
+				<input class="info lil_btn" type="submit" value="search" onclick="searchFiles(); return false;"/>
+			</form>
+			<div class="columns thic_flex tb_buffer">
+				<div id="tree" class="filetree"></div>
+				<div class="thic_flex lr_fullscreen" style="margin-left: 1em; width: 5px;">
+					<article id="searchResults" class="mia">
+					</article>
+					<article id="article" class="mia">
+						<div>
+							<h1 class="columns">
+								<span class="r_buffer">
+									<input class="button-info lil_btn" type="submit" value="SAVE" onclick="pushFile(); return false;"/>
+								</span>
+								<span id="titlePath">
+								</span>
+								<span id="title" class="thic_flex" contenteditable></span>
+								<span class="l_buffer">
+									<input class="button-error lil_btn" type="submit" value="DELETE" onclick="deleteFile(); return false;"/>
+								</span>
+							</h1>
+						</div>
+						<div id="saveFeedback" style="min-height: 1.2em; text-align: right;">
+						</div>
+						<!-- todo: each line no is an anchor -->
+						<div class="monospace">
+							<textarea id="my-text-area"></textarea>
+						</font>
+					</article>
+				</div>
+			</div>
+		</div>
+	</body>
+	<footer>
+		<script>
+			const easyMDE = new EasyMDE({
+				autoDownloadFontAwesome: true,
+				autofocus: true,
+				autosave: {
+					enabled: false,
+				},
+				element: document.getElementById('my-text-area'),
+				forceSync: true,
+				indentWithTabs: false,
+				initialValue: "# initial\nvalue",
+				showIcons: ["code", "table"],
+				spellChecker: false,
+				sideBySideFullscreen: false,
+				tabSize: 3,
+				previewImagesInEditor: true,
+				insertTexts: {
+					image: ["![](", ")"],
+					link: ["[](", ")"],
+				},
+				lineNumbers: true,
+				lineWrapping: false,
+				uploadImage: true,
+				imageUploadEndpoint: "/api/v0/media", // POST wants {data: {filePath: "/..."}}
+				imagePathAbsolute: false,
+				renderingConfig: {
+					codeSyntaxHighlighting: true,
+				},
+			})
+			function logValue() {
+				console.log(easyMDE.value())
+			}
+			logValue()
+		</script>
+	</footer>
+</html>

server/public/ui/files.ctmpl

@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
 	<header>
-		<title>{{ .This.Title }}</title>
+		<title>id={{ .This.ID }}, {{ .This.Title }}</title>
 		{{ template "_import" }}
 	</header>
 	<body class="fullscreen tb_fullscreen lr_fullscreen" style="position: absolute">
@@ -11,7 +11,15 @@
 			<div class="columns thic_flex tb_buffer" style="height: calc(100% - 4rem);">
 				{{ template "_filetree" . }}
 				<div class="thic_flex lr_fullscreen" style="margin-left: 1em; width: 5px;">
+					{{ if eq .This.ID "" }}
+						{{ template "_about" . }}
+					{{ else }}
+						{{ if .This.ReadOnly }}
+							{{ template "_readonly" . }}
+						{{ else }}
 							{{ template "_editor" . }}
+						{{ end }}
+					{{ end }}
 				</div>
 			</div>
 		</div>

server/public/ui/render.go

@@ -39,6 +39,7 @@ func main() {
 		"This": map[string]interface{}{
 			"ID":       "id00/id11",
 			"Title":    "title id11",
+			"ReadOnly": false,
 			"PID":      "id00",
 			"PTitle":   "title id00",
 			"Content": `# hello
@@ -46,9 +47,9 @@ func main() {
 ## world
 
 | this | is  | my  | table |
-| ---- | ---| ---| ----- |
+| ---- | --- | --- | ----- |
-| hey |
+| hey  | ya  | hey | ya    |
-| ya | hey | ya |
+| a    | b   | c   | d     |
 
 * and
 	* a bulleted
@@ -93,25 +94,25 @@ newlines
 			{Title: "title id00 / title id10 / title id20", ID: "id00/id10/id20"},
 		},
 		"Tree": `{
-			"Leaf": {"Title": ""},
+			"Leaf": {"Meta":{"Title": "","ReadOnly":false}},
 			"Branches": {
 				"id00": {
-					"Leaf": {"Title": "title id00"},
+					"Leaf": {"Meta":{"Title": "title id00","ReadOnly":false}},
 					"Branches": {
-						"id10": {"Leaf":{"Title":"title id10"},"Branches":{
+						"id10": {"Leaf":{"Meta":{"Title":"title id10","ReadOnly":false}},"Branches":{
-							"id20": {"Leaf":{"Title":"title id20"},"Branches":{}}
+							"id20": {"Leaf":{"Meta":{"Title":"title id20","ReadOnly":false}},"Branches":{}}
 						}},
-						"id11": {"Leaf":{"Title":"title id11"},"Branches":{}}
+						"id11": {"Leaf":{"Meta":{"Title":"title id11","ReadOnly":false}},"Branches":{}}
 					}
 				},
-				"id01": {"Leaf":{"Title":"title id01"},"Branches":{}},
+				"id01": {"Leaf":{"Meta":{"Title":"title id01","ReadOnly":false}},"Branches":{}},
-				"id02": {"Leaf":{"Title":"title id02"},"Branches":{}},
+				"id02": {"Leaf":{"Meta":{"Title":"title id02","ReadOnly":false}},"Branches":{}},
-				"id03": {"Leaf":{"Title":"title id03"},"Branches":{}},
+				"id03": {"Leaf":{"Meta":{"Title":"title id03","ReadOnly":false}},"Branches":{}},
-				"id04": {"Leaf":{"Title":"title id04"},"Branches":{}},
+				"id04": {"Leaf":{"Meta":{"Title":"title id04","ReadOnly":false}},"Branches":{}},
-				"id04": {"Leaf":{"Title":"title id04"},"Branches":{}},
+				"id04": {"Leaf":{"Meta":{"Title":"title id04","ReadOnly":false}},"Branches":{}},
-				"id05": {"Leaf":{"Title":"title id05"},"Branches":{}},
+				"id05": {"Leaf":{"Meta":{"Title":"title id05","ReadOnly":false}},"Branches":{}},
-				"id06": {"Leaf":{"Title":"title id06"},"Branches":{}},
+				"id06": {"Leaf":{"Meta":{"Title":"title id06","ReadOnly":false}},"Branches":{}},
-				"id07": {"Leaf":{"Title":"title id07 but it's really really really long"},"Branches":{}}
+				"id07": {"Leaf":{"Meta":{"Title":"title id07 but it's really really really long","ReadOnly":false}},"Branches":{}}
 			}
 		}`,
 	}

server/public/ui/search.ctmpl

@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
 	<header>
-		<title>{{ .This.Title }}</title>
+		<title>Search</title>
       {{ template "_import" }}
 	</header>
 	<body class="fullscreen tb_fullscreen lr_fullscreen" style="position: absolute">

server/public/ui/templates/_about.ctmpl

@@ -0,0 +1,47 @@
+{{ define "_about" }}
+<div class="fullscreen tb_fullscreen">
+	<h1>Welcome!</h1>
+
+	<h2>TLDR; how do I write something?</h2>
+	<div>
+		<ol>
+			<li>Click a `+` button somewhere in the tree on the left</li>
+			<li>Hit "save"</li>
+			<li>You'll see "Success!" in green at the bottom on save</li>
+		</ol>
+	</div>
+
+	<h2>What is this?</h2>
+	<div>
+		This is a one-stop shop for reading, searching, and optionally writing docs.
+	</div>
+
+	<h2>Why would I use it? (It looks a little... "janky", no offense)</h2>
+	<div>
+		<ul>
+			<li>Load your Gitlab, Gitlab Wikis, Google Docs, Google Spreadsheets, and Google Slides and enjoy that search bar above.</li>
+			<li>No version control BUT very fast to edit and hit "save"</li>
+			<li>Automagically updates, so throw a link to your docs here and continue using Gitlab/Google/etc. as you were</li>
+			<li>Link to a Gitlab repo/path/wiki and automagically get the entire tree</li>
+		</ul>
+	</div>
+
+	<h2>What's this about magic?</h2>
+	<div>
+		<ul>
+			<li>Create a file that just contains "https://gitlab.com/my/repo/-/tree/master/README.md" or "https://docs.google.com/docs/my-doc/edit", wait some time, and now it's an updating version of that doc</li>
+			<li>Create a file that just contains "https://gitlab.com/my/repo/-/tree/master/runbooks", wait some time, and now it's an updating version of all those docs</li>
+		</ul>
+	</div>
+
+	<h2>I got a bone to pick with you!!! Who are you exactly?</h2>
+	<div>
+		<table>
+			<tr><td> Slack User </td><td> @breel </td></tr>
+			<tr><td> Email </td><td> breel@qualtrics.com </td></tr>
+			<tr><td> Slack Channel </td><td> #storage-platform </td></tr>
+			<tr><td> Gitlab </td><td> TODO </td></tr>
+		</table>
+	</div>
+</div>
+{{ end }}

server/public/ui/templates/_filetree.ctmpl

@@ -43,21 +43,25 @@
 		`
 	}
 	function leafHTML(id, branch) {
-		const href="/ui/files/" + (id ? id : "#")
+		const href="/ui/files/" + (id ? id : "")
 		var nameSafeId = id.replace(/\//g, "-")
 		var parentNameSafeId = nameSafeId
 		if (id.includes("/"))
 			parentNameSafeId = id.slice(0, id.lastIndexOf("/")).replace(/\//g, "-")
 		const name=`filetree-leaf-${nameSafeId}`
 		const parentname=`filetree-leaf-${parentNameSafeId}`
-		const title=id ? branch.Leaf.Title : "ROOT"
+		const title=id ? branch.Leaf.Meta.Title : "ROOT"
 		const isLiveParent = '{{ .This.ID }}'.slice(0, id.length) == id
 		const isLive = '{{ .This.ID }}' == id
-		return `
+		const linkToFile = `
 			<div style="margin: 0; padding: 0; height: 0; width: 0;" id="${name}"></div>
-			<a style="flex-grow: 1;" href="${href}#${parentname}"><button style="width: 100%; text-align: left; outline: none;" class="${isLiveParent ? `button button-info ${!isLive ? "button-border" : ""}` : ""}">${title}</button></a>
+			<a style="flex-grow: 1;" href="${href}#${parentname}">
-			<a href="${href}/${generateUUID().split("-")[0]}#${parentname}"><button>+</button></a>
+				<button style="width: 100%; text-align: left; outline: none;" class="${isLiveParent ? `button button-info ${!isLive ? "button-border" : ""}` : ""}">
+					${title}
+				</button>
+			</a>
 		`
+		return linkToFile + (branch.Leaf.Meta.ReadOnly ? "" : `<a href="${href}/${generateUUID().split("-")[0]}#${parentname}"><button>+</button></a>`)
 	}
 	function branchesHTML(id, branches) {
 		if (!branchesHaveContent(branches))
@@ -65,7 +69,7 @@
 		var html = []
 		var out = ``
 		for(var i in branches) {
-			html.push([branches[i].Leaf.Title, `<details open>` + branchHTML(i, branches[i]) + `</details>`])
+			html.push([branches[i].Leaf.Meta.Title, `<details open>` + branchHTML(i, branches[i]) + `</details>`])
 		}
 		html.sort()
 		for(var i in html)

server/public/ui/templates/_readonly.ctmpl

@@ -0,0 +1,9 @@
+{{ define "_readonly" }}
+<div class="fullscreen tb_fullscreen">
+	<a href="/ui/files/{{ .This.ID }}?edit"><button>Edit this page</button></a>
+	<article id="article"></article>
+	<script>
+		document.getElementById("article").innerHTML = {{ .This.Content }}
+	</script>
+</div>
+{{ end }}

server/server.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -17,6 +18,10 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/gomarkdown/markdown"
+	"github.com/gomarkdown/markdown/html"
+	"github.com/gomarkdown/markdown/parser"
+
 	"github.com/google/uuid"
 )
 
@@ -237,9 +242,6 @@ func (server *Server) uiSearchHandler(w http.ResponseWriter, r *http.Request) er
 
 func (server *Server) uiFilesHandler(w http.ResponseWriter, r *http.Request) error {
 	id := NewID(strings.TrimPrefix(r.URL.Path, "/ui/files"))
-	if id == "" {
-		return server.rootHandler(w, r)
-	}
 	t, err := server.uiSubTemplates()
 	if err != nil {
 		return err
@@ -258,23 +260,34 @@ func (server *Server) uiFilesHandler(w http.ResponseWriter, r *http.Request) err
 		return err
 	}
 	var parent Leaf
+	var leaf Leaf
+	if id != "" {
 		if id.Pop() != "" {
 			parent, err = tree.Get(id.Pop())
 			if err != nil {
 				return fmt.Errorf("failed to get pid %q: %v", id.Pop(), err)
 			}
 		}
-	leaf, err := tree.Get(id)
+		leaf, err = tree.Get(id)
 		if err != nil {
-		leaf.Title = "My New File"
+			leaf.Meta.Title = "My New File"
+		}
+	}
+	if leaf.Meta.ReadOnly {
+		if _, ok := r.URL.Query()["edit"]; !ok {
+			leaf.Content = Gomarkdown([]byte(leaf.Content))
+		} else {
+			leaf.Meta.ReadOnly = false
+		}
 	}
 	data := map[string]interface{}{
 		"This": map[string]interface{}{
-			"Title":   leaf.Title,
+			"Title":    leaf.Meta.Title,
+			"ReadOnly": leaf.Meta.ReadOnly,
 			"Content":  leaf.Content,
 			"ID":       id.String(),
 			"PID":      id.Pop().String(),
-			"PTitle":  parent.Title,
+			"PTitle":   parent.Meta.Title,
 		},
 		"Tree": string(branchesJSON),
 	}
@@ -309,7 +322,7 @@ func (server *Server) uiSubTemplates() (*template.Template, error) {
 }
 
 func (server *Server) rootHandler(w http.ResponseWriter, r *http.Request) error {
-	http.Redirect(w, r, "/ui/files/"+uuid.New().String()[:5], 302)
+	http.Redirect(w, r, "/ui/files", 302)
 	return nil
 }
 
@@ -354,10 +367,15 @@ func (server *Server) apiV0FilesPostHandler(w http.ResponseWriter, r *http.Reque
 	if err != nil {
 		return err
 	}
+	r.Body = io.NopCloser(bytes.NewReader(b))
 
 	pid := server.fileId(r)
 	id := NewID(pid).Push(strings.Split(uuid.New().String(), "-")[0])
-	if err := server.tree().Put(id, Leaf{Title: r.Header.Get("Title"), Content: string(b)}); err != nil {
+	leaf, err := NewHTTPRequestLeaf(r)
+	if err != nil {
+		return err
+	}
+	if err := server.tree().Put(id, leaf); err != nil {
 		return err
 	}
 	return json.NewEncoder(w).Encode(map[string]map[string]string{
@@ -381,9 +399,7 @@ func (server *Server) apiV0FilesIDGetHandler(w http.ResponseWriter, r *http.Requ
 		return err
 	}
 
-	w.Header().Set("Title", leaf.Title)
+	return leaf.WriteHTTP(w)
-	_, err = w.Write([]byte(leaf.Content))
-	return err
 }
 
 func (server *Server) apiV0FilesIDDelHandler(w http.ResponseWriter, r *http.Request) error {
@@ -398,7 +414,7 @@ func (server *Server) apiV0FilesIDDelHandler(w http.ResponseWriter, r *http.Requ
 	} else if err != nil {
 		return err
 	}
-	leaf.Deleted = true
+	leaf.Meta.Deleted = true
 
 	return server.tree().Put(id, leaf)
 }
@@ -424,14 +440,12 @@ func (server *Server) apiV0FilesIDPutHandler(w http.ResponseWriter, r *http.Requ
 	} else if err != nil {
 		return err
 	}
-	b, err := ioutil.ReadAll(r.Body)
+
+	updatedLeaf, err := NewHTTPRequestLeaf(r)
 	if err != nil {
 		return err
 	}
-
+	leaf = leaf.Merge(updatedLeaf)
-	leaf.Content = string(b)
-	leaf.Title = r.Header.Get("Title")
-	leaf.Deleted = false
 
 	if err := server.tree().Put(id, leaf); err != nil {
 		return err
@@ -479,18 +493,18 @@ func (server *Server) _apiV0SearchHandler(query string) ([][2]string, error) {
 	result := [][2]string{}
 	if err := tree.ForEach(func(id ID, leaf Leaf) error {
 		for _, pattern := range patterns {
-			if !pattern.MatchString(leaf.Content) && !pattern.MatchString(leaf.Title) {
+			if !pattern.MatchString(leaf.Content) && !pattern.MatchString(leaf.Meta.Title) {
 				return nil
 			}
 		}
-		title := leaf.Title
+		title := leaf.Meta.Title
 		pid := id.Pop()
 		for pid != "" {
 			parent, err := server.tree().Get(pid)
 			if err != nil {
 				return err
 			}
-			title = path.Join(parent.Title, title)
+			title = path.Join(parent.Meta.Title, title)
 			pid = pid.Pop()
 		}
 		result = append(result, [2]string{id.URLSafeString(), title})
@@ -500,3 +514,30 @@ func (server *Server) _apiV0SearchHandler(query string) ([][2]string, error) {
 	}
 	return result, nil
 }
+
+func Gomarkdown(b []byte) string {
+	renderer := html.NewRenderer(html.RendererOptions{
+		Flags: html.CommonFlags | html.TOC,
+	})
+	ext := parser.NoExtensions
+	for _, extension := range []parser.Extensions{
+		parser.NoIntraEmphasis,
+		parser.Tables,
+		parser.FencedCode,
+		parser.Autolink,
+		parser.Strikethrough,
+		parser.SpaceHeadings,
+		parser.HeadingIDs,
+		parser.BackslashLineBreak,
+		parser.DefinitionLists,
+		parser.MathJax,
+		parser.Titleblock,
+		parser.AutoHeadingIDs,
+		parser.Includes,
+	} {
+		ext |= extension
+	}
+	parser := parser.NewWithExtensions(ext)
+	content := markdown.ToHTML(b, parser, renderer)
+	return string(content) + "\n"
+}

server/server_test.go

@@ -31,11 +31,17 @@ func TestServerRoutes(t *testing.T) {
 	ensureAndWrite(server.diskMediaPath("delid"), []byte("hi"))
 
 	tree := server.tree()
-	if err := tree.Put(NewID("getfid"), Leaf{Title: "", Content: "getfid body"}); err != nil {
+	leaf, _ := NewLeaf("", "getfid body")
+	if err := tree.Put(NewID("getfid"), leaf); err != nil {
 		t.Fatal(err)
 	}
-	tree.Put(NewID("putfid"), Leaf{Title: "putfid title", Content: "initial putfid body"})
+
-	tree.Put(NewID("delfid"), Leaf{Title: "delfid title", Content: "delfid body"})
+	leaf, _ = NewLeaf("putfid title", "initial putfid body")
+	tree.Put(NewID("putfid"), leaf)
+
+	leaf, _ = NewLeaf("delfid title", "delfid body")
+	tree.Put(NewID("delfid"), leaf)
+
 	t.Log(tree.GetRoot())
 
 	ensureAndWrite(path.Join(server.root, "index.html"), []byte("mom"))
@@ -49,7 +55,7 @@ func TestServerRoutes(t *testing.T) {
 		"v0: /: get": {
 			path:   "/",
 			method: http.MethodGet,
-			want:   "/ui/files/",
+			want:   "/ui/files",
 		},
 		"v0: search: get": {
 			path:   "/api/v0/search?q=getf%20bod",
@@ -96,17 +102,17 @@ func TestServerRoutes(t *testing.T) {
 		"v0: /: redir": {
 			path:   "/",
 			method: http.MethodGet,
-			want:   "/ui/files/",
+			want:   "/ui/files",
 		},
 		"v0: /ui/: redir": {
 			path:   "/ui/",
 			method: http.MethodGet,
-			want:   "/ui/files/",
+			want:   "/ui/files",
 		},
 		"v0: /ui: redir": {
 			path:   "/ui",
 			method: http.MethodGet,
-			want:   "/ui/files/",
+			want:   "/ui/files",
 		},
 		"v0: /ui/search": {
 			path:   "/ui/search",
@@ -207,7 +213,7 @@ func TestServerPutTreeGetFile(t *testing.T) {
 		if w.Code != http.StatusOK {
 			t.Fatal(w)
 		}
-		if !bytes.Contains(w.Body.Bytes(), []byte(`{"Title":"my title","Deleted":false,"Content":"`)) {
+		if !bytes.Contains(w.Body.Bytes(), []byte(`{"Meta":{"Title":"my title","ReadOnly":false,"Deleted":false},"Content":"`)) {
 			t.Fatal(w)
 		}
 		var branch Branch
@@ -220,11 +226,11 @@ func TestServerPutTreeGetFile(t *testing.T) {
 		}
 		if parent, ok := branch.Branches["my pid"]; !ok {
 			t.Error(ok, branch)
-		} else if parent.Leaf.Title != "Untitled" {
+		} else if parent.Leaf.Meta.Title != "Untitled" {
 			t.Error(parent.Leaf)
 		} else if child, ok := parent.Branches[NewID(id)]; !ok {
 			t.Error(ok, NewID("my pid").Push(id), parent)
-		} else if child.Leaf.Title != "my title" {
+		} else if child.Leaf.Meta.Title != "my title" {
 			t.Error(child.Leaf)
 		}
 	})

server/testdata/ui

@@ -1 +1 @@
-../../ui/
+../public/ui

server/tree.go

@@ -34,24 +34,6 @@ func (branch Branch) forEach(preid ID, foo func(ID, Leaf) error) error {
 	return nil
 }
 
-type Leaf struct {
-	Title   string
-	Deleted bool
-	Content string
-}
-
-func (base Leaf) Merge(updated Leaf) Leaf {
-	if updated.Title != "" {
-		base.Title = updated.Title
-	}
-	if base.Title == "" {
-		base.Title = "Untitled"
-	}
-	base.Deleted = updated.Deleted
-	base.Content = updated.Content
-	return base
-}
-
 type Tree struct {
 	root string
 }
@@ -147,14 +129,14 @@ func (tree Tree) getRoot(pid ID, withContent, withDeleted bool) (Branch, error)
 			if !withContent {
 				m.Leaf.Content = ""
 			}
-			if m.Leaf.Deleted && !withDeleted {
+			if m.Leaf.Meta.Deleted && !withDeleted {
-				return m, nil
+				return Branch{Branches: map[ID]Branch{}}, nil
 			}
 		} else if entry.IsDir() {
 			subtree := tree.WithRoot(path.Join(tree.root, entry.Name()))
 			if branch, err := subtree.getRoot(pid.Push(entry.Name()), withContent, withDeleted); err != nil {
 				return Branch{}, err
-			} else if !branch.IsZero() && (!branch.Leaf.Deleted || withDeleted) {
+			} else if !branch.IsZero() && (!branch.Leaf.Meta.Deleted || withDeleted) {
 				m.Branches[pid.Push(entry.Name())] = branch
 			}
 		}
@@ -208,10 +190,10 @@ func (tree Tree) Del(id ID) error {
 	if err != nil {
 		return err
 	}
-	if got.Deleted {
+	if got.Meta.Deleted {
 		return nil
 	}
-	got.Deleted = true
+	got.Meta.Deleted = true
 	return tree.Put(id, got)
 }
 

server/tree_test.go

@@ -13,7 +13,9 @@ func TestTreeForEach(t *testing.T) {
 	id := ""
 	for i := 0; i < 5; i++ {
 		id = path.Join(id, strconv.Itoa(i))
-		if err := tree.Put(NewID(id), Leaf{Title: id, Content: id}); err != nil {
+		leaf := Leaf{Content: id}
+		leaf.Meta.Title = id
+		if err := tree.Put(NewID(id), leaf); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -42,7 +44,7 @@ func TestTreeDel(t *testing.T) {
 		t.Fatal(err)
 	} else if got, err := tree.Get(NewID("id")); err != nil {
 		t.Fatal(err)
-	} else if !got.Deleted {
+	} else if !got.Meta.Deleted {
 		t.Fatal(got)
 	}
 
@@ -72,11 +74,10 @@ func TestTreeCrud(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	want := Leaf{
+	want := Leaf{}
-		Title:   "leaf title",
+	want.Meta.Title = "leaf title"
-		Deleted: false,
+	want.Meta.Deleted = false
-		Content: "leaf content",
+	want.Content = "leaf content"
-	}
 	if err := tree.Put(NewID("id"), want); err != nil {
 		t.Fatal(err)
 	} else if l, err := tree.Get(NewID("id")); err != nil {

todo.yaml

@@ -1,12 +1,22 @@
 todo:
-- scrape odo
+- /ui/files is an about page over a redir
+- gitlab wiki original links are empty
+- /ui/files does not redir in b1
 - mark generated via meta so other files in the dir can be created, deleted, replaced safely
+- links like `/Smoktests` in user-files home wiki don't rewrite
+- map fullURLScraped->internalURL for relative links sometimes
+- anchors on gitlab wikis at least are bad
+- min-height for easymde
+- use `meta` so no need for extra level for explicit single files
+- scrape odo
 - rewrite links if available to local
 - table of contents
 - anchor per line
 - anchor links work
 - ui; last updated; 2022.02.01T12:34:56
 done:
+- use `read-only` for autogenerated things;; could skip easymde and make google docs much faster
+- new line after original link
 - scrape gslide
 - scrape gsheet
 - scrape gdoc