Compare commits

..

No commits in common. "e29c7be4facd564ecd15f83cc0c347037e88d0b2" and "ada3580a8564e7d756dc4a7b794c9bc20f3146e5" have entirely different histories.

19
main.go
View File

@ -8,7 +8,6 @@ import (
"fmt" "fmt"
"math/rand" "math/rand"
"net/http" "net/http"
"net/url"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@ -80,13 +79,10 @@ func GetAllHandler(w http.ResponseWriter, r *http.Request) {
} }
func GetFileHandler(w http.ResponseWriter, r *http.Request) { func GetFileHandler(w http.ResponseWriter, r *http.Request) {
fileName, err := url.QueryUnescape(mux.Vars(r)["file"]) vars := mux.Vars(r)
if err != nil { file := vars["file"]
InternalServerError(w, err)
return
}
http.ServeFile(w, r, filepath.Join(LibraryPath, ".songs", fileName)) http.ServeFile(w, r, filepath.Join(LibraryPath, ".songs", file))
} }
func GetPlaylistHandler(w http.ResponseWriter, r *http.Request) { func GetPlaylistHandler(w http.ResponseWriter, r *http.Request) {
@ -144,13 +140,8 @@ func GetAllFilesHandler(w http.ResponseWriter, r *http.Request) {
} }
func GetEncodeFileHandler(w http.ResponseWriter, r *http.Request) { func GetEncodeFileHandler(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r) fileName := mux.Vars(r)["file"]
format := vars["format"] format := mux.Vars(r)["format"]
fileName, err := url.QueryUnescape(vars["file"])
if err != nil {
InternalServerError(w, err)
return
}
inputFilePath := filepath.Join(LibraryPath, ".songs", fileName) inputFilePath := filepath.Join(LibraryPath, ".songs", fileName)
outputFilePath := filepath.Join(os.TempDir(), fmt.Sprintf("%d.%s", rand.Int(), format)) outputFilePath := filepath.Join(os.TempDir(), fmt.Sprintf("%d.%s", rand.Int(), format))