v 0.3.0, improved structure, minified main.go, moved logic to process.go

changelog.md

@@ -1,7 +1,9 @@
 ## PDFminion version history
 
-0.2.3   add --force flag to allow existing target directory
+0.3.0 better structure, minimal main package, moved logic to process.go
+0.2.5 fixed nasty bug in numbering
+0.2.3 add --force flag to allow existing target directory
 0.2.2
-0.2.1   add more command line flags, -h, -s
-0.2.0   re-structured packages, add command line flags -t
-0.1.0   minimal viable product, make it work.
+0.2.1 add more command line flags, -h, -s
+0.2.0 re-structured packages, add command line flags -t
+0.1.0 minimal viable product, make it work.

cmd/pdfminion/main.go

@@ -1,24 +1,13 @@
 package main
 
-/**
-minimal viable product version of PDFminion:
-* works in the currently active directory
-* no config parameters
-* numbers all PDFs present in directory
-
-*/
 import (
 	"fmt"
-	"log"
 	"os"
 	"pdfminion/internal/config"
 	"pdfminion/internal/pdf"
-	"sort"
 )
 
 func main() {
-
-	// TODO: simplify cfg handling -> put all flag handling (parsing, eval + error handling) in config package
 	cfg := config.New()
 	cfg.ParseFlags()
 
@@ -27,42 +16,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	// some technical stuff needs to be initialized before we can handle PDF files
-	pdf.InitializePDFInternals()
-
-	files, err := pdf.CollectCandidatePDFs(cfg)
-
-	// sort, validate, copy
-
-	// sort files alphabetically (as we cannot assume any sort order from `os.Glob)
-	// TODO: move sort to processFiles!!
-	sort.Slice(files, func(i, j int) bool {
-		return files[i] < files[j]
-	})
-
-	// ensure we process only valid PDFs
-	// * correct file format
-	// * at least one page
-	// TODO: handle zero-page PDFs
-	// TODO: validatePDFs should return error if error...
-	pdfFiles, nrOfValidPDFs := pdf.ValidatePDFs(files)
-
-	// copy all valid PDFs to target directory
-	// update pdfFiles slice to contain full path to target files
-	err = pdf.CopyValidatedPDFs(pdfFiles, cfg.SourceDir, cfg.TargetDir, cfg.Force)
-
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error during copy, aborting %v\n", err)
+	if err := pdf.ProcessPDFs(cfg); err != nil {
+		fmt.Fprintf(os.Stderr, "Error processing PDFs: %v\n", err)
 		os.Exit(1)
 	}
-
-	// TODO: log only in DEBUG mode
-	log.Printf("%v", pdfFiles)
-
-	// Evenify: add empty page to every file with even page count
-	pdf.Evenify(nrOfValidPDFs, pdfFiles)
-
-	// add page numbers
-	pdf.AddPageNumbersToAllFiles(nrOfValidPDFs, pdfFiles)
-
 }

internal/config/config.go

@@ -20,7 +20,7 @@ type Config struct {
 const (
 	defaultSourceDir = "_pdfs"
 	defaultTargetDir = "_target"
-	Version          = "0.2.5b"
+	Version          = "0.3.0"
 )
 
 const PageNrPrefix = ""

internal/pdf/process.go

@@ -0,0 +1,35 @@
+package pdf
+
+import (
+	"fmt"
+	"log"
+	"pdfminion/internal/config"
+	"sort"
+)
+
+func ProcessPDFs(cfg *config.Config) error {
+	InitializePDFInternals()
+
+	files, err := CollectCandidatePDFs(cfg)
+	if err != nil {
+		return fmt.Errorf("error collecting candidate PDFs: %w", err)
+	}
+
+	sort.Slice(files, func(i, j int) bool {
+		return files[i] < files[j]
+	})
+
+	pdfFiles, nrOfValidPDFs := ValidatePDFs(files)
+
+	err = CopyValidatedPDFs(pdfFiles, cfg.SourceDir, cfg.TargetDir, cfg.Force)
+	if err != nil {
+		return fmt.Errorf("error during copy: %w", err)
+	}
+
+	log.Printf("%v", pdfFiles)
+
+	Evenify(nrOfValidPDFs, pdfFiles)
+	AddPageNumbersToAllFiles(nrOfValidPDFs, pdfFiles)
+
+	return nil
+}