heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

make log quoting consistent

Browse Source
This commit is contained in:
sentriz
2020-12-31 00:14:27 +00:00
committed by Senan Kelly
parent 711ffe144f
commit 352c75b85d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/ctrlsubsonic/handlers_raw.go
View File

@@ -120,7 +120,7 @@ func (c *Controller) ServeGetCoverArt(w http.ResponseWriter, r *http.Request) *s
case os.IsNotExist(err): case os.IsNotExist(err):
coverPath, err := coverGetPath(c.DB, c.MusicPath, id.Value) coverPath, err := coverGetPath(c.DB, c.MusicPath, id.Value)
if err != nil { if err != nil {
return spec.NewError(10, "couldn't find cover %q: %v", id, err) return spec.NewError(10, "couldn't find cover `%s`: %v", id, err)
} }
if err := coverScaleAndSave(coverPath, cachePath, size); err != nil { if err := coverScaleAndSave(coverPath, cachePath, size); err != nil {
log.Printf("error scaling cover: %v", err) log.Printf("error scaling cover: %v", err)
@@ -150,7 +150,7 @@ func (c *Controller) ServeStream(w http.ResponseWriter, r *http.Request) *spec.R
trackPath := path.Join(c.MusicPath, track.RelPath()) trackPath := path.Join(c.MusicPath, track.RelPath())
// //
onInvalidProfile := func() error { onInvalidProfile := func() error {
log.Printf("serving raw %q\n", track.Filename) log.Printf("serving raw `%s`\n", track.Filename)
w.Header().Set("Content-Type", track.MIME()) w.Header().Set("Content-Type", track.MIME())
http.ServeFile(w, r, trackPath) http.ServeFile(w, r, trackPath)
return nil return nil
@@ -192,7 +192,7 @@ func (c *Controller) ServeDownload(w http.ResponseWriter, r *http.Request) *spec
if err != nil { if err != nil {
return spec.NewError(70, "media with id `%s` was not found", id) return spec.NewError(70, "media with id `%s` was not found", id)
} }
log.Printf("serving raw %q\n", track.Filename) log.Printf("serving raw `%s`\n", track.Filename)
w.Header().Set("Content-Type", track.MIME()) w.Header().Set("Content-Type", track.MIME())
trackPath := path.Join(c.MusicPath, track.RelPath()) trackPath := path.Join(c.MusicPath, track.RelPath())
http.ServeFile(w, r, trackPath) http.ServeFile(w, r, trackPath)

2
server/scanner/scanner.go
View File

@@ -199,7 +199,7 @@ func (s *Scanner) Start(opts ScanOptions) error {
Unsorted: true, Unsorted: true,
FollowSymbolicLinks: true, FollowSymbolicLinks: true,
ErrorCallback: func(path string, err error) godirwalk.ErrorAction { ErrorCallback: func(path string, err error) godirwalk.ErrorAction {
log.Printf("error processing %q: %v", path, err) log.Printf("error processing `%s`: %v", path, err)
errCount++ errCount++
return godirwalk.SkipNode return godirwalk.SkipNode
}, },