justin/linkwallet
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Add option to ignore title when scraping and provide a custom title instead. Closes #3

Browse Source
This commit is contained in:
Justin Hawkins 2022-06-05 11:19:44 +09:30
parent ee01887394
commit e0eefa2d11
9 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db/bookmarks.go
View File

@ -147,6 +147,10 @@ func (m *BookmarkManager) ScrapeAndIndex(bm *entity.Bookmark) error {
log.Printf("Start scrape for %s", bm.URL) log.Printf("Start scrape for %s", bm.URL)
info := content.FetchPageInfo(*bm) info := content.FetchPageInfo(*bm)
// keep the existing title if necessary
if bm.PreserveTitle {
info.Title = bm.Info.Title
}
bm.Info = info bm.Info = info
bm.TimestampLastScraped = time.Now() bm.TimestampLastScraped = time.Now()
err := m.SaveBookmark(bm) err := m.SaveBookmark(bm)
@ -154,12 +158,16 @@ func (m *BookmarkManager) ScrapeAndIndex(bm *entity.Bookmark) error {
panic(err) panic(err)
} }
m.UpdateIndexForBookmark(bm)
return nil
}
func (m *BookmarkManager) UpdateIndexForBookmark(bm *entity.Bookmark) {
words := content.Words(bm) words := content.Words(bm)
words = append(words, bm.Tags...) words = append(words, bm.Tags...)
log.Printf("index for %d %s (%d words)", bm.ID, bm.URL, len(words)) log.Printf("index for %d %s (%d words)", bm.ID, bm.URL, len(words))
m.db.UpdateIndexForWordsByID(words, bm.ID) m.db.UpdateIndexForWordsByID(words, bm.ID)
return nil
} }
func (m *BookmarkManager) QueueScrape(bm *entity.Bookmark) { func (m *BookmarkManager) QueueScrape(bm *entity.Bookmark) {

1
entity/bookmark.go
View File

@ -7,6 +7,7 @@ type Bookmark struct {
URL string URL string
Info PageInfo Info PageInfo
Tags []string Tags []string
PreserveTitle bool
TimestampCreated time.Time TimestampCreated time.Time
TimestampLastScraped time.Time TimestampLastScraped time.Time
} }

0
web/static/js/htmx.min.js → web/static/js/vendor/htmx.min.js vendored
View File

2
web/static/js/vendor/hyperscript_web.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
web/templates/_layout.html
View File

@ -8,7 +8,9 @@
<title>linkwallet</title> <title>linkwallet</title>
<link rel="stylesheet" href="/assets/css/foundation.min.css"> <link rel="stylesheet" href="/assets/css/foundation.min.css">
<link rel="stylesheet" href="/assets/css/app.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> </head>
<body> <body>

2
web/templates/add_url_form.html
View File

@ -7,7 +7,7 @@
<form onsubmit="return false"> <form onsubmit="return false">
<div class="grid-x grid-padding-x"> <div class="grid-x grid-padding-x">
<div class="large-6 cell"> <div class="large-6 cell">
<label>Paste a URL</label> <label>URL</label>
<input type="text" name="url" value="{{ .url }}" <input type="text" name="url" value="{{ .url }}"
hx-trigger="" hx-trigger=""
/> />

2
web/templates/bookmarklet.html
View File

@ -9,7 +9,7 @@
<p>Then whenever you are on a webpage you would like to bookmark, just <p>Then whenever you are on a webpage you would like to bookmark, just
click the bookmarklet.</p> 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 }} {{ else }}

6
web/templates/edit_form.html
View File

@ -3,7 +3,11 @@
<table> <table>
<tr> <tr>
<th>Title</th> <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>
<tr> <tr>
<th>URL</th> <th>URL</th>

13
web/web.go
View File

@ -161,7 +161,6 @@ func Create(bmm *db.BookmarkManager, cmm *db.ConfigManager) *Server {
} }
} }
log.Printf("well done %v, %d", totalErrors, added)
data := gin.H{ data := gin.H{
"added": added, "added": added,
"errors": totalErrors, "errors": totalErrors,
@ -262,6 +261,16 @@ func Create(bmm *db.BookmarkManager, cmm *db.ConfigManager) *Server {
bookmark := bmm.LoadBookmarkByID(bookmarkID) 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 // freshen tags
if c.PostForm("tags_hidden") == "" { if c.PostForm("tags_hidden") == "" {
// empty // empty
@ -269,7 +278,9 @@ func Create(bmm *db.BookmarkManager, cmm *db.ConfigManager) *Server {
} else { } else {
bookmark.Tags = strings.Split(c.PostForm("tags_hidden"), "|") bookmark.Tags = strings.Split(c.PostForm("tags_hidden"), "|")
} }
bmm.SaveBookmark(&bookmark) 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, "|")}} meta := gin.H{"page": "edit", "bookmark": bookmark, "tw": gin.H{"tags": bookmark.Tags, "tags_hidden": strings.Join(bookmark.Tags, "|")}}