Finish config mapping
This commit is contained in:
@@ -68,7 +68,7 @@ func handleRoot(w http.ResponseWriter, r *http.Request, c config.ConfigInterface
|
||||
return xml.MarshalIndent(rootResponse, "", " ")
|
||||
}
|
||||
|
||||
// handleListOfTorrents handles a PROPFIND request to the /torrents directory
|
||||
// handleListOfTorrents handles a PROPFIND request to the base directory
|
||||
func handleListOfTorrents(requestPath string, w http.ResponseWriter, r *http.Request, t *torrent.TorrentManager, c config.ConfigInterface) ([]byte, error) {
|
||||
basePath := path.Base(requestPath)
|
||||
|
||||
@@ -79,7 +79,7 @@ func handleListOfTorrents(requestPath string, w http.ResponseWriter, r *http.Req
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
log.Println("Cannot find directory", requestPath)
|
||||
log.Println("Cannot find directory when generating list", requestPath)
|
||||
http.Error(w, "Cannot find directory", http.StatusNotFound)
|
||||
return nil, nil
|
||||
}
|
||||
@@ -96,17 +96,17 @@ func handleListOfTorrents(requestPath string, w http.ResponseWriter, r *http.Req
|
||||
|
||||
// handleSingleTorrent handles a PROPFIND request to a single torrent directory
|
||||
func handleSingleTorrent(requestPath string, w http.ResponseWriter, r *http.Request, t *torrent.TorrentManager) ([]byte, error) {
|
||||
basePath := path.Dir(requestPath)
|
||||
directory := strings.TrimPrefix(path.Dir(requestPath), "/")
|
||||
|
||||
torrentName := path.Base(requestPath)
|
||||
sameNameTorrents := findAllTorrentsWithName(t, basePath, torrentName)
|
||||
sameNameTorrents := findAllTorrentsWithName(t, directory, torrentName)
|
||||
if len(sameNameTorrents) == 0 {
|
||||
log.Println("Cannot find directory", requestPath)
|
||||
log.Println("Cannot find directory when generating single torrent", requestPath)
|
||||
http.Error(w, "Cannot find directory", http.StatusNotFound)
|
||||
return nil, nil
|
||||
}
|
||||
var resp *dav.MultiStatus
|
||||
resp, err := createSingleTorrentResponse(fmt.Sprintf("/%s", basePath), sameNameTorrents, t)
|
||||
resp, err := createSingleTorrentResponse(fmt.Sprintf("/%s", directory), sameNameTorrents, t)
|
||||
if err != nil {
|
||||
log.Printf("Cannot read directory (%s): %v\n", requestPath, err.Error())
|
||||
http.Error(w, "Cannot read directory", http.StatusInternalServerError)
|
||||
|
||||
Reference in New Issue
Block a user