archives/trantor
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove '/' from titles for use them on paths

Browse source
This commit is contained in:
Las Zenow 2012-09-02 23:07:21 +02:00
parent f72f06c9a3
commit de0fd4227c
2 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
admin.go
View file

@ -7,6 +7,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"strconv" "strconv"
"strings"
) )
func deleteHandler(coll *mgo.Collection, url string) func(http.ResponseWriter, *http.Request) { func deleteHandler(coll *mgo.Collection, url string) func(http.ResponseWriter, *http.Request) {
@ -137,6 +138,17 @@ func newHandler(coll *mgo.Collection) func(http.ResponseWriter, *http.Request) {
} }
} }
func ValidFileName(path string, title string, extension string) string {
title = strings.Replace(title, "/", "_", -1)
file := path + "/" + title + extension
_, err := os.Stat(file)
for i := 0; err == nil; i++ {
file := path + "/" + title + "_" + strconv.Itoa(i) + extension
_, err = os.Stat(file)
}
return file
}
func storeHandler(newColl, coll *mgo.Collection) func(http.ResponseWriter, *http.Request) { func storeHandler(newColl, coll *mgo.Collection) func(http.ResponseWriter, *http.Request) {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
sess := GetSession(r) sess := GetSession(r)
@ -154,12 +166,7 @@ func storeHandler(newColl, coll *mgo.Collection) func(http.ResponseWriter, *http
} }
title, _ := book["title"].(string) title, _ := book["title"].(string)
path := BOOKS_PATH + title[:1] + "/" + title + ".epub" path := ValidFileName(BOOKS_PATH + title[:1], title, ".epub")
_, err = os.Stat(path)
for i := 0; err == nil; i++ {
path := BOOKS_PATH + title[:1] + "/" + title + "_" + strconv.Itoa(i) + ".epub"
_, err = os.Stat(path)
}
oldPath, _ := book["path"].(string) oldPath, _ := book["path"].(string)
os.Mkdir(BOOKS_PATH+title[:1], os.ModePerm) os.Mkdir(BOOKS_PATH+title[:1], os.ModePerm)

18
upload.go
View file

@ -61,19 +61,15 @@ func cleanStr(str string) string {
} }
func storeImg(img []byte, title, extension string) (string, string) { func storeImg(img []byte, title, extension string) (string, string) {
name := title folder := COVER_PATH + title[:1]
folder := COVER_PATH + name[:1] + "/"
os.Mkdir(folder, os.ModePerm) os.Mkdir(folder, os.ModePerm)
imgPath := folder + name + extension imgPath := ValidFileName(folder, title, extension)
_, err := os.Stat(imgPath)
for i := 0; err == nil; i++ {
name = title + "_" + strconv.Itoa(i)
imgPath = folder + name + extension
_, err = os.Stat(imgPath)
}
/* store img on disk */ /* store img on disk */
file, _ := os.Create(imgPath) file, err := os.Create(imgPath)
if err != nil {
return "", ""
}
defer file.Close() defer file.Close()
file.Write(img) file.Write(img)
@ -81,7 +77,7 @@ func storeImg(img []byte, title, extension string) (string, string) {
resize := append(strings.Split(RESIZE_CMD, " "), imgPath, imgPath) resize := append(strings.Split(RESIZE_CMD, " "), imgPath, imgPath)
cmd := exec.Command(resize[0], resize[1:]...) cmd := exec.Command(resize[0], resize[1:]...)
cmd.Run() cmd.Run()
imgPathSmall := folder + name + "_small" + extension imgPathSmall := ValidFileName(folder, title, "_small" + extension)
resize = append(strings.Split(RESIZE_THUMB_CMD, " "), imgPath, imgPathSmall) resize = append(strings.Split(RESIZE_THUMB_CMD, " "), imgPath, imgPathSmall)
cmd = exec.Command(resize[0], resize[1:]...) cmd = exec.Command(resize[0], resize[1:]...)
cmd.Run() cmd.Run()