Add version, link to github.

.gitignore

@@ -1,4 +1,3 @@
 badger/
 dist/
 tmp/
-linkwallet

.goreleaser.yaml

@@ -11,11 +11,15 @@ builds:
       - windows
       - darwin
 dockers:
-  - image_templates:
+  - goos: linux
+    goarch: amd64
+    image_templates:
     - "tardisx/linkwallet:{{ .Tag }}"
     - "tardisx/linkwallet:v{{ .Major }}"
     - "tardisx/linkwallet:v{{ .Major }}.{{ .Minor }}"
     - "tardisx/linkwallet"
+    build_flag_templates:
+    - "--platform=linux/amd64"
 archives:
   - replacements:
       darwin: Darwin
@@ -33,3 +37,4 @@ changelog:
     exclude:
       - '^docs:'
       - '^test:'
+      - '^[Bb]ump'

Dockerfile

@@ -1,3 +1,3 @@
-FROM scratch
+FROM alpine:3.16
 ENTRYPOINT ["/linkwallet"]
 COPY linkwallet /

README.md

@@ -1 +1,20 @@
 # linkwallet
+
+A self-hosted bookmark database with full-text page content search.
+
+# Feature list
+
+* Simple cross-platform single binary deployment
+  * or docker if you prefer
+* Full-text search
+  * Bookmark content is scraped and indexed locally
+  * Page content periodically refreshed automatically
+  * Interactively search across titles and content
+  * Rippingly fast results, as you type
+* Embedded database, no separate database system required
+* Light on resources
+
+# Roadmap
+
+* Bookmarklet
+* Tags

cmd/linkwallet/linkwallet.go

@@ -0,0 +1,25 @@
+package main
+
+import (
+	"log"
+
+	"github.com/tardisx/linkwallet/db"
+	"github.com/tardisx/linkwallet/version"
+	"github.com/tardisx/linkwallet/web"
+)
+
+func main() {
+
+	dbh := db.DB{}
+	dbh.Open("badger")
+	bmm := db.NewBookmarkManager(&dbh)
+
+	go func() { version.UpdateVersionInfo() }()
+
+	log.Printf("linkallet verison %s starting", version.Is())
+
+	server := web.Create(bmm)
+	go bmm.RunQueue()
+	go bmm.UpdateContent()
+	server.Start()
+}

db/bookmarks.go

