summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--internal/pipeline/pipeline.go5
-rw-r--r--local.go1
2 files changed, 4 insertions, 2 deletions
diff --git a/internal/pipeline/pipeline.go b/internal/pipeline/pipeline.go
index 280e4d2..20400ad 100644
--- a/internal/pipeline/pipeline.go
+++ b/internal/pipeline/pipeline.go
@@ -269,6 +269,7 @@ func Analyse(conn Pipeliner) func(chan string, chan string, chan error, *log.Log
}
}
}
+ f.Close()
up <- fn
logger.Println("Creating best file listing the best file for each page")
@@ -282,6 +283,7 @@ func Analyse(conn Pipeliner) func(chan string, chan string, chan error, *log.Log
for _, conf := range bestconfs {
_, err = fmt.Fprintf(f, "%s\n", filepath.Base(conf.Path))
}
+ f.Close()
up <- fn
var pgs []string
@@ -461,8 +463,7 @@ func allOCRed(bookname string, conn Pipeliner) bool {
if preprocessedPattern.MatchString(png) {
atleastone = true
found := false
- b := strings.TrimSuffix(filepath.Base(png), ".png")
- hocrname := bookname + "/" + b + ".hocr"
+ hocrname := strings.TrimSuffix(png, ".png") + ".hocr"
for _, hocr := range objs {
if hocr == hocrname {
found = true
diff --git a/local.go b/local.go
index e5d9bef..e66f477 100644
--- a/local.go
+++ b/local.go
@@ -134,6 +134,7 @@ func prefixwalker(dirpath string, prefix string, list *[]ObjMeta) filepath.WalkF
}
n := strings.TrimPrefix(path, dirpath)
n = strings.TrimPrefix(n, "/")
+ n = strings.TrimPrefix(n, "\\")
o := ObjMeta{Name: n, Date: info.ModTime()}
*list = append(*list, o)
return nil