mirror of
https://github.com/Belphemur/CBZOptimizer.git
synced 2026-07-21 19:05:39 +02:00
- Use named returns for IsAlreadyConverted and WriteChapterToCBZ so errs.Capture defers propagate close errors to the caller. - Add context.Context to IsAlreadyConverted and ExtractChapter for cancellation/timeout support; thread it from Optimize. - Filter non-image files (__MACOSX, Thumbs.db, .DS_Store, etc.) and only extract supported image extensions in ExtractChapter. - Validate TempDir is non-empty in ConvertChapter before creating output dir. - Separate fatal conversion errors from PageIgnoredError in the WebP converter result aggregation so real failures aren't masked. - Fix error message "failed to load chapter" → "failed to extract chapter". - Use %w instead of %v in fmt.Errorf for proper error wrapping. - Fix LoadChapter doc comment to match its actual behavior. - Extract shared parseConvertedComment/parseConvertedCommentTime helpers to avoid duplicated zip-comment parsing logic. - Convert tests to use testify assertions (assert/require) per guidelines. Co-authored-by: Belphemur <197810+Belphemur@users.noreply.github.com>
118 lines
3.7 KiB
Go
118 lines
3.7 KiB
Go
package cbz
|
|
|
|
import (
|
|
"archive/zip"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"time"
|
|
|
|
"github.com/belphemur/CBZOptimizer/v2/internal/manga"
|
|
"github.com/belphemur/CBZOptimizer/v2/internal/utils/errs"
|
|
"github.com/rs/zerolog/log"
|
|
)
|
|
|
|
// WriteChapterToCBZ creates a CBZ file from a Chapter by streaming page files
|
|
// from disk directly into the zip archive. No image data is held in memory.
|
|
func WriteChapterToCBZ(chapter *manga.Chapter, outputFilePath string) (err error) {
|
|
log.Debug().
|
|
Str("chapter_file", chapter.FilePath).
|
|
Str("output_path", outputFilePath).
|
|
Int("page_count", len(chapter.Pages)).
|
|
Bool("is_converted", chapter.IsConverted).
|
|
Msg("Starting CBZ file creation")
|
|
|
|
// Create output file
|
|
zipFile, err := os.Create(outputFilePath)
|
|
if err != nil {
|
|
log.Error().Str("output_path", outputFilePath).Err(err).Msg("Failed to create CBZ file")
|
|
return fmt.Errorf("failed to create .cbz file: %w", err)
|
|
}
|
|
defer errs.Capture(&err, zipFile.Close, "failed to close .cbz file")
|
|
|
|
// Create ZIP writer
|
|
zipWriter := zip.NewWriter(zipFile)
|
|
defer errs.Capture(&err, zipWriter.Close, "failed to close .cbz writer")
|
|
|
|
// Write each page to the archive by streaming from disk
|
|
for _, page := range chapter.Pages {
|
|
var fileName string
|
|
if page.IsSplitted {
|
|
fileName = fmt.Sprintf("%04d-%02d%s", page.Index, page.SplitPartIndex, page.Extension)
|
|
} else {
|
|
fileName = fmt.Sprintf("%04d%s", page.Index, page.Extension)
|
|
}
|
|
|
|
log.Debug().
|
|
Str("output_path", outputFilePath).
|
|
Uint16("page_index", page.Index).
|
|
Str("filename", fileName).
|
|
Str("source", page.FilePath).
|
|
Msg("Writing page to CBZ archive")
|
|
|
|
// Create file entry in the zip (Store method = no compression, images are already compressed)
|
|
fileWriter, err := zipWriter.CreateHeader(&zip.FileHeader{
|
|
Name: fileName,
|
|
Method: zip.Store,
|
|
Modified: time.Now(),
|
|
})
|
|
if err != nil {
|
|
log.Error().Str("filename", fileName).Err(err).Msg("Failed to create file in CBZ archive")
|
|
return fmt.Errorf("failed to create file in .cbz: %w", err)
|
|
}
|
|
|
|
// Stream the page file from disk into the archive
|
|
pageFile, err := os.Open(page.FilePath)
|
|
if err != nil {
|
|
log.Error().Str("filename", fileName).Str("source", page.FilePath).Err(err).Msg("Failed to open page file")
|
|
return fmt.Errorf("failed to open page file: %w", err)
|
|
}
|
|
|
|
bytesWritten, err := io.Copy(fileWriter, pageFile)
|
|
closeErr := pageFile.Close()
|
|
if err != nil {
|
|
log.Error().Str("filename", fileName).Err(err).Msg("Failed to write page contents")
|
|
return fmt.Errorf("failed to write page contents: %w", err)
|
|
}
|
|
if closeErr != nil {
|
|
log.Error().Str("filename", fileName).Err(closeErr).Msg("Failed to close page file")
|
|
return fmt.Errorf("failed to close page file: %w", closeErr)
|
|
}
|
|
|
|
log.Debug().
|
|
Str("filename", fileName).
|
|
Int64("bytes_written", bytesWritten).
|
|
Msg("Page written successfully")
|
|
}
|
|
|
|
// Write ComicInfo.xml if present
|
|
if chapter.ComicInfoXml != "" {
|
|
log.Debug().Str("output_path", outputFilePath).Msg("Writing ComicInfo.xml")
|
|
comicInfoWriter, err := zipWriter.CreateHeader(&zip.FileHeader{
|
|
Name: "ComicInfo.xml",
|
|
Method: zip.Deflate,
|
|
Modified: time.Now(),
|
|
})
|
|
if err != nil {
|
|
return fmt.Errorf("failed to create ComicInfo.xml in .cbz: %w", err)
|
|
}
|
|
|
|
_, err = comicInfoWriter.Write([]byte(chapter.ComicInfoXml))
|
|
if err != nil {
|
|
return fmt.Errorf("failed to write ComicInfo.xml: %w", err)
|
|
}
|
|
}
|
|
|
|
// Set zip comment for converted chapters
|
|
if chapter.IsConverted {
|
|
comment := fmt.Sprintf("%s\nThis chapter has been converted by CBZOptimizer.", chapter.ConvertedTime)
|
|
err = zipWriter.SetComment(comment)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to write comment: %w", err)
|
|
}
|
|
}
|
|
|
|
log.Debug().Str("output_path", outputFilePath).Msg("CBZ file creation completed")
|
|
return nil
|
|
}
|