go-shiori/shiori
1
1
Fork 0
mirror of https://github.com/go-shiori/shiori.git synced 2025-10-06 03:35:35 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix: title is never retrieved when adding bookmark (#664)

Browse source 
* fix: title is never retrieved when adding bookmark

Fixes #654
This commit is contained in:
Felipe Martin 2023-07-21 16:14:34 +02:00 • committed by GitHub
parent 6c41661b61
commit 622d556fde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
internal/webserver/handler-api.go
View file

@ -221,6 +221,7 @@ func (h *Handler) ApiInsertBookmark(w http.ResponseWriter, r *http.Request, ps h
panic(fmt.Errorf("failed to clean URL: %v", err)) panic(fmt.Errorf("failed to clean URL: %v", err))
} }
userHasDefinedTitle := book.Title != ""
// Make sure bookmark's title not empty // Make sure bookmark's title not empty
if book.Title == "" { if book.Title == "" {
book.Title = book.URL book.Title = book.URL
@ -236,7 +237,7 @@ func (h *Handler) ApiInsertBookmark(w http.ResponseWriter, r *http.Request, ps h
if payload.Async { if payload.Async {
go func() { go func() {
bookmark, err := downloadBookmarkContent(book, h.DataDir, r, book.Title != "", book.Excerpt != "") bookmark, err := downloadBookmarkContent(book, h.DataDir, r, !userHasDefinedTitle, book.Excerpt != "")
if err != nil { if err != nil {
log.Printf("error downloading boorkmark: %s", err) log.Printf("error downloading boorkmark: %s", err)
return return
@ -248,7 +249,7 @@ func (h *Handler) ApiInsertBookmark(w http.ResponseWriter, r *http.Request, ps h
} else { } else {
// Workaround. Download content after saving the bookmark so we have the proper database // Workaround. Download content after saving the bookmark so we have the proper database
// id already set in the object regardless of the database engine. // id already set in the object regardless of the database engine.
book, err = downloadBookmarkContent(book, h.DataDir, r, book.Title != "", book.Excerpt != "") book, err = downloadBookmarkContent(book, h.DataDir, r, !userHasDefinedTitle, book.Excerpt != "")
if err != nil { if err != nil {
log.Printf("error downloading boorkmark: %s", err) log.Printf("error downloading boorkmark: %s", err)
} else if _, err := h.DB.SaveBookmarks(ctx, false, *book); err != nil { } else if _, err := h.DB.SaveBookmarks(ctx, false, *book); err != nil {