Add options to keep title and excerpt when update

dillera · Aug 10, 2019 · 11c6680 · 11c6680
1 parent 7dbb63d
commit 11c6680
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 24 deletions.
diff --git a/internal/cmd/update.go b/internal/cmd/update.go
@@ -40,7 +40,7 @@ func updateCmd() *cobra.Command {
 	cmd.Flags().StringSliceP("tags", "t", []string{}, "Comma-separated tags for this bookmark")
 	cmd.Flags().BoolP("offline", "o", false, "Update bookmark without fetching data from internet")
 	cmd.Flags().BoolP("yes", "y", false, "Skip confirmation prompt and update ALL bookmarks")
-	cmd.Flags().Bool("dont-overwrite", false, "Don't overwrite existing metadata. Useful when only want to update bookmark's content")
+	cmd.Flags().Bool("keep-metadata", false, "Keep existing metadata. Useful when only want to update bookmark's content")
 	cmd.Flags().BoolP("no-archival", "a", false, "Update bookmark without updating offline archive")
 	cmd.Flags().Bool("log-archival", false, "Log the archival process")
 
@@ -57,7 +57,7 @@ func updateHandler(cmd *cobra.Command, args []string) {
 	skipConfirm, _ := cmd.Flags().GetBool("yes")
 	noArchival, _ := cmd.Flags().GetBool("no-archival")
 	logArchival, _ := cmd.Flags().GetBool("log-archival")
-	dontOverwrite := cmd.Flags().Changed("dont-overwrite")
+	keepMetadata := cmd.Flags().Changed("keep-metadata")
 
 	// If no arguments (i.e all bookmarks going to be updated), confirm to user
 	if len(args) == 0 && !skipConfirm {
@@ -215,7 +215,7 @@ func updateHandler(cmd *cobra.Command, args []string) {
 						book.Content = ""
 					}
 
-					if !dontOverwrite {
+					if !keepMetadata {
 						book.Title = article.Title
 						book.Excerpt = article.Excerpt
 					}

diff --git a/internal/view/index.html b/internal/view/index.html
@@ -110,13 +110,15 @@
                         showId = (typeof opts.showId === "boolean") ? opts.showId : false,
                         listMode = (typeof opts.listMode === "boolean") ? opts.listMode : false,
                         nightMode = (typeof opts.nightMode === "boolean") ? opts.nightMode : false,
+                        keepMetadata = (typeof opts.keepMetadata === "boolean") ? opts.keepMetadata : false,
                         useArchive = (typeof opts.useArchive === "boolean") ? opts.useArchive : false,
                         makePublic = (typeof opts.makePublic === "boolean") ? opts.makePublic : false;
 
                     this.displayOptions = {
                         showId: showId,
                         listMode: listMode,
                         nightMode: nightMode,
+                        keepMetadata: keepMetadata,
                         useArchive: useArchive,
                         makePublic: makePublic,
                     };

diff --git a/internal/view/js/page/base.js b/internal/view/js/page/base.js
@@ -7,6 +7,8 @@ export default {
                     showId: false,
                     listMode: false,
                     nightMode: false,
+
+                    keepMetadata: false,
                     useArchive: false,
                     makePublic: false,
                 };

diff --git a/internal/view/js/page/home.js b/internal/view/js/page/home.js
@@ -557,6 +557,11 @@ export default {
                 title: "Update Cache",
                 content: "Update cache for selected bookmarks ? This action is irreversible.",
                 fields: [{
+                    name: "keepMetadata",
+                    label: "Keep the old title and excerpt",
+                    type: "check",
+                    value: this.displayOptions.keepMetadata,
+                }, {
                     name: "createArchive",
                     label: "Update archive as well",
                     type: "check",
@@ -568,6 +573,7 @@ export default {
                     var data = {
                         ids: ids,
                         createArchive: data.createArchive,
+                        keepMetadata: data.keepMetadata,
                     };
 
                     this.dialog.loading = true;

diff --git a/internal/view/js/page/setting.js b/internal/view/js/page/setting.js
@@ -23,6 +23,10 @@ var template = `
         </details>
         <details open class="setting-group" id="setting-bookmarks">
             <summary>Bookmarks</summary>
+            <label>
+                <input type="checkbox" v-model="displayOptions.keepMetadata" @change="saveSetting">
+                Keep bookmark's metadata when updating
+            </label>
             <label>
                 <input type="checkbox" v-model="displayOptions.useArchive" @change="saveSetting">
                 Create archive by default
@@ -77,6 +81,7 @@ export default {
                 showId: this.displayOptions.showId,
                 listMode: this.displayOptions.listMode,
                 nightMode: this.displayOptions.nightMode,
+                keepMetadata: this.displayOptions.keepMetadata,
                 useArchive: this.displayOptions.useArchive,
                 makePublic: this.displayOptions.makePublic,
             });

diff --git a/internal/webserver/assets-prod.go b/internal/webserver/assets-prod.go
diff --git a/internal/webserver/handler-api.go b/internal/webserver/handler-api.go
@@ -458,6 +458,7 @@ func (h *handler) apiUpdateCache(w http.ResponseWriter, r *http.Request, ps http
 	// Decode request
 	request := struct {
 		IDs           []int `json:"ids"`
+		KeepMetadata  bool  `json:"keepMetadata"`
 		CreateArchive bool  `json:"createArchive"`
 	}{}
 
@@ -494,7 +495,7 @@ func (h *handler) apiUpdateCache(w http.ResponseWriter, r *http.Request, ps http
 	for i, book := range bookmarks {
 		wg.Add(1)
 
-		go func(i int, book model.Bookmark) {
+		go func(i int, book model.Bookmark, keepMetadata bool) {
 			// Make sure to finish the WG
 			defer wg.Done()
 
@@ -549,18 +550,15 @@ func (h *handler) apiUpdateCache(w http.ResponseWriter, r *http.Request, ps http
 				book.Content = article.TextContent
 				book.HTML = article.Content
 
-				if article.Title != "" {
-					book.Title = article.Title
+				if !isReadable {
+					book.Content = ""
 				}
 
-				if article.Excerpt != "" {
+				if !keepMetadata {
+					book.Title = article.Title
 					book.Excerpt = article.Excerpt
 				}
 
-				if !isReadable {
-					book.Content = ""
-				}
-
 				book.HasContent = book.Content != ""
 
 				// Get image for thumbnail and save it to local disk
@@ -609,7 +607,7 @@ func (h *handler) apiUpdateCache(w http.ResponseWriter, r *http.Request, ps http
 			mx.Lock()
 			bookmarks[i] = book
 			mx.Unlock()
-		}(i, book)
+		}(i, book, request.KeepMetadata)
 	}
 
 	// Receive all problematic bookmarks