Random Fixes:

- Fix uncached error
- Fix naming and race conditions

pkg/qbit/handlers_torrent.go

@@ -37,15 +37,9 @@ func (q *QBit) handleTorrentsAdd(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	files := r.MultipartForm.File["torrents"]
 	urls := r.FormValue("urls")
 	category := r.FormValue("category")
 
-	if len(files) == 0 && urls == "" {
-		http.Error(w, "No torrent provided", http.StatusBadRequest)
-		return
-	}
-
 	var urlList []string
 	if urls != "" {
 		urlList = strings.Split(urls, "\n")
@@ -62,18 +56,22 @@ func (q *QBit) handleTorrentsAdd(w http.ResponseWriter, r *http.Request) {
 
 	}
 
-	for _, fileHeader := range files {
-		file, _ := fileHeader.Open()
-		defer file.Close()
-		var reader io.Reader = file
-		magnet, err := common.GetMagnetFromFile(reader, fileHeader.Filename)
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			q.logger.Printf("Error reading file: %s", fileHeader.Filename)
-			return
+	if contentType == "multipart/form-data" {
+		files := r.MultipartForm.File["torrents"]
+		for _, fileHeader := range files {
+			file, _ := fileHeader.Open()
+			defer file.Close()
+			var reader io.Reader = file
+			magnet, err := common.GetMagnetFromFile(reader, fileHeader.Filename)
+			if err != nil {
+				http.Error(w, err.Error(), http.StatusBadRequest)
+				q.logger.Printf("Error reading file: %s", fileHeader.Filename)
+				return
+			}
+			go q.Process(magnet, category)
 		}
-		go q.Process(magnet, category)
 	}
+
 	w.WriteHeader(http.StatusOK)
 }
 

pkg/qbit/qbit.go

@@ -17,11 +17,14 @@ func (q *QBit) Process(magnet *common.Magnet, category string) (*Torrent, error)
 	debridTorrent, err := debrid.ProcessQBitTorrent(q.debrid, magnet, category)
 	if err != nil || debridTorrent == nil {
 		// Mark as failed
+		q.logger.Printf("Failed to process torrent: %s: %v", magnet.Name, err)
 		q.MarkAsFailed(torrent)
 		return torrent, err
 	}
 	torrent.ID = debridTorrent.Id
-	q.processFiles(torrent, debridTorrent)
+	torrent.Name = debridTorrent.Name // Update the name before adding it to *arrs storage
+	torrent.DebridTorrent = debridTorrent
+	go q.processFiles(torrent, debridTorrent)
 	return torrent, nil
 }
 

pkg/qbit/structs.go

@@ -1,5 +1,7 @@
 package qbit
 
+import "goBlack/pkg/debrid"
+
 type BuildInfo struct {
 	Libtorrent string `json:"libtorrent"`
 	Bitness    int    `json:"bitness"`
@@ -167,7 +169,8 @@ type TorrentCategory struct {
 }
 
 type Torrent struct {
-	ID string `json:"-"`
+	ID            string          `json:"-"`
+	DebridTorrent *debrid.Torrent `json:"-"`
 
 	AddedOn           int64   `json:"added_on,omitempty"`
 	AmountLeft        int64   `json:"amount_left,omitempty"`

pkg/qbit/torrent.go

@@ -49,7 +49,7 @@ func (q *QBit) UpdateTorrent(t *Torrent, debridTorrent *debrid.Torrent) *Torrent
 	t.Uploaded = sizeCompleted
 	t.UploadedSession = sizeCompleted
 	t.AmountLeft = totalSize - sizeCompleted
-	t.Progress = 100
+	t.Progress = float32(progress)
 	t.SavePath = savePath
 	t.ContentPath = torrentPath
 	t.Eta = eta