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

Fix cover getter

Browse source
This commit is contained in:
Las Zenow 2012-08-15 20:15:15 +02:00
parent 2e19245f39
commit a743177282
1 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
upload/upload.go
View file

@ -21,6 +21,13 @@ const (
RESIZE_THUMB = "/usr/bin/convert -resize 60 -quality 60 " RESIZE_THUMB = "/usr/bin/convert -resize 60 -quality 60 "
) )
func cleanStr(str string) string {
str = strings.Replace(str, "'", "'", -1)
exp, _ := regexp.Compile("[ ,]*$")
str = exp.ReplaceAllString(str, "")
return str
}
func resize(folder, name, extension string) (string, string) { func resize(folder, name, extension string) (string, string) {
imgPath := folder + name + extension imgPath := folder + name + extension
resize := append(strings.Split(RESIZE, " "), imgPath, imgPath) resize := append(strings.Split(RESIZE, " "), imgPath, imgPath)
@ -49,7 +56,7 @@ func getCover(e *epub.Epub, path string) (string, string) {
if n != 0 { if n != 0 {
return resize(folder, path, ".jpg") return resize(folder, path, ".jpg")
} }
defer os.Remove(imgPath) os.Remove(imgPath)
exp, _ := regexp.Compile("<img.*src=[\"']([^\"']*(\\.[^\\.\"']*))[\"']") exp, _ := regexp.Compile("<img.*src=[\"']([^\"']*(\\.[^\\.\"']*))[\"']")
it := e.Iterator(epub.EITERATOR_SPINE) it := e.Iterator(epub.EITERATOR_SPINE)
@ -62,6 +69,10 @@ func getCover(e *epub.Epub, path string) (string, string) {
if res != nil { if res != nil {
urlPart := strings.Split(it.CurrUrl(), "/") urlPart := strings.Split(it.CurrUrl(), "/")
url := strings.Join(urlPart[:len(urlPart)-1], "/") url := strings.Join(urlPart[:len(urlPart)-1], "/")
if res[1][:3] == "../" {
res[1] = res[1][3:]
url = strings.Join(urlPart[:len(urlPart)-2], "/")
}
if url == "" { if url == "" {
url = res[1] url = res[1]
} else { } else {
@ -75,8 +86,7 @@ func getCover(e *epub.Epub, path string) (string, string) {
if n != 0 { if n != 0 {
return resize(folder, path, res[2]) return resize(folder, path, res[2])
} }
panic(url) // FIXME os.Remove(imgPath)
defer os.Remove(imgPath)
} }
txt, err = it.Next() txt, err = it.Next()
} }
@ -90,13 +100,13 @@ func parseAuthr(creator []string) []string {
for _, s := range creator { for _, s := range creator {
auth := exp1.FindStringSubmatch(s) auth := exp1.FindStringSubmatch(s)
if auth != nil { if auth != nil {
res = append(res, strings.Join(auth[2:], ", ")) res = append(res, cleanStr(strings.Join(auth[2:], ", ")))
} else { } else {
auth := exp2.FindStringSubmatch(s) auth := exp2.FindStringSubmatch(s)
if auth != nil { if auth != nil {
res = append(res, auth[1]) res = append(res, cleanStr(auth[1]))
} else { } else {
res = append(res, s) res = append(res, cleanStr(s))
} }
} }
} }
@ -111,6 +121,13 @@ func parseSubject(subject []string) []string {
return res return res
} }
func parseDate(date []string) string {
if len(date) == 0 {
return ""
}
return strings.Replace(date[0], "Unspecified: ", "", -1)
}
func keywords(b Book) (k []string) { func keywords(b Book) (k []string) {
k = strings.Split(b.Title, " ") k = strings.Split(b.Title, " ")
for _, a := range b.Author { for _, a := range b.Author {
@ -131,13 +148,13 @@ func store(coll *mgo.Collection, path string) {
} }
defer e.Close() defer e.Close()
book.Title = strings.Join(e.Metadata(epub.EPUB_TITLE), ", ") book.Title = cleanStr(strings.Join(e.Metadata(epub.EPUB_TITLE), ", "))
book.Author = parseAuthr(e.Metadata(epub.EPUB_CREATOR)) book.Author = parseAuthr(e.Metadata(epub.EPUB_CREATOR))
book.Contributor = strings.Join(e.Metadata(epub.EPUB_CONTRIB), ", ") book.Contributor = cleanStr(strings.Join(e.Metadata(epub.EPUB_CONTRIB), ", "))
book.Publisher = strings.Join(e.Metadata(epub.EPUB_PUBLISHER), ", ") book.Publisher = cleanStr(strings.Join(e.Metadata(epub.EPUB_PUBLISHER), ", "))
book.Description = strings.Join(e.Metadata(epub.EPUB_DESCRIPTION), ", ") book.Description = strings.Join(e.Metadata(epub.EPUB_DESCRIPTION), ", ")
book.Subject = parseSubject(e.Metadata(epub.EPUB_SUBJECT)) book.Subject = parseSubject(e.Metadata(epub.EPUB_SUBJECT))
book.Date = strings.Join(e.Metadata(epub.EPUB_DATE), ", ") book.Date = parseDate(e.Metadata(epub.EPUB_DATE))
book.Lang = e.Metadata(epub.EPUB_LANG) book.Lang = e.Metadata(epub.EPUB_LANG)
book.Type = strings.Join(e.Metadata(epub.EPUB_TYPE), ", ") book.Type = strings.Join(e.Metadata(epub.EPUB_TYPE), ", ")
book.Format = strings.Join(e.Metadata(epub.EPUB_FORMAT), ", ") book.Format = strings.Join(e.Metadata(epub.EPUB_FORMAT), ", ")