@@ -2,6 +2,7 @@ package db
 
 import (
 	"fmt"
+	"io"
 	"log"
 	"sync"
 	"time"
@@ -48,6 +49,19 @@ func (m *BookmarkManager) ListBookmarks() ([]entity.Bookmark, error) {
 	return bookmarks, nil
 }
 
+// ExportBookmarks exports all bookmarks to an io.Writer
+func (m *BookmarkManager) ExportBookmarks(w io.Writer) error {
+	bms := []entity.Bookmark{}
+	err := m.db.store.Find(&bms, &badgerhold.Query{})
+	if err != nil {
+		return fmt.Errorf("could not export bookmarks: %w", err)
+	}
+	for _, bm := range bms {
+		w.Write([]byte(bm.URL + "\n"))
+	}
+	return nil
+}
+
 func (m *BookmarkManager) SaveBookmark(bm *entity.Bookmark) error {
 	err := m.db.store.Update(bm.ID, &bm)
 	if err != nil {

go.sum

@@ -96,8 +96,8 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/go-github/v44 v44.1.0 h1:shWPaufgdhr+Ad4eo/pZv9ORTxFpsxPEPEuuXAKIQGA=
 github.com/google/go-github/v44 v44.1.0/go.mod h1:iWn00mWcP6PRWHhXm0zuFJ8wbEjE5AGO5D5HXYM4zgw=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
@@ -178,7 +178,6 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -245,7 +244,6 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

version/version.go

@@ -8,7 +8,7 @@ import (
 	"golang.org/x/mod/semver"
 )
 
-const Tag = "v0.0.2"
+const Tag = "v0.0.8"
 
 var versionInfo struct {
 	Local struct {

web/templates/_layout.html

@@ -22,13 +22,21 @@
           <a href="#">Admin</a>
           <ul class="menu vertical">
             <li><a href="/manage">Manage links</a></li>
+            <li><a href="/export">Export all URLs</a></li>
           </ul>
         </li>
+        <li><a href="javascript:void(window.open('http://localhost:8080/bookmarklet?url=' +encodeURIComponent(window.location), 'windowName', 'width=640,height=480'))">Bookmarklet</a></li>
+
       </ul>
     </div>
     <div class="top-bar-right">
       <ul class="menu">
-        <li><a href="https://github.com">gh</a></li>
+        <li>
+          <a href="https://github.com/tardisx/linkwallet">
+            {{ version }}
+            <img src="/assets/image/GitHub-Mark-32px.png" />
+          </a>
+        </li>
         <!-- <li><input type="search" placeholder="Search"></li>
         <li><button type="button" class="button">Search</button></li> -->
       </ul>
@@ -38,6 +46,8 @@
     <div class="grid-container">
       {{ if eq .page "root" }}
       {{ template "search.html" . }}
+      {{ else if eq .page "bookmarklet_click" }}
+      {{ template "bookmarklet.html" . }}
       {{ else if eq .page "manage" }}
       {{ template "manage.html" . }}
       {{ end }}

web/templates/add_url_form.html

@@ -1,19 +1,27 @@
 <div class="large-8 medium-8 cell" id="add-url-form" >
-    <h5>Add a new URL</h5>
-    <span>[<a hx-get="/bulk_add" hx-target="#add-url-form" href="#">bulk</a>]</span>
+    <div>
+        <h5 style="display:inline-block;">Add a new URL</h5>
+        <p  style="display:inline-block;">[<a hx-get="/bulk_add" hx-target="#add-url-form" href="#">bulk add</a>]</h5>
+    </div>
+
     <form onsubmit="return false">
         <div class="grid-x grid-padding-x">
             <div class="large-6 cell">
                 <label>Paste a URL</label>
-                <input type="text" name="url" 
-                    hx-post="/add"
-                    hx-target="#add-url-form"  hx-trigger=""
+                <input type="text" name="url" value="{{ .url }}"
+                      hx-trigger=""
                 />
             </div>
             <div class="large-6 cell">
                 {{ template "tags_widget.html" . }}
             </div>
         </div>
+        <div class="grid-x grid-padding-x">
+            <div class="medium-6 cell">
+                <a href="#" class="button" hx-post="/add"
+                hx-target="#add-url-form">add</a>
+            </div>
+        </div>
     </form>
     {{ if .error }}
      <p class="error">{{ .error }}</p>

web/templates/add_url_form_bulk.html

@@ -1,7 +1,8 @@
 <div class="large-8 medium-8 cell" id="add-url-form" >
-    <h5>Add URLs in bulk</h5>
-    <span>[<a hx-get="/single_add" hx-target="#add-url-form" href="#">single</a>]</span>
-    <form onsubmit="return false">
+    <div>
+        <h5 style="display:inline-block;">Add bulk URLs</h5>
+        <p  style="display:inline-block;">[<a hx-get="/single_add" hx-target="#add-url-form" href="#">single add</a>]</h5>
+    </div>    <form onsubmit="return false">
         <div class="grid-x grid-padding-x">
             <div class="large-12 cell">
                 <label>Paste URL's, one per line</label>

web/templates/bookmarklet.html

@@ -0,0 +1,7 @@
+<div class="grid-x grid-padding-x">
+    <div class="large-12 cell">
+
+        {{ template "add_url_form.html" .}}
+
+    </div>
+</div>

web/templates/manage.html

@@ -1,12 +1,16 @@
 <div class="grid-x grid-padding-x">
     <div class="large-12 cell">
 
-        <h5>Manage:
-         
-        </h5>
+        <h5>Manage links</h5>
 
         <table>
-            <tr><th>id</th><th>url</th><th>created</th><th>scraped</th></tr>
+            <tr>
+                <th>id</th>
+                <th>title/url</th>
+                <th>tags</th>
+                <th class="show-for-large">created</th>
+                <th class="show-for-large">scraped</th>
+            </tr>
             {{ range .bookmarks }}
             <tr>
                 <th>{{ .ID }}</th>
@@ -15,11 +19,14 @@
                     <br>
                     <a href="{{ .URL }}">{{ niceURL .URL }}</a>
                 </td>
-                <td>{{ (nicetime .TimestampCreated).HumanDuration }} ago</td>
-                <td>{{ (nicetime .TimestampLastScraped).HumanDuration }} ago</td>
+                <td>
+                    {{ join .Tags ", " }}
+                </td>
+                <td class="show-for-large">{{ (nicetime .TimestampCreated).HumanDuration }} ago</td>
+                <td class="show-for-large">{{ (nicetime .TimestampLastScraped).HumanDuration }} ago</td>
 
                 <td>
-                    <button class="button" hx-post="/scrape/{{ .ID }}">scrape</button>
+                    <a class="button" hx-swap="outerHTML" hx-post="/scrape/{{ .ID }}">scrape</button>
                 </td>
             </tr>
             {{ end }}

web/templates/search.html

@@ -1,9 +1,9 @@
 <div class="grid-x grid-padding-x">
-    <div class="large-8 medium-8 cell">
+    <div class="large-6 medium-12 cell">
 
-        <h5>Search:
+        <h5>Search
             <span id="htmx-indicator-search" class="htmx-indicator">
-                <img src="/assets/image/beating.gif" /> Searching...
+                <img style="height:1em;" src="/assets/image/beating.gif" /> Searching...
             </span>
         </h5>
         <form onsubmit="return false"> 
@@ -19,9 +19,9 @@
         <div id="search-results">
         </div>
     </div>
-
+    <div class="large-6 medium-12 cell">
     {{ template "add_url_form.html" . }}
-  
+    </div>  
 
     <!-- <div class="large-4 medium-4 cell">
         <h5>Try one of these buttons:</h5>

web/templates/tags_widget.html

@@ -1,7 +1,5 @@
 <div id="label-widget">
     <div class="grid-x grid-padding-x">
-        <div class="small-3 medium-2 large-1 cell">
-        </div>
         <div class="small-9 medium-10 large-5 cell" 
             hx-post="/tags"
             hx-target="#label-widget"
@@ -17,12 +15,11 @@
                title="remove {{ . }}"
                hx-trigger="click"
                hx-target="#label-widget"
-               hx-post="/tags?remove={{ . }}">
+               hx-post="/tags?remove={{ . }}">[-]</a>
                 {{ . }}
-            </a>
+            
             {{ end }}
             <input type="hidden" name="tags_hidden" value="{{ .tags_hidden }}">
-
         </div>    
     </div>
 </div>

web/web.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/tardisx/linkwallet/db"
 	"github.com/tardisx/linkwallet/entity"
+	"github.com/tardisx/linkwallet/version"
 
 	"github.com/hako/durafmt"
 
@@ -50,7 +51,7 @@ func Create(bmm *db.BookmarkManager) *Server {
 	}
 
 	// templ := template.Must(template.New("").Funcs(template.FuncMap{"dict": dictHelper}).ParseFS(templateFiles, "templates/*.html"))
-	templ := template.Must(template.New("").Funcs(template.FuncMap{"nicetime": niceTime, "niceURL": niceURL}).ParseFS(templateFiles, "templates/*.html"))
+	templ := template.Must(template.New("").Funcs(template.FuncMap{"nicetime": niceTime, "niceURL": niceURL, "join": strings.Join, "version": version.Is}).ParseFS(templateFiles, "templates/*.html"))
 
 	r := gin.Default()
 
@@ -186,7 +187,26 @@ func Create(bmm *db.BookmarkManager) *Server {
 		idNum, _ := strconv.ParseInt(id, 10, 32)
 		bm := bmm.LoadBookmarkByID(uint64(idNum))
 		bmm.QueueScrape(&bm)
-		c.String(http.StatusOK, "queued")
+		c.String(http.StatusOK, "<p>scrape queued</p>")
+	})
+
+	r.GET("/export", func(c *gin.Context) {
+		c.Writer.Header().Set("Content-Type", "text/plain")
+		c.Writer.Header().Set("Content-Disposition", "attachment; filename=\"bookmarks.txt\"")
+		err := bmm.ExportBookmarks(c.Writer)
+		// this is a bit late, but we already added headers, so at least log it.
+		if err != nil {
+			log.Printf("got error when exporting: %s", err)
+		}
+	})
+
+	r.GET("/bookmarklet", func(c *gin.Context) {
+		url := c.Query("url")
+		log.Printf(url)
+		meta := gin.H{"page": "bookmarklet_click", "url": url}
+		c.HTML(http.StatusOK,
+			"_layout.html", meta,
+		)
 	})
 
 	return server