fix for incorrect ordering after delete

Author: onurhanak

internal/actions/actions.go

@@ -116,30 +116,37 @@ func GetTorrentStatus(g *gocui.Gui, v *gocui.View) error {
 	return nil
 }
 
-func DownloadFile(torrent models.TorrentFileDetailed) bool {
+func DownloadFile(torrent models.TorrentFileDetailed) error {
 	path := filepath.Join(config.DownloadPath(), torrent.Filename)
 
+	if _, err := os.Stat(path); err == nil {
+		logs.LogEvent(fmt.Errorf("file already exists, skipping: %s", path))
+		return err
+	}
+	// TODO
+	// this request does not require authorization
+	// but still should use a shared client
 	resp, err := http.Get(torrent.Download)
 	if err != nil {
 		logs.LogEvent(fmt.Errorf("failed to GET %s: %w", torrent.Download, err))
-		return false
+		return err
 	}
 	defer resp.Body.Close()
 
 	out, err := os.Create(path)
 	if err != nil {
 		logs.LogEvent(fmt.Errorf("failed to create file %s: %w", path, err))
-		return false
+		return err
 	}
 	defer out.Close()
 
 	if _, err := io.Copy(out, resp.Body); err != nil {
 		logs.LogEvent(fmt.Errorf("failed to write to file %s: %w", path, err))
-		return false
+		return err
 	}
 
 	logs.LogEvent(fmt.Errorf("downloaded: %s", path))
-	return true
+	return nil
 }
 
 func GetTorrentContents(g *gocui.Gui, v *gocui.View) map[string]models.TorrentFileDetailed {
@@ -159,7 +166,7 @@ func GetTorrentContents(g *gocui.Gui, v *gocui.View) map[string]models.TorrentFi
 
 	files := make(map[string]models.TorrentFileDetailed)
 	var errors []string
-
+	success := false
 	for _, link := range torrent.Links {
 		file, err := api.UnrestrictLink(link)
 		if err != nil {
@@ -168,6 +175,12 @@ func GetTorrentContents(g *gocui.Gui, v *gocui.View) map[string]models.TorrentFi
 			continue
 		}
 		files[file.Filename] = file
+		success = true
+	}
+
+	if !success {
+		views.UpdateUILog(g, "All unrestrict attempts failed", nil)
+		return nil
 	}
 
 	data.FilesMap = files
@@ -199,6 +212,12 @@ func GetUserTorrents() map[int]models.Torrent {
 		return nil
 	}
 
+	// TODO
+	// necessary for now to have correct item ordering
+	// after deletes
+	// needs a better solution than emptying the map
+	data.UserDownloads = make(map[int]models.Torrent)
+
 	// essentially a map of which line number refers to which torrent
 	// this is necessary because gocui results in changed filenames
 	// depending on the width of the viewport

internal/api/client.go

@@ -44,6 +44,7 @@ func DoRequest(req *http.Request) ([]byte, error) {
 		return nil, fmt.Errorf("HTTP %d: %s", resp.StatusCode, body)
 	}
 
+	// Check for Real-Debrid-style error in JSON
 	var rdResp struct {
 		Error     string `json:"error"`
 		ErrorCode int    `json:"error_code"`

internal/handlers/download.go

@@ -14,21 +14,27 @@ import (
 
 const maxConcurrentDownloads = 5
 
-// this should also check for download slot probably
+// TODO
+// this should also check for download slot
 func handleStartDownload(g *gocui.Gui, torrentFile models.TorrentFileDetailed) {
-	log := func(msg string, success bool, err error) {
+	startMsg := fmt.Sprintf("Starting download: %s → %s", torrentFile.Filename, config.DownloadPath())
+	endMsg := fmt.Sprintf("Downloaded: %s", torrentFile.Filename)
+
+	g.Update(func(g *gocui.Gui) error {
+		views.UpdateUILog(g, startMsg, nil)
+		return nil
+	})
+
+	if err := actions.DownloadFile(torrentFile); err == nil {
 		g.Update(func(g *gocui.Gui) error {
-			views.UpdateUILog(g, msg, err)
+			views.UpdateUILog(g, endMsg, nil)
 			return nil
 		})
-	}
-
-	log(fmt.Sprintf("Downloading %s to %s", torrentFile.Filename, config.DownloadPath()), true, nil)
-
-	if actions.DownloadFile(torrentFile) {
-		log(fmt.Sprintf("Downloaded %s to %s", torrentFile.Filename, config.DownloadPath()), true, nil)
 	} else {
-		log(fmt.Sprintf("Failed to download %s", torrentFile.Filename), false, fmt.Errorf("download failed"))
+		g.Update(func(g *gocui.Gui) error {
+			views.UpdateUILog(g, fmt.Sprintf("Failed to download %s", torrentFile.Filename), err)
+			return nil
+		})
 	}
 }
 

internal/handlers/torrent.go

@@ -3,6 +3,7 @@ package handlers
 import (
 	"fmt"
 	"lazydebrid/internal/actions"
+	"lazydebrid/internal/data"
 	"lazydebrid/internal/models"
 	"lazydebrid/internal/views"
 	"strings"
@@ -12,34 +13,37 @@ import (
 
 func HandleDeleteTorrent(g *gocui.Gui, v *gocui.View) error {
 
-	// check for view to handle getting torrent id differently
 	currentViewName := g.CurrentView().Name()
 	var torrentID string
 	var err error
 	var cy int
 	var torrent models.Torrent
+
+	// check for view to handle getting torrent id differently
 	switch currentViewName {
 	case views.ViewActiveTorrents:
 		torrentID, err = views.GetSelectedActiveDownload(v)
 		if err != nil || strings.TrimSpace(torrentID) == "" {
-			return fmt.Errorf("no torrent selected")
+			views.UpdateUILog(g, "no torrent selected", nil)
+			// return nil
 		}
 	case views.ViewTorrents:
 		torrent, cy, err = views.GetSelectedTorrent(v)
 
 		if err != nil || strings.TrimSpace(torrent.ID) == "" {
-			return fmt.Errorf("no torrent selected")
+			views.UpdateUILog(g, "no torrent selected", nil)
+			// return fmt.Errorf("no torrent selected")
 		}
 		torrentID = torrent.ID
-
 	}
 
 	err = actions.DeleteTorrent(torrentID, cy, currentViewName)
 	if err != nil {
 		views.UpdateUILog(g, "Failed to delete torrent:", err)
-		return err
+		// return err
 	}
 
+	data.UserDownloads = actions.GetUserTorrents()
 	g.Update(func(g *gocui.Gui) error {
 
 		views.UpdateUILog(g, fmt.Sprintf("Deleted torrent: %s", torrentID), nil)

internal/views/layout.go

@@ -57,15 +57,6 @@ func Layout(g *gocui.Gui) error {
 		torrentsView.Highlight = true
 		torrentsView.Wrap = false
 		torrentsView.SelFgColor = gocui.ColorGreen
-
-		// Populate later in main.go to avoid import cycle
-		//
-		//for _, item := range actions.UserDownloads {
-		//	_, err := fmt.Fprintln(torrentsView, item.Filename)
-		//	if err != nil {
-		//		return err
-		//	}
-		//}
 		err = torrentsView.SetCursor(0, 0)
 		if err != nil {
 			return err
@@ -84,7 +75,7 @@ func Layout(g *gocui.Gui) error {
 	if activeTorrentsView, err := g.SetView(ViewActiveTorrents, splitX+1, activeTop, maxX-1, activeBottom); err != nil && err != gocui.ErrUnknownView {
 		return err
 	} else if err == nil {
-		activeTorrentsView.Title = "Active Downloads"
+		activeTorrentsView.Title = "Active Debrid Downloads"
 		activeTorrentsView.Highlight = true
 		activeTorrentsView.Wrap = false
 		activeTorrentsView.SelFgColor = gocui.ColorGreen

internal/views/viewsUtils.go

@@ -111,6 +111,7 @@ func GetSelectedTorrent(v *gocui.View) (torrent models.Torrent, cursorPosition i
 	return data.UserDownloads[cy], cy, nil
 }
 
+// TODO
 // this wont work if the viewport is too small to show the entire id
 func GetSelectedActiveDownload(v *gocui.View) (string, error) {
 	_, cy := v.Cursor()