Use new router

internal/dav/delete.go

@@ -2,88 +2,36 @@ package dav
 
 import (
 	"fmt"
-	"net/http"
-	"path"
-	"strings"
 
 	"github.com/debridmediamanager/zurg/internal/torrent"
-	"go.uber.org/zap"
 )
 
-func HandleDeleteRequest(w http.ResponseWriter, r *http.Request, t *torrent.TorrentManager, log *zap.SugaredLogger) {
-	requestPath := path.Clean(r.URL.Path)
-	filteredSegments := splitIntoSegments(requestPath)
-
-	var err error
-	switch {
-	case len(filteredSegments) == 0:
-		err = fmt.Errorf("cannot delete root")
-	case len(filteredSegments) == 1:
-		err = fmt.Errorf("cannot delete configured directory")
-	case len(filteredSegments) == 2:
-		err = handleDeleteTorrent(w, filteredSegments, t)
-	case len(filteredSegments) >= 3:
-		err = handleDeleteFile(w, filteredSegments, t)
-	default:
-		log.Warnf("Request %s %s not found", r.Method, requestPath)
-		http.Error(w, "Not Found", http.StatusNotFound)
-		return
-	}
-
-	if err != nil {
-		if strings.Contains(err.Error(), "cannot find") {
-			http.Error(w, "Not Found", http.StatusNotFound)
-			return
-		}
-		log.Errorf("Error processing request: %v", err)
-		http.Error(w, "Server error", http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "text/xml; charset=\"utf-8\"")
-}
-
-func handleDeleteTorrent(w http.ResponseWriter, segments []string, t *torrent.TorrentManager) error {
-	directory := segments[0]
+func HandleDeleteTorrent(directory, torrentName string, t *torrent.TorrentManager) error {
 	torrents, ok := t.DirectoryMap.Get(directory)
 	if !ok {
 		return fmt.Errorf("cannot find directory %s", directory)
 	}
-
-	accessKey := segments[1]
-	tor, ok := torrents.Get(accessKey)
-	if !ok {
-		return fmt.Errorf("cannot find torrent %s", accessKey)
+	if !torrents.Has(torrentName) {
+		return fmt.Errorf("cannot find torrent %s", torrentName)
 	}
-
-	t.Delete(tor.AccessKey)
-
-	w.WriteHeader(http.StatusNoContent)
+	t.Delete(torrentName)
 	return nil
 }
 
-func handleDeleteFile(w http.ResponseWriter, segments []string, t *torrent.TorrentManager) error {
-	directory := segments[0]
+func HandleDeleteFile(directory, torrentName, fileName string, t *torrent.TorrentManager) error {
 	torrents, ok := t.DirectoryMap.Get(directory)
 	if !ok {
 		return fmt.Errorf("cannot find directory %s", directory)
 	}
-
-	accessKey := segments[1]
-	tor, ok := torrents.Get(accessKey)
+	tor, ok := torrents.Get(torrentName)
 	if !ok {
-		return fmt.Errorf("cannot find torrent %s", accessKey)
+		return fmt.Errorf("cannot find torrent %s", torrentName)
 	}
-
-	// set filepath to last segment
-	filepath := segments[len(segments)-1]
-	file, ok := tor.SelectedFiles.Get(filepath)
+	file, ok := tor.SelectedFiles.Get(fileName)
 	if !ok {
-		return fmt.Errorf("cannot find file %s", filepath)
+		return fmt.Errorf("cannot find file %s", fileName)
 	}
-
 	file.Link = "unselect"
 	t.ScheduleForRefresh()
-	w.WriteHeader(http.StatusNoContent)
 	return nil
 }