milarin/music-library
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: milarin:ada3580a8564e7d756dc4a7b794c9bc20f3146e5
Branches Tags
milarin:main
...
compare: milarin:e29c7be4facd564ecd15f83cc0c347037e88d0b2
Branches Tags
milarin:main

2 Commits
ada3580a85 ... e29c7be4fa

Author SHA1 Message Date
milarin
e29c7be4fa duplicate path variable parsing removed 2023-02-16 14:09:22 +01:00
milarin
10e3025ddc url decode filename 2023-02-16 14:08:01 +01:00
1 changed files with 14 additions and 5 deletions
Show Stats Expand all files Collapse all files

19
main.go
View File

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