feat(interval) : finish command interval

refacto(utils) : move image processing from `utils/utils.go` to `utils/image.go`

Author: LordPax

CHANGELOG.md

@@ -7,6 +7,10 @@
 * Add log system
 * Add command interval
 
+### Changed
+
+* move image processing from `utils/utils.go` to `utils/image.go`
+
 ## [1.1.0] - 2024-04-21
 
 ### Added

README.md

@@ -14,13 +14,7 @@ Golang adaptation of [scan-to-epub](https://github.com/LordPax/scan-to-epub.git)
 http://www.example.com/{chap}/{page}.{png|jpg|jpeg|webp}
 ```
 
-<!--
-## Pre-requis
-
-* Converts .webp files to other image formats and vice versa [libwebp-1.1.0](https://developers.google.com/speed/webp/docs/compiling)
--->
-
-## Installation
+## Build and install
 
 1. Clone the repository:
 

commands/interval.go

@@ -2,6 +2,7 @@ package commands
 
 import (
 	"fmt"
+	"scan2epub/service"
 	"scan2epub/utils"
 
 	cli "github.com/urfave/cli/v2"
@@ -10,22 +11,22 @@ import (
 var IntervalCommand = cli.Command{
 	Name:      "inter",
 	Usage:     "Convert at regular intervals and increment the chapter number",
-	ArgsUsage: "<interval> <chap>",
+	ArgsUsage: "<cron> <chap>",
 	Aliases:   []string{"i"},
 	Action:    intervalAction,
 }
 
 func intervalAction(c *cli.Context) error {
-	log, err := utils.GetLog()
-	if err != nil {
-		return err
-	}
-
 	if c.NArg() < 2 {
-		return fmt.Errorf("no chapter specified")
+		return fmt.Errorf("no chapter or cron specified")
 	}
 
-	log.Printf("Converting %d chapters\n", c.NArg())
+	cronStr := c.Args().Get(0)
+	chap := c.Args().Get(1)
+
+	if err := service.CronDownloadChap(cronStr, chap); err != nil {
+		return err
+	}
 
 	if err := utils.RmTmpDir(); err != nil {
 		return err

go.mod

@@ -3,6 +3,7 @@ module scan2epub
 go 1.22.2
 
 require (
+	github.com/go-co-op/gocron/v2 v2.5.0
 	github.com/go-shiori/go-epub v1.2.1
 	github.com/joho/godotenv v1.5.1
 	github.com/urfave/cli/v2 v2.27.1
@@ -13,8 +14,12 @@ require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gofrs/uuid/v5 v5.0.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/jonboulle/clockwork v0.4.0 // indirect
+	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/vincent-petithory/dataurl v1.0.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
 	golang.org/x/net v0.19.0 // indirect
 )

go.sum

@@ -1,22 +1,42 @@
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
 github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
+github.com/go-co-op/gocron/v2 v2.5.0 h1:ff/TJX9GdTJBDL1il9cyd/Sj3WnS+BB7ZzwHKSNL5p8=
+github.com/go-co-op/gocron/v2 v2.5.0/go.mod h1:ckPQw96ZuZLRUGu88vVpd9a6d9HakI14KWahFZtGvNw=
 github.com/go-shiori/go-epub v1.2.1 h1:+K/WxrvmfFQY69cpryiObrT6X7WhkwpqhHY65AHs2Rg=
 github.com/go-shiori/go-epub v1.2.1/go.mod h1:3rCTODnigEgy2j3ksndClrGT9h/dcz3js9q4yPX7hf8=
 github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M=
 github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4=
+github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
 github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
 github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI=
 github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY=
+golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
 golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
 golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
 golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

service/scanToEpub.go

@@ -3,6 +3,9 @@ package service
 import (
 	"os"
 	"scan2epub/utils"
+	"strconv"
+
+	cron "github.com/go-co-op/gocron/v2"
 )
 
 func Scan2Epub(chaps []string) error {
@@ -31,3 +34,60 @@ func CheckChapExist(chap string) bool {
 
 	return workingUrl != ""
 }
+
+func CronDownloadChap(cronStr, chap string) error {
+	c, err := cron.NewScheduler()
+	if err != nil {
+		return err
+	}
+
+	currentChap, err := strconv.Atoi(chap)
+	if err != nil {
+		return err
+	}
+
+	chanErr := make(chan error)
+
+	_, err = c.NewJob(
+		cron.CronJob(cronStr, false),
+		cron.NewTask(func() { cronFunc(&currentChap, chanErr) }),
+	)
+	if err != nil {
+		return err
+	}
+
+	c.Start()
+
+	if err := <-chanErr; err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func cronFunc(currentChap *int, ch chan<- error) {
+	log, err := utils.GetLog()
+	if err != nil {
+		ch <- err
+		return
+	}
+
+	log.Printf("Current chapter %d\n", *currentChap)
+	if !CheckChapExist(strconv.Itoa(*currentChap)) {
+		log.PrintfErr("Chapter %d not found\n", currentChap)
+		return
+	}
+
+	if err := downloadChap(strconv.Itoa(*currentChap)); err != nil {
+		ch <- err
+		return
+	}
+
+	if err := convertChap(strconv.Itoa(*currentChap)); err != nil {
+		ch <- err
+		return
+	}
+
+	*currentChap++
+	log.Printf("Next chapter %d\n", *currentChap)
+}

utils/image.go

@@ -0,0 +1,73 @@
+package utils
+
+import (
+	"fmt"
+	"image"
+	"image/jpeg"
+	"image/png"
+	"os"
+	"path"
+
+	"golang.org/x/image/webp"
+)
+
+// Returns the dimensions of an image
+func DimensionsImage(img image.Image) (int, int) {
+	return img.Bounds().Dx(), img.Bounds().Dy()
+}
+
+// Decodes an image from a file
+func DecodeImage(file string) (image.Image, string, error) {
+	f, err := os.Open(file)
+	if err != nil {
+		return nil, "", err
+	}
+	defer f.Close()
+
+	if ext := path.Ext(file); ext == ".webp" {
+		img, err := webp.Decode(f)
+		if err != nil {
+			return nil, "", err
+		}
+		return img, "webp", nil
+	}
+
+	img, format, err := image.Decode(f)
+	if err != nil {
+		return nil, "", err
+	}
+
+	return img, format, nil
+}
+
+// Rotates an image 90 degrees
+func RotateImage(img image.Image) *image.NRGBA {
+	width, height := DimensionsImage(img)
+
+	rotated := image.NewNRGBA(image.Rect(0, 0, height, width))
+	for x := 0; x < width; x++ {
+		for y := 0; y < height; y++ {
+			rotated.Set(height-y-1, x, img.At(x, y))
+		}
+	}
+
+	return rotated
+}
+
+// Encodes an image to a file
+func EncodeImage(file string, img image.Image, format string) error {
+	f, err := os.Create(file)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	switch format {
+	case "jpeg", "jpg":
+		return jpeg.Encode(f, img, nil)
+	case "png":
+		return png.Encode(f, img)
+	}
+
+	return fmt.Errorf("Unsupported format %s", format)
+}

utils/utils.go

@@ -1,14 +1,7 @@
 package utils
 
 import (
-	"fmt"
-	"image"
-	"image/jpeg"
-	"image/png"
 	"os"
-	"path"
-
-	"golang.org/x/image/webp"
 )
 
 func FileExist(file string) bool {
@@ -19,64 +12,3 @@ func FileExist(file string) bool {
 func RmTmpDir() error {
 	return os.RemoveAll(os.Getenv("TMP_DIR"))
 }
-
-// Returns the dimensions of an image
-func DimensionsImage(img image.Image) (int, int) {
-	return img.Bounds().Dx(), img.Bounds().Dy()
-}
-
-// Decodes an image from a file
-func DecodeImage(file string) (image.Image, string, error) {
-	f, err := os.Open(file)
-	if err != nil {
-		return nil, "", err
-	}
-	defer f.Close()
-
-	if ext := path.Ext(file); ext == ".webp" {
-		img, err := webp.Decode(f)
-		if err != nil {
-			return nil, "", err
-		}
-		return img, "webp", nil
-	}
-
-	img, format, err := image.Decode(f)
-	if err != nil {
-		return nil, "", err
-	}
-
-	return img, format, nil
-}
-
-// Rotates an image 90 degrees
-func RotateImage(img image.Image) *image.NRGBA {
-	width, height := DimensionsImage(img)
-
-	rotated := image.NewNRGBA(image.Rect(0, 0, height, width))
-	for x := 0; x < width; x++ {
-		for y := 0; y < height; y++ {
-			rotated.Set(height-y-1, x, img.At(x, y))
-		}
-	}
-
-	return rotated
-}
-
-// Encodes an image to a file
-func EncodeImage(file string, img image.Image, format string) error {
-	f, err := os.Create(file)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	switch format {
-	case "jpeg", "jpg":
-		return jpeg.Encode(f, img, nil)
-	case "png":
-		return png.Encode(f, img)
-	}
-
-	return fmt.Errorf("Unsupported format %s", format)
-}