Fix inside file name for normal saving into merged cbz

arimatakao · Jun 19, 2024 · 11c08e9 · 11c08e9
1 parent 52aaa9a
commit 11c08e9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/cmd/download.go b/cmd/download.go
@@ -320,9 +320,7 @@ func downloadProcess(
 
 		pageIndex := i + 1
 
-		insideFilename := fmt.Sprintf("vol%s_ch%s_%d.%s",
-			chapter.Volume(),
-			strings.ReplaceAll(chapter.Number(), ".", "_"),
+		insideFilename := fmt.Sprintf("%d.%s",
 			pageIndex,
 			imgExt)
 		if pageIndex < 10 {

diff --git a/filekit/cbz.go b/filekit/cbz.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"encoding/xml"
+	"fmt"
 	"io"
 	"os"
 	"path/filepath"
@@ -14,8 +15,9 @@ import (
 )
 
 type cbzArchive struct {
-	buf    *bytes.Buffer
-	writer *zip.Writer
+	buf         *bytes.Buffer
+	writer      *zip.Writer
+	pageCounter int
 }
 
 // fileName without extension
@@ -25,8 +27,9 @@ func newCBZArchive() (*cbzArchive, error) {
 	zipWriter := zip.NewWriter(buf)
 
 	c := cbzArchive{
-		buf:    buf,
-		writer: zipWriter,
+		buf:         buf,
+		writer:      zipWriter,
+		pageCounter: 1,
 	}
 
 	return &c, nil
@@ -80,6 +83,7 @@ func (c *cbzArchive) WriteOnDiskAndClose(outputDir, outputFileName string,
 }
 
 func (c *cbzArchive) AddFile(fileName string, src []byte) error {
+	fileName = fmt.Sprintf("%d_%s", c.pageCounter, fileName)
 	buf := bytes.NewBuffer(src)
 	w, err := c.writer.Create(fileName)
 	if err != nil {
@@ -88,5 +92,6 @@ func (c *cbzArchive) AddFile(fileName string, src []byte) error {
 	if _, err := io.Copy(w, buf); err != nil {
 		return err
 	}
+	c.pageCounter++
 	return nil
 }