Merge pull request #467 from Unpackerr/unstable

Fix history bug

pkg/unpackerr/history.go

@@ -0,0 +1,48 @@
+package unpackerr
+
+import (
+	"strconv"
+
+	"github.com/Unpackerr/unpackerr/pkg/ui"
+)
+
+// Safety constants.
+const (
+	hist     = "hist_"
+	histNone = "hist_none"
+)
+
+// History holds the history of extracted items.
+type History struct {
+	Items    []string
+	Finished uint
+	Retries  uint
+	Map      map[string]*Extract
+}
+
+// This is called every time an item is queued.
+func (u *Unpackerr) updateHistory(item string) {
+	if u.KeepHistory == 0 {
+		return
+	}
+
+	if ui.HasGUI() && item != "" {
+		u.menu[histNone].Hide()
+	}
+
+	u.History.Items[0] = item
+
+	// Do not process 0; this isn't an `intrange`.
+	for idx := len(u.History.Items) - 1; idx > 0; idx-- {
+		// u.History.Items is a slice with a set (identical) length and capacity.
+		switch u.History.Items[idx] = u.History.Items[idx-1]; {
+		case !ui.HasGUI():
+			continue
+		case u.History.Items[idx] != "":
+			u.menu[hist+strconv.Itoa(idx)].SetTitle(u.History.Items[idx])
+			u.menu[hist+strconv.Itoa(idx)].Show()
+		default:
+			u.menu[hist+strconv.Itoa(idx)].Hide()
+		}
+	}
+}

pkg/unpackerr/start.go

@@ -85,14 +85,6 @@ type Flags struct {
 	webhook    uint
 }
 
-// History holds the history of extracted items.
-type History struct {
-	Items    []string
-	Finished uint
-	Retries  uint
-	Map      map[string]*Extract
-}
-
 // New returns an UnpackerPoller struct full of defaults.
 // An empty struct will surely cause you pain, so use this!
 func New() *Unpackerr {

pkg/unpackerr/tray.go

@@ -18,12 +18,6 @@ import (
 	"golift.io/version"
 )
 
-// Safety constants.
-const (
-	hist     = "hist_"
-	histNone = "hist_none"
-)
-
 // startTray Run()s readyTray to bring up the web server and the GUI app.
 func (u *Unpackerr) startTray() {
 	if !ui.HasGUI() {
@@ -254,34 +248,3 @@ func (u *Unpackerr) checkForUpdate() {
 		_ = ui.OpenURL(update.CurrURL)
 	}
 }
-
-// This is called every time an item is queued.
-func (u *Unpackerr) updateHistory(item string) {
-	if u.KeepHistory == 0 {
-		return
-	}
-
-	if ui.HasGUI() && item != "" {
-		u.menu[histNone].Hide()
-	}
-
-	// u.History.Items is a slice with a set (identical) length and capacity.
-	for idx := range u.History.Items {
-		if idx == 0 {
-			u.History.Items[0] = item
-		} else {
-			u.History.Items[idx] = u.History.Items[idx-1]
-		}
-
-		if !ui.HasGUI() {
-			continue
-		}
-
-		if u.History.Items[idx] != "" {
-			u.menu[hist+strconv.Itoa(idx)].SetTitle(u.History.Items[idx])
-			u.menu[hist+strconv.Itoa(idx)].Show()
-		} else {
-			u.menu[hist+strconv.Itoa(idx)].Hide()
-		}
-	}
-}

pkg/unpackerr/tray_other.go

@@ -18,15 +18,3 @@ func (u *Unpackerr) startTray() {
 func (u *Unpackerr) updateTray(_ *Stats, _ uint) {
 	// there is no tray.
 }
-
-func (u *Unpackerr) updateHistory(item string) {
-	if u.KeepHistory == 0 {
-		return
-	}
-
-	u.History.Items[0] = item
-	// u.History.Items is a slice with a set (identical) length and capacity.
-	for idx := range u.History.Items {
-		u.History.Items[idx] = u.History.Items[idx-1]
-	}
-}