clipboard: added always_put_new_on_top option, default: true

cmd/version.txt

@@ -1 +1 @@
-0.12.7-git
+0.12.7

internal/config/config.default.toml

@@ -123,6 +123,7 @@ placeholder = "Windows"
 show_icon_when_single = true
 
 [builtins.clipboard]
+always_put_new_on_top = true
 exec = "wl-copy"
 weight = 5
 name = "clipboard"

internal/config/config.go

@@ -333,11 +333,12 @@ type ActivationMode struct {
 }
 
 type Clipboard struct {
-	GeneralModule   `koanf:",squash"`
-	AvoidLineBreaks bool   `koanf:"avoid_line_breaks"`
-	ImageHeight     int    `koanf:"image_height"`
-	MaxEntries      int    `koanf:"max_entries"`
-	Exec            string `koanf:"exec"`
+	GeneralModule     `koanf:",squash"`
+	AvoidLineBreaks   bool   `koanf:"avoid_line_breaks"`
+	ImageHeight       int    `koanf:"image_height"`
+	MaxEntries        int    `koanf:"max_entries"`
+	Exec              string `koanf:"exec"`
+	AlwaysPutNewOnTop bool   `koanf:"always_put_new_on_top"`
 }
 
 type Dmenu struct {

internal/modules/clipboard/clipboard.go

@@ -91,14 +91,14 @@ func (c *Clipboard) SetupData() {
 	current := []ClipboardItem{}
 	_ = util.FromGob(c.file, &current)
 
-	go c.watch()
-
 	c.items = clean(current, c.file)
 
 	for _, v := range c.items {
 		c.entries = append(c.entries, itemToEntry(v, c.exec, c.avoidLineBreaks))
 	}
 
+	go c.watch()
+
 	c.general.IsSetup = true
 	c.general.HasInitialSetup = true
 }
@@ -227,32 +227,72 @@ func (c *Clipboard) watch() {
 		hash := md5.Sum([]byte(content))
 		strgHash := hex.EncodeToString(hash[:])
 
-		if c.exists(strgHash) {
+		exists := c.exists(strgHash)
+
+		if exists && !config.Cfg.Builtins.Clipboard.AlwaysPutNewOnTop {
 			continue
 		}
 
 		if len(content) < 2 {
 			continue
 		}
 
-		mimetype := getType()
+		if exists && c.items[0].HashIdent != strgHash {
+			for k, v := range c.items {
+				if v.HashIdent == strgHash {
+					c.items[k].Time = time.Now()
+				}
+			}
 
-		e := ClipboardItem{
-			Content:   content,
-			Time:      time.Now(),
-			Hash:      strgHash,
-			IsImg:     false,
-			HashIdent: strgHash,
-		}
+			for k, v := range c.entries {
+				if v.HashIdent == strgHash {
+					c.entries[k].LastUsed = time.Now()
+				}
+			}
 
-		if val, ok := c.imgTypes[mimetype]; ok {
-			file := saveTmpImg(val)
-			e.Content = file
-			e.IsImg = true
-		}
+			slices.SortFunc(c.items, func(a, b ClipboardItem) int {
+				if a.Time.After(b.Time) {
+					return -1
+				}
 
-		c.entries = append([]util.Entry{itemToEntry(e, c.exec, c.avoidLineBreaks)}, c.entries...)
-		c.items = append([]ClipboardItem{e}, c.items...)
+				if a.Time.Before(b.Time) {
+					return 1
+				}
+
+				return 0
+			})
+
+			slices.SortFunc(c.entries, func(a, b util.Entry) int {
+				if a.LastUsed.After(b.LastUsed) {
+					return -1
+				}
+
+				if a.LastUsed.Before(b.LastUsed) {
+					return 1
+				}
+
+				return 0
+			})
+		} else if !exists {
+			mimetype := getType()
+
+			e := ClipboardItem{
+				Content:   content,
+				Time:      time.Now(),
+				Hash:      strgHash,
+				IsImg:     false,
+				HashIdent: strgHash,
+			}
+
+			if val, ok := c.imgTypes[mimetype]; ok {
+				file := saveTmpImg(val)
+				e.Content = file
+				e.IsImg = true
+			}
+
+			c.entries = append([]util.Entry{itemToEntry(e, c.exec, c.avoidLineBreaks)}, c.entries...)
+			c.items = append([]ClipboardItem{e}, c.items...)
+		}
 
 		hstry := history.Get()