Skip to content

cmd/seriesmeta: Add Unicode normalization for book IDs #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arturdryomov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cmd/seriesmeta: Add Unicode normalization for book IDs #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cmd/seriesmeta/seriesmeta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
_ "github.com/mattn/go-sqlite3"
"github.com/pgaskin/koboutils/v2/kobo"
"github.com/spf13/pflag"
"golang.org/x/text/unicode/norm"
)

var version = "dev"
Expand Down Expand Up @@ -301,7 +302,9 @@ func (k *Kobo) UpdateSeries(log func(filename string, i, total int, series strin

if _, err := tx.Exec(
"INSERT OR REPLACE INTO _seriesmeta (ImageId, Series, SeriesNumber) VALUES (?, ?, ?)",
kobo.ContentIDToImageID(kobo.PathToContentID(relEpub)),
// Normalize the ID to NFC since Kobo runs Linux, meaning database entries use NFC as well.
// Helps with Unicode file names since without this SQLite cannot match values as expected.
norm.NFC.String(kobo.ContentIDToImageID(kobo.PathToContentID(relEpub))),
sql.NullString{String: series, Valid: len(series) > 0},
sql.NullString{String: strconv.FormatFloat(index, 'f', -1, 64), Valid: index > 0},
); err != nil {
Expand Down