- Cleanup webdav

- Include a re-insert fature for botched torrents
- Other minor bug fixes

cmd/decypharr/main.go

@@ -37,8 +37,7 @@ func Start(ctx context.Context) error {
 
 	_log := logger.GetDefaultLogger()
 
-	_log.Info().Msgf("Version: %s", version.GetInfo().String())
-	_log.Debug().Msgf("Config Loaded: %s", cfg.JsonFile())
+	_log.Info().Msgf("Starting Decypher (%s)", version.GetInfo().String())
 	_log.Info().Msgf("Default Log Level: %s", cfg.LogLevel)
 
 	svc := service.New()

internal/config/config.go

@@ -21,6 +21,7 @@ type Debrid struct {
 	Name             string `json:"name"`
 	Host             string `json:"host"`
 	APIKey           string `json:"api_key"`
+	DownloadAPIKeys  string `json:"download_api_keys"`
 	Folder           string `json:"folder"`
 	DownloadUncached bool   `json:"download_uncached"`
 	CheckCached      bool   `json:"check_cached"`
@@ -167,7 +168,7 @@ func validateDebrids(debrids []Debrid) error {
 			return errors.New("debrid folder is required")
 		}
 
-		// Check folder existence concurrently
+		// Check folder existence
 		//wg.Add(1)
 		//go func(folder string) {
 		//	defer wg.Done()
@@ -203,21 +204,9 @@ func validateQbitTorrent(config *QBitTorrent) error {
 
 func validateConfig(config *Config) error {
 	// Run validations concurrently
-	errChan := make(chan error, 2)
 
-	go func() {
-		errChan <- validateDebrids(config.Debrids)
-	}()
-
-	go func() {
-		errChan <- validateQbitTorrent(&config.QBitTorrent)
-	}()
-
-	// Check for errors
-	for i := 0; i < 2; i++ {
-		if err := <-errChan; err != nil {
-			return err
-		}
+	if err := validateDebrids(config.Debrids); err != nil {
+		return fmt.Errorf("debrids validation error: %w", err)
 	}
 
 	return nil
@@ -310,15 +299,15 @@ func (c *Config) NeedsSetup() bool {
 
 func (c *Config) updateDebrid(d Debrid) Debrid {
 
-	apiKeys := strings.Split(d.APIKey, ",")
-	newApiKeys := make([]string, 0, len(apiKeys))
-	for _, key := range apiKeys {
+	downloadAPIKeys := strings.Split(d.DownloadAPIKeys, ",")
+	newApiKeys := make([]string, 0, len(downloadAPIKeys))
+	for _, key := range downloadAPIKeys {
 		key = strings.TrimSpace(key)
 		if key != "" {
 			newApiKeys = append(newApiKeys, key)
 		}
 	}
-	d.APIKey = strings.Join(newApiKeys, ",")
+	d.DownloadAPIKeys = strings.Join(newApiKeys, ",")
 
 	if !d.UseWebDav {
 		return d

pkg/debrid/alldebrid/alldebrid.go

@@ -207,15 +207,14 @@ func (ad *AllDebrid) CheckStatus(torrent *types.Torrent, isSymlink bool) (*types
 	return torrent, nil
 }
 
-func (ad *AllDebrid) DeleteTorrent(torrentId string) {
+func (ad *AllDebrid) DeleteTorrent(torrentId string) error {
 	url := fmt.Sprintf("%s/magnet/delete?id=%s", ad.Host, torrentId)
 	req, _ := http.NewRequest(http.MethodGet, url, nil)
-	_, err := ad.client.MakeRequest(req)
-	if err == nil {
-		ad.logger.Info().Msgf("Torrent: %s deleted", torrentId)
-	} else {
-		ad.logger.Info().Msgf("Error deleting torrent: %s", err)
+	if _, err := ad.client.MakeRequest(req); err != nil {
+		return err
 	}
+	ad.logger.Info().Msgf("Torrent %s deleted from AD", torrentId)
+	return nil
 }
 
 func (ad *AllDebrid) GenerateDownloadLinks(t *types.Torrent) error {

pkg/debrid/debrid/cache.go

@@ -16,6 +16,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"strconv"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -48,7 +49,15 @@ type downloadLinkCache struct {
 	ExpiresAt time.Time
 }
 
+type RepairType string
+
+const (
+	RepairTypeReinsert RepairType = "reinsert"
+	RepairTypeDelete   RepairType = "delete"
+)
+
 type RepairRequest struct {
+	Type      RepairType
 	TorrentID string
 	Priority  int
 	FileName  string
@@ -85,7 +94,7 @@ type Cache struct {
 	ctx           context.Context
 }
 
-func NewCache(dc config.Debrid, client types.Client) *Cache {
+func New(dc config.Debrid, client types.Client) *Cache {
 	cfg := config.GetConfig()
 	torrentRefreshInterval, err := time.ParseDuration(dc.TorrentsRefreshInterval)
 	if err != nil {
@@ -122,6 +131,34 @@ func NewCache(dc config.Debrid, client types.Client) *Cache {
 	}
 }
 
+func (c *Cache) Start(ctx context.Context) error {
+	if err := os.MkdirAll(c.dir, 0755); err != nil {
+		return fmt.Errorf("failed to create cache directory: %w", err)
+	}
+	c.ctx = ctx
+
+	if err := c.Sync(); err != nil {
+		return fmt.Errorf("failed to sync cache: %w", err)
+	}
+
+	// initial download links
+	go func() {
+		c.refreshDownloadLinks()
+	}()
+
+	go func() {
+		err := c.Refresh()
+		if err != nil {
+			c.logger.Error().Err(err).Msg("Failed to start cache refresh worker")
+		}
+	}()
+
+	c.repairChan = make(chan RepairRequest, 100)
+	go c.repairWorker()
+
+	return nil
+}
+
 func (c *Cache) GetTorrentFolder(torrent *types.Torrent) string {
 	switch c.folderNaming {
 	case WebDavUseFileName:
@@ -165,34 +202,6 @@ func (c *Cache) GetListing() []os.FileInfo {
 	return nil
 }
 
-func (c *Cache) Start(ctx context.Context) error {
-	if err := os.MkdirAll(c.dir, 0755); err != nil {
-		return fmt.Errorf("failed to create cache directory: %w", err)
-	}
-	c.ctx = ctx
-
-	if err := c.Sync(); err != nil {
-		return fmt.Errorf("failed to sync cache: %w", err)
-	}
-
-	// initial download links
-	go func() {
-		c.refreshDownloadLinks()
-	}()
-
-	go func() {
-		err := c.Refresh()
-		if err != nil {
-			c.logger.Error().Err(err).Msg("Failed to start cache refresh worker")
-		}
-	}()
-
-	c.repairChan = make(chan RepairRequest, 100)
-	go c.repairWorker()
-
-	return nil
-}
-
 func (c *Cache) Close() error {
 	return nil
 }
@@ -226,20 +235,18 @@ func (c *Cache) load() (map[string]*CachedTorrent, error) {
 			c.logger.Debug().Err(err).Msgf("Failed to unmarshal file: %s", filePath)
 			continue
 		}
+		isComplete := true
 		if len(ct.Files) != 0 {
 			// We can assume the torrent is complete
 
-			// Make sure no file has a duplicate link
-			linkStore := make(map[string]bool)
 			for _, f := range ct.Files {
-				if _, ok := linkStore[f.Link]; ok {
-					// Duplicate link, refresh the torrent
-					ct = *c.refreshTorrent(&ct)
-					break
-				} else {
-					linkStore[f.Link] = true
+				if f.Link == "" {
+					c.logger.Debug().Msgf("Torrent %s is not complete, missing link for file %s", ct.Id, f.Name)
+					isComplete = false
+					continue
 				}
 			}
+			if isComplete {
 				addedOn, err := time.Parse(time.RFC3339, ct.Added)
 				if err != nil {
 					addedOn = now
@@ -248,6 +255,8 @@ func (c *Cache) load() (map[string]*CachedTorrent, error) {
 				ct.IsComplete = true
 				torrents[ct.Id] = &ct
 			}
+
+		}
 	}
 
 	return torrents, nil
@@ -305,14 +314,26 @@ func (c *Cache) saveTorrent(ct *CachedTorrent) {
 
 	fileName := ct.Torrent.Id + ".json"
 	filePath := filepath.Join(c.dir, fileName)
-	tmpFile := filePath + ".tmp"
+
+	// Use a unique temporary filename for concurrent safety
+	tmpFile := filePath + ".tmp." + strconv.FormatInt(time.Now().UnixNano(), 10)
 
 	f, err := os.Create(tmpFile)
 	if err != nil {
 		c.logger.Debug().Err(err).Msgf("Failed to create file: %s", tmpFile)
 		return
 	}
-	defer f.Close()
+
+	// Track if we've closed the file
+	fileClosed := false
+	defer func() {
+		// Only close if not already closed
+		if !fileClosed {
+			_ = f.Close()
+		}
+		// Clean up the temp file if it still exists and rename failed
+		_ = os.Remove(tmpFile)
+	}()
 
 	w := bufio.NewWriter(f)
 	if _, err := w.Write(data); err != nil {
@@ -322,12 +343,17 @@ func (c *Cache) saveTorrent(ct *CachedTorrent) {
 
 	if err := w.Flush(); err != nil {
 		c.logger.Debug().Err(err).Msgf("Failed to flush data: %s", tmpFile)
+		return
 	}
 
+	// Close the file before renaming
+	_ = f.Close()
+	fileClosed = true
+
 	if err := os.Rename(tmpFile, filePath); err != nil {
 		c.logger.Debug().Err(err).Msgf("Failed to rename file: %s", tmpFile)
-	}
 		return
+	}
 }
 
 func (c *Cache) Sync() error {
@@ -453,6 +479,13 @@ func (c *Cache) ProcessTorrent(t *types.Torrent, refreshRclone bool) error {
 			return fmt.Errorf("failed to update torrent: %w", err)
 		}
 	}
+	// Validate each file in the torrent
+	for _, file := range t.Files {
+		if file.Link == "" {
+			c.logger.Debug().Msgf("Torrent %s is not complete, missing link for file %s. Triggering a reinsert", t.Id, file.Name)
+			c.reinsertTorrent(t)
+		}
+	}
 
 	addedOn, err := time.Parse(time.RFC3339, t.Added)
 	if err != nil {
@@ -586,15 +619,20 @@ func (c *Cache) GetClient() types.Client {
 	return c.client
 }
 
-func (c *Cache) DeleteTorrent(id string) {
+func (c *Cache) DeleteTorrent(id string) error {
 	c.logger.Info().Msgf("Deleting torrent %s", id)
 
 	if t, ok := c.torrents.Load(id); ok {
+		err := c.client.DeleteTorrent(id)
+		if err != nil {
+			return err
+		}
 		c.torrents.Delete(id)
 		c.torrentsNames.Delete(c.GetTorrentFolder(t.Torrent))
 		c.removeFromDB(id)
 		c.refreshListings()
 	}
+	return nil
 }
 
 func (c *Cache) DeleteTorrents(ids []string) {
@@ -618,8 +656,11 @@ func (c *Cache) removeFromDB(torrentId string) {
 
 func (c *Cache) OnRemove(torrentId string) {
 	c.logger.Debug().Msgf("OnRemove triggered for %s", torrentId)
-	c.DeleteTorrent(torrentId)
-	c.refreshListings()
+	err := c.DeleteTorrent(torrentId)
+	if err != nil {
+		c.logger.Error().Err(err).Msgf("Failed to delete torrent: %s", torrentId)
+		return
+	}
 }
 
 func (c *Cache) GetLogger() zerolog.Logger {

pkg/debrid/debrid/engine.go

@@ -21,7 +21,7 @@ func NewEngine() *Engine {
 		client := createDebridClient(dc)
 		logger := client.GetLogger()
 		if dc.UseWebDav {
-			caches[dc.Name] = NewCache(dc, client)
+			caches[dc.Name] = New(dc, client)
 			logger.Info().Msg("Debrid Service started with WebDAV")
 		} else {
 			logger.Info().Msg("Debrid Service started")

pkg/debrid/debrid/refresh.go

@@ -270,6 +270,6 @@ func (c *Cache) refreshDownloadLinks() {
 		}
 	}
 
-	c.logger.Debug().Msgf("Refreshed %d download links", len(downloadLinks))
+	c.logger.Trace().Msgf("Refreshed %d download links", len(downloadLinks))
 
 }

pkg/debrid/debrid/repair.go

@@ -7,6 +7,7 @@ import (
 	"github.com/sirrobot01/debrid-blackhole/internal/utils"
 	"github.com/sirrobot01/debrid-blackhole/pkg/debrid/types"
 	"slices"
+	"time"
 )
 
 func (c *Cache) IsTorrentBroken(t *CachedTorrent, filenames []string) bool {
@@ -58,8 +59,6 @@ func (c *Cache) IsTorrentBroken(t *CachedTorrent, filenames []string) bool {
 
 func (c *Cache) repairWorker() {
 	// This watches a channel for torrents to repair
-	c.logger.Info().Msg("Starting repair worker")
-
 	for {
 		select {
 		case req := <-c.repairChan:
@@ -80,24 +79,30 @@ func (c *Cache) repairWorker() {
 				continue
 			}
 
-			// Check if torrent is broken
-			if c.IsTorrentBroken(cachedTorrent, nil) {
-				c.logger.Info().Str("torrentId", torrentId).Msg("Repairing broken torrent")
-				// Repair torrent
-				if err := c.repairTorrent(cachedTorrent); err != nil {
-					c.logger.Error().Err(err).Str("torrentId", torrentId).Msg("Failed to repair torrent")
-				} else {
-					c.logger.Info().Str("torrentId", torrentId).Msg("Torrent repaired")
+			switch req.Type {
+			case RepairTypeReinsert:
+				c.logger.Debug().Str("torrentId", torrentId).Msg("Reinserting torrent")
+				c.reInsertTorrent(cachedTorrent)
+			case RepairTypeDelete:
+				c.logger.Debug().Str("torrentId", torrentId).Msg("Deleting torrent")
+				if err := c.DeleteTorrent(torrentId); err != nil {
+					c.logger.Error().Err(err).Str("torrentId", torrentId).Msg("Failed to delete torrent")
+					continue
 				}
-			} else {
-				c.logger.Debug().Str("torrentId", torrentId).Msg("Torrent is not broken")
+
 			}
 			c.repairsInProgress.Delete(torrentId)
 		}
 	}
 }
 
-func (c *Cache) SubmitForRepair(torrentId, fileName string) {
+func (c *Cache) reInsertTorrent(t *CachedTorrent) {
+	// Reinsert the torrent into the cache
+	c.torrents.Store(t.Id, t)
+	c.logger.Debug().Str("torrentId", t.Id).Msg("Reinserted torrent into cache")
+}
+
+func (c *Cache) submitForRepair(repairType RepairType, torrentId, fileName string) {
 	// Submitting a torrent for repair.Not used yet
 
 	// Check if already in progress before even submitting
@@ -114,17 +119,14 @@ func (c *Cache) SubmitForRepair(torrentId, fileName string) {
 	}
 }
 
-func (c *Cache) repairTorrent(t *CachedTorrent) error {
+func (c *Cache) reinsertTorrent(torrent *types.Torrent) error {
 	// Check if Magnet is not empty, if empty, reconstruct the magnet
-
-	if _, inProgress := c.repairsInProgress.Load(t.Id); inProgress {
-		c.logger.Debug().Str("torrentID", t.Id).Msg("Repair already in progress")
-		return nil
+	if _, ok := c.repairsInProgress.Load(torrent.Id); ok {
+		return fmt.Errorf("repair already in progress for torrent %s", torrent.Id)
 	}
 
-	torrent := t.Torrent
 	if torrent.Magnet == nil {
-		torrent.Magnet = utils.ConstructMagnet(t.InfoHash, t.Name)
+		torrent.Magnet = utils.ConstructMagnet(torrent.InfoHash, torrent.Name)
 	}
 
 	oldID := torrent.Id
@@ -146,12 +148,21 @@ func (c *Cache) repairTorrent(t *CachedTorrent) error {
 		return fmt.Errorf("failed to check status: %w", err)
 	}
 
-	c.client.DeleteTorrent(oldID) // delete the old torrent
-	c.DeleteTorrent(oldID)        // Remove from listings
+	if err := c.DeleteTorrent(oldID); err != nil {
+		return fmt.Errorf("failed to delete old torrent: %w", err)
+	}
 
 	// Update the torrent in the cache
-	t.Torrent = torrent
-	c.setTorrent(t)
+	addedOn, err := time.Parse(time.RFC3339, torrent.Added)
+	if err != nil {
+		addedOn = time.Now()
+	}
+	ct := &CachedTorrent{
+		Torrent:    torrent,
+		IsComplete: len(torrent.Files) > 0,
+		AddedOn:    addedOn,
+	}
+	c.setTorrent(ct)
 	c.refreshListings()
 
 	c.repairsInProgress.Delete(oldID)

pkg/debrid/debrid/worker.go

@@ -4,7 +4,6 @@ import "time"
 
 func (c *Cache) Refresh() error {
 	// For now, we just want to refresh the listing and download links
-	c.logger.Info().Msg("Starting cache refresh workers")
 	go c.refreshDownloadLinksWorker()
 	go c.refreshTorrentsWorker()
 	return nil

pkg/debrid/debrid_link/debrid_link.go

@@ -224,15 +224,14 @@ func (dl *DebridLink) CheckStatus(torrent *types.Torrent, isSymlink bool) (*type
 	return torrent, nil
 }
 
-func (dl *DebridLink) DeleteTorrent(torrentId string) {
+func (dl *DebridLink) DeleteTorrent(torrentId string) error {
 	url := fmt.Sprintf("%s/seedbox/%s/remove", dl.Host, torrentId)
 	req, _ := http.NewRequest(http.MethodDelete, url, nil)
-	_, err := dl.client.MakeRequest(req)
-	if err == nil {
-		dl.logger.Info().Msgf("Torrent: %s deleted", torrentId)
-	} else {
-		dl.logger.Info().Msgf("Error deleting torrent: %s", err)
+	if _, err := dl.client.MakeRequest(req); err != nil {
+		return err
 	}
+	dl.logger.Info().Msgf("Torrent: %s deleted from DebridLink", torrentId)
+	return nil
 }
 
 func (dl *DebridLink) GenerateDownloadLinks(t *types.Torrent) error {

pkg/debrid/realdebrid/realdebrid.go

@@ -253,15 +253,14 @@ func (r *RealDebrid) CheckStatus(t *types.Torrent, isSymlink bool) (*types.Torre
 	return t, nil
 }
 
-func (r *RealDebrid) DeleteTorrent(torrentId string) {
+func (r *RealDebrid) DeleteTorrent(torrentId string) error {
 	url := fmt.Sprintf("%s/torrents/delete/%s", r.Host, torrentId)
 	req, _ := http.NewRequest(http.MethodDelete, url, nil)
-	_, err := r.client.MakeRequest(req)
-	if err == nil {
-		r.logger.Info().Msgf("Torrent: %s deleted", torrentId)
-	} else {
-		r.logger.Info().Msgf("Error deleting torrent: %s", err)
+	if _, err := r.client.MakeRequest(req); err != nil {
+		return err
 	}
+	r.logger.Info().Msgf("Torrent: %s deleted from RD", torrentId)
+	return nil
 }
 
 func (r *RealDebrid) GenerateDownloadLinks(t *types.Torrent) error {
@@ -555,14 +554,13 @@ func (r *RealDebrid) GetMountPath() string {
 
 func New(dc config.Debrid) *RealDebrid {
 	rl := request.ParseRateLimit(dc.RateLimit)
-	apiKeys := strings.Split(dc.APIKey, ",")
+	apiKeys := strings.Split(dc.DownloadAPIKeys, ",")
 	extraKeys := make([]string, 0)
 	if len(apiKeys) > 1 {
 		extraKeys = apiKeys[1:]
 	}
-	mainKey := apiKeys[0]
 	headers := map[string]string{
-		"Authorization": fmt.Sprintf("Bearer %s", mainKey),
+		"Authorization": fmt.Sprintf("Bearer %s", dc.APIKey),
 	}
 	_log := logger.NewLogger(dc.Name)
 	client := request.New().
@@ -573,7 +571,7 @@ func New(dc config.Debrid) *RealDebrid {
 	return &RealDebrid{
 		Name:             "realdebrid",
 		Host:             dc.Host,
-		APIKey:           mainKey,
+		APIKey:           dc.APIKey,
 		ExtraAPIKeys:     extraKeys,
 		DownloadUncached: dc.DownloadUncached,
 		client:           client,

pkg/debrid/torbox/torbox.go

@@ -262,17 +262,16 @@ func (tb *Torbox) CheckStatus(torrent *types.Torrent, isSymlink bool) (*types.To
 	return torrent, nil
 }
 
-func (tb *Torbox) DeleteTorrent(torrentId string) {
+func (tb *Torbox) DeleteTorrent(torrentId string) error {
 	url := fmt.Sprintf("%s/api/torrents/controltorrent/%s", tb.Host, torrentId)
 	payload := map[string]string{"torrent_id": torrentId, "action": "Delete"}
 	jsonPayload, _ := json.Marshal(payload)
 	req, _ := http.NewRequest(http.MethodDelete, url, bytes.NewBuffer(jsonPayload))
-	_, err := tb.client.MakeRequest(req)
-	if err == nil {
-		tb.logger.Info().Msgf("Torrent: %s deleted", torrentId)
-	} else {
-		tb.logger.Info().Msgf("Error deleting torrent: %s", err)
+	if _, err := tb.client.MakeRequest(req); err != nil {
+		return err
 	}
+	tb.logger.Info().Msgf("Torrent %s deleted from Torbox", torrentId)
+	return nil
 }
 
 func (tb *Torbox) GenerateDownloadLinks(t *types.Torrent) error {

pkg/debrid/types/debrid.go

@@ -9,7 +9,7 @@ type Client interface {
 	CheckStatus(tr *Torrent, isSymlink bool) (*Torrent, error)
 	GenerateDownloadLinks(tr *Torrent) error
 	GetDownloadLink(tr *Torrent, file *File) (string, error)
-	DeleteTorrent(torrentId string)
+	DeleteTorrent(torrentId string) error
 	IsAvailable(infohashes []string) map[string]bool
 	GetCheckCached() bool
 	GetDownloadUncached() bool

pkg/qbit/import.go

@@ -78,7 +78,9 @@ func (i *ImportRequest) Process(q *QBit) (err error) {
 	if err != nil || debridTorrent == nil {
 		if debridTorrent != nil {
 			dbClient := service.GetDebrid().GetByName(debridTorrent.Debrid)
-			go dbClient.DeleteTorrent(debridTorrent.Id)
+			go func() {
+				_ = dbClient.DeleteTorrent(debridTorrent.Id)
+			}()
 		}
 		if err == nil {
 			err = fmt.Errorf("failed to process torrent")

pkg/qbit/torrent.go

@@ -60,7 +60,9 @@ func (q *QBit) Process(ctx context.Context, magnet *utils.Magnet, category strin
 	if err != nil || debridTorrent == nil {
 		if debridTorrent != nil {
 			dbClient := service.GetDebrid().GetByName(debridTorrent.Debrid)
-			go dbClient.DeleteTorrent(debridTorrent.Id)
+			go func() {
+				_ = dbClient.DeleteTorrent(debridTorrent.Id)
+			}()
 		}
 		if err == nil {
 			err = fmt.Errorf("failed to process torrent")
@@ -81,7 +83,12 @@ func (q *QBit) ProcessFiles(torrent *Torrent, debridTorrent *debrid.Torrent, arr
 		dbT, err := client.CheckStatus(debridTorrent, isSymlink)
 		if err != nil {
 			q.logger.Error().Msgf("Error checking status: %v", err)
-			go client.DeleteTorrent(debridTorrent.Id)
+			go func() {
+				err := client.DeleteTorrent(debridTorrent.Id)
+				if err != nil {
+					q.logger.Error().Msgf("Error deleting torrent: %v", err)
+				}
+			}()
 			q.MarkAsFailed(torrent)
 			if err := arr.Refresh(); err != nil {
 				q.logger.Error().Msgf("Error refreshing arr: %v", err)
@@ -128,7 +135,12 @@ func (q *QBit) ProcessFiles(torrent *Torrent, debridTorrent *debrid.Torrent, arr
 	}
 	if err != nil {
 		q.MarkAsFailed(torrent)
-		go client.DeleteTorrent(debridTorrent.Id)
+		go func() {
+			err := client.DeleteTorrent(debridTorrent.Id)
+			if err != nil {
+				q.logger.Error().Msgf("Error deleting torrent: %v", err)
+			}
+		}()
 		q.logger.Info().Msgf("Error: %v", err)
 		return
 	}

pkg/repair/clean.go

@@ -92,7 +92,10 @@ func (r *Repair) clean(job *Job) error {
 		return fmt.Errorf("client not found")
 	}
 	for _, id := range dangling {
-		client.DeleteTorrent(id)
+		err := client.DeleteTorrent(id)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil

pkg/server/server.go

@@ -45,7 +45,7 @@ func (s *Server) Start(ctx context.Context) error {
 	s.router.Get("/logs", s.getLogs)
 	s.router.Get("/stats", s.getStats)
 	port := fmt.Sprintf(":%s", cfg.QBitTorrent.Port)
-	s.logger.Info().Msgf("Starting server on %s", port)
+	s.logger.Info().Msgf("Server started on %s", port)
 	srv := &http.Server{
 		Addr:    port,
 		Handler: s.router,

pkg/webdav/handler.go

@@ -8,6 +8,7 @@ import (
 	"github.com/sirrobot01/debrid-blackhole/internal/request"
 	"github.com/sirrobot01/debrid-blackhole/pkg/debrid/debrid"
 	"github.com/sirrobot01/debrid-blackhole/pkg/debrid/types"
+	"github.com/sirrobot01/debrid-blackhole/pkg/version"
 	"golang.org/x/net/webdav"
 	"html/template"
 	"io"
@@ -58,11 +59,11 @@ func (h *Handler) RemoveAll(ctx context.Context, name string) error {
 	torrentName, filename := getName(rootDir, name)
 	cachedTorrent := h.cache.GetTorrentByName(torrentName)
 	if cachedTorrent == nil {
+		h.logger.Debug().Msgf("Torrent not found: %s", torrentName)
 		return os.ErrNotExist
 	}
 
 	if filename == "" {
-		h.cache.GetClient().DeleteTorrent(cachedTorrent.Torrent.Id)
 		h.cache.OnRemove(cachedTorrent.Id)
 		return nil
 	}
@@ -100,7 +101,8 @@ func (h *Handler) getParentFiles() []os.FileInfo {
 		}
 		if item == "version.txt" {
 			f.isDir = false
-			f.size = int64(len("v1.0.0"))
+			versionInfo := version.GetInfo().String()
+			f.size = int64(len(versionInfo))
 		}
 		rootFiles = append(rootFiles, f)
 	}
@@ -130,12 +132,13 @@ func (h *Handler) OpenFile(ctx context.Context, name string, flag int, perm os.F
 			modTime:      now,
 		}, nil
 	case path.Join(rootDir, "version.txt"):
+		versionInfo := version.GetInfo().String()
 		return &File{
 			cache:        h.cache,
 			isDir:        false,
-			content:      []byte("v1.0.0"),
+			content:      []byte(versionInfo),
 			name:         "version.txt",
-			size:         int64(len("v1.0.0")),
+			size:         int64(len(versionInfo)),
 			metadataOnly: metadataOnly,
 			modTime:      now,
 		}, nil

pkg/webdav/misc.go

@@ -14,7 +14,7 @@ func getName(rootDir, path string) (string, string) {
 	if len(parts) < 2 {
 		return "", ""
 	}
-	return parts[0], strings.Join(parts[1:], "/")
+	return parts[1], strings.Join(parts[2:], "/") // Note the change from [0] to [1]
 }
 
 func acceptsGzip(r *http.Request) bool {