From de95e6bebb1ecaa3d12bb652d952f238ebe7d645 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Fri, 3 Nov 2023 19:25:26 -0700 Subject: [PATCH] Bugfixes --- media.go | 4 ++-- regexp.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/media.go b/media.go index 34468a8..3c09fd1 100644 --- a/media.go +++ b/media.go @@ -95,7 +95,7 @@ type Page struct { } func (self *Page) export(dir string, config ExportConfig) error { - name, err := buildTemplatedName(config.PageTemplate, self.Node.Name, self.Index+1, len(self.Volume.Pages)-1) + name, err := buildTemplatedName(config.PageTemplate, self.Node.Name, self.Index+1, len(self.Volume.Pages)) if err != nil { return err } @@ -118,7 +118,7 @@ type Volume struct { } func (self *Volume) export(path string, config ExportConfig, allocator *TempDirAllocator) error { - name, err := buildTemplatedName(config.VolumeTemplate, stripExt(self.Node.Name), self.Index, self.Book.VolumeCount-1) + name, err := buildTemplatedName(config.VolumeTemplate, stripExt(self.Node.Name), self.Index, self.Book.VolumeCount) if err != nil { return err } diff --git a/regexp.txt b/regexp.txt index 180a748..9a3efee 100644 --- a/regexp.txt +++ b/regexp.txt @@ -1,3 +1,3 @@ 第\s*(\d+)\s*巻 (?i)vo?l?u?m?e?[.\s]*(\d+) -`(\d+)\D*$` +(\d+)\D*$