Show if a new version is available in the menu bar

Bump version
Add option to ignore title when scraping and provide a custom title instead. Closes #3
2022-06-05 12:04:47 +09:30 · 2022-06-05 11:20:53 +09:30 · 2022-06-05 11:19:44 +09:30 · 2022-06-04 11:21:28 +09:30
10 changed files with 54 additions and 11 deletions
--- a/db/bookmarks.go
+++ b/db/bookmarks.go
@@ -147,6 +147,10 @@ func (m *BookmarkManager) ScrapeAndIndex(bm *entity.Bookmark) error {

 	log.Printf("Start scrape for %s", bm.URL)
 	info := content.FetchPageInfo(*bm)
+	// keep the existing title if necessary
+	if bm.PreserveTitle {
+		info.Title = bm.Info.Title
+	}
 	bm.Info = info
 	bm.TimestampLastScraped = time.Now()
 	err := m.SaveBookmark(bm)
@@ -154,12 +158,16 @@ func (m *BookmarkManager) ScrapeAndIndex(bm *entity.Bookmark) error {
 		panic(err)
 	}

+	m.UpdateIndexForBookmark(bm)
+	return nil
+
+}
+
+func (m *BookmarkManager) UpdateIndexForBookmark(bm *entity.Bookmark) {
 	words := content.Words(bm)
 	words = append(words, bm.Tags...)
 	log.Printf("index for %d %s (%d words)", bm.ID, bm.URL, len(words))
 	m.db.UpdateIndexForWordsByID(words, bm.ID)
-
-	return nil
 }

 func (m *BookmarkManager) QueueScrape(bm *entity.Bookmark) {
--- a/entity/bookmark.go
+++ b/entity/bookmark.go
@@ -7,6 +7,7 @@ type Bookmark struct {
 	URL                  string
 	Info                 PageInfo
 	Tags                 []string
+	PreserveTitle        bool
 	TimestampCreated     time.Time
 	TimestampLastScraped time.Time
 }
--- a/version/version.go
+++ b/version/version.go
@@ -8,7 +8,7 @@ import (
 	"golang.org/x/mod/semver"
 )

-const Tag = "v0.0.16"
+const Tag = "v0.0.18"

 var versionInfo struct {
 	Local struct {
@@ -40,7 +40,14 @@ func UpgradeAvailable() (bool, string) {
 		return true, versionInfo.Remote.Tag
 	}
 	return false, ""
+}

+func UpgradeAvailableString() string {
+	upgrade, ver := UpgradeAvailable()
+	if upgrade {
+		return ver
+	}
+	return ""
 }

 func UpdateVersionInfo() {
--- a/web/static/js/vendor/htmx.min.js
+++ b/web/static/js/vendor/htmx.min.js
--- a/web/static/js/vendor/hyperscript_web.min.js
+++ b/web/static/js/vendor/hyperscript_web.min.js
--- a/web/templates/_layout.html
+++ b/web/templates/_layout.html
@@ -8,7 +8,9 @@
    <title>linkwallet</title>
    <link rel="stylesheet" href="/assets/css/foundation.min.css">
    <link rel="stylesheet" href="/assets/css/app.css">
-    <script src="/assets/js/htmx.min.js" defer></script>
+    <script src="/assets/js/vendor/htmx.min.js" defer></script>
+    <script src="/assets/js/vendor/hyperscript_web.min.js"></script>
+

  </head>
 <body>
@@ -32,10 +34,17 @@
    </div>
    <div class="top-bar-right">
      <ul class="menu">
+        {{ if newVersion }}
+        <li>
+          <div><a href="https://github.com/tardisx/linkwallet/releases/tag/{{ newVersion }}">{{ newVersion }} available</a></div>
+        </li>
+        {{ end }}
+        <li class="menu-text">
+          {{ version }}
+        </li>
        <li>
          <a href="https://github.com/tardisx/linkwallet">
-            {{ version }}
-            <img src="/assets/image/GitHub-Mark-32px.png" />
+            <img src="/assets/image/GitHub-Mark-32px.png" width="16px" height="16px"/>
          </a>
        </li>
        <!-- <li><input type="search" placeholder="Search"></li>
--- a/web/templates/add_url_form.html
+++ b/web/templates/add_url_form.html
@@ -7,7 +7,7 @@
    <form onsubmit="return false">
        <div class="grid-x grid-padding-x">
            <div class="large-6 cell">
-                <label>Paste a URL</label>
+                <label>URL</label>
                <input type="text" name="url" value="{{ .url }}"
                      hx-trigger=""
                />
--- a/web/templates/bookmarklet.html
+++ b/web/templates/bookmarklet.html
@@ -9,7 +9,7 @@
        <p>Then whenever you are on a webpage you would like to bookmark, just
            click the bookmarklet.</p>

-        <a class="button" href="javascript:void(window.open('{{ .config.BaseURL }}/bookmarklet?url=' +encodeURIComponent(window.location), 'windowName', 'width=640,height=480'))">Bookmarklet</a>
+        <a class="button" href="javascript:void(window.open('{{ .config.BaseURL }}/bookmarklet?url=' +encodeURIComponent(window.location)+'&title='+encodeURIComponent(document.title), 'windowName', 'width=640,height=480'))">Bookmarklet</a>


        {{ else }}
--- a/web/templates/edit_form.html
+++ b/web/templates/edit_form.html
@@ -3,7 +3,11 @@
    <table>
        <tr>
            <th>Title</th>
-            <td>{{ .bookmark.Info.Title }}</td>
+            <td>
+                <input type="text" name="title" {{ if not .bookmark.PreserveTitle }}disabled{{ end }} id="title" value="{{ .bookmark.Info.Title }}">
+                <input id="checkbox" name="override_title" value="on" {{ if  .bookmark.PreserveTitle }}checked{{end}} type="checkbox" _="on click toggle @disabled on #title">
+                <label for="checkbox">override scraped title (ignore page title when scraping)</label>
+            </td>
        </tr>
        <tr>
            <th>URL</th>
--- a/web/web.go
+++ b/web/web.go
@@ -51,7 +51,7 @@ func Create(bmm *db.BookmarkManager, cmm *db.ConfigManager) *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, "join": strings.Join, "version": version.Is}).ParseFS(templateFiles, "templates/*.html"))
+	templ := template.Must(template.New("").Funcs(template.FuncMap{"nicetime": niceTime, "niceURL": niceURL, "join": strings.Join, "version": version.Is, "newVersion": version.UpgradeAvailableString}).ParseFS(templateFiles, "templates/*.html"))

 	config, err := cmm.LoadConfig()
 	if err != nil {
@@ -95,6 +95,7 @@ func Create(bmm *db.BookmarkManager, cmm *db.ConfigManager) *Server {

 	r.POST("/config", func(c *gin.Context) {
 		config.BaseURL = c.PostForm("baseurl")
+		config.BaseURL = strings.TrimRight(config.BaseURL, "/")
 		cmm.SaveConfig(&config)
 		meta := gin.H{"config": config}

@@ -160,7 +161,6 @@ func Create(bmm *db.BookmarkManager, cmm *db.ConfigManager) *Server {
 			}
 		}

-		log.Printf("well done %v, %d", totalErrors, added)
 		data := gin.H{
 			"added":  added,
 			"errors": totalErrors,
@@ -261,6 +261,16 @@ func Create(bmm *db.BookmarkManager, cmm *db.ConfigManager) *Server {

 		bookmark := bmm.LoadBookmarkByID(bookmarkID)

+		// update title and override title
+		overrideTitle := c.PostForm("override_title")
+		if overrideTitle != "" {
+			title := c.PostForm("title")
+			bookmark.Info.Title = title
+			bookmark.PreserveTitle = true
+		} else {
+			bookmark.PreserveTitle = false
+		}
+
 		// freshen tags
 		if c.PostForm("tags_hidden") == "" {
 			// empty
@@ -268,7 +278,9 @@ func Create(bmm *db.BookmarkManager, cmm *db.ConfigManager) *Server {
 		} else {
 			bookmark.Tags = strings.Split(c.PostForm("tags_hidden"), "|")
 		}
+
 		bmm.SaveBookmark(&bookmark)
+		bmm.UpdateIndexForBookmark(&bookmark) // because title may have changed

 		meta := gin.H{"page": "edit", "bookmark": bookmark, "tw": gin.H{"tags": bookmark.Tags, "tags_hidden": strings.Join(bookmark.Tags, "|")}}
Author	SHA1	Message	Date
Justin Hawkins	8c8a57433e	Show if a new version is available in the menu bar	2022-06-05 12:04:47 +09:30
Justin Hawkins	dab54bdeaa	Bump version	2022-06-05 11:20:53 +09:30
Justin Hawkins	e0eefa2d11	Add option to ignore title when scraping and provide a custom title instead. Closes #3	2022-06-05 11:19:44 +09:30
Justin Hawkins	ee01887394	Fix: trim trailing slashes from BaseURL. Fixes #2	2022-06-04 11:21:28 +09:30