4229c179b0
Two intertwined changes — the rebrand and the novel library were developed on
the same branch because the novel UI plumbing is part of the new "Bookmark
Manager" wordmark in the web shell.
## What it does
- **Rebrand**: MangaBM → BookmarkManager across the Go module, compose stack,
env vars, Traefik hostnames, container/image names, userscript storage
prefixes (`mangabm:cache` → `bmgr:manga:cache`, `mangabm:queue` → `bmgr:manga:queue`),
and docs.
- **Novel library**: same backend, two libraries. New `kind` column splits
bookmarks into `manga` / `novel`; PUT validates it. Two userscripts:
- `manga-bookmark.user.js` — unchanged behaviour, just stamps its own `kind`.
- `novel-bookmark.user.js` — separate Violentmonkey install with adapters
for **novelfull.com** (polled via headless browser — Cloudflare JS
challenge) and **lightnovelworld.net** (polled via plain TLS).
- **Web UI**: library switch on the app shell. Login art, libswitch, and
novel-site colours from the Cinder design snapshot.
## Plumbing
- `addedColumns` ALTER for `kind` runs on first start after upgrade; every
pre-existing row is backfilled to `'manga'`. No manual SQL, no down-time.
- `ALLOWED_ORIGINS` gains the two novel sites.
- New `NOVEL_USERSCRIPT_PATH` env (default `/userscript/novel-bookmark.user.js`),
bindmounted alongside the manga script.
- Traefik router names `mangabm*` → `bmapi*` / `bmweb*`.
## Test status
- `go test ./...` — green
- `node --test userscript/test/logic.test.js` — 34 pass
- `node --test userscript/test/novel-logic.test.js` — 11 pass
- `node --check` on both userscripts — clean
## Notes for the redeploy
.env keys were renamed (`MANGA_API_HOST` → `BOOKMARK_API_HOST`,
`MANGA_WEB_HOST` → `BOOKMARK_WEB_HOST`). Update DNS / Traefik labels on the
prod override before pulling, otherwise the public hostnames go dark.
See the redeploy instructions I'll post next to this PR.
Reviewed-on: #15
Co-authored-by: Sulthan Zaki <sultankiki05@gmail.com>
Co-committed-by: Sulthan Zaki <sultankiki05@gmail.com>
526 lines
19 KiB
Go
526 lines
19 KiB
Go
package store
|
|
|
|
import (
|
|
"database/sql"
|
|
"errors"
|
|
"fmt"
|
|
"regexp"
|
|
"strconv"
|
|
"strings"
|
|
|
|
_ "modernc.org/sqlite"
|
|
)
|
|
|
|
// Bookmark is one tracked series, keyed "<site>:<series_id>" across both sites.
|
|
//
|
|
// LastChapter* is the user's read progress; LatestChapter* is the newest
|
|
// chapter the site has published, captured opportunistically by the userscript.
|
|
type Bookmark struct {
|
|
Key string `json:"key"`
|
|
Site string `json:"site"`
|
|
SeriesID string `json:"series_id"`
|
|
Title string `json:"title"`
|
|
SeriesURL string `json:"series_url"`
|
|
Cover string `json:"cover"`
|
|
LastChapter string `json:"last_chapter"`
|
|
LastChapterNum float64 `json:"last_chapter_num"`
|
|
LastChapterURL string `json:"last_chapter_url"`
|
|
Favorite bool `json:"favorite"`
|
|
LatestChapter string `json:"latest_chapter"`
|
|
LatestChapterNum *float64 `json:"latest_chapter_num"` // nil until first captured
|
|
UpdatedAt int64 `json:"updated_at"` // unix ms; see Upsert
|
|
// Status is the lifecycle bucket: reading, archived, or finished.
|
|
// Archived series stay polled for new chapters; finished ones do not.
|
|
// Empty on the way in means "no opinion" — see Upsert.
|
|
Status string `json:"status"`
|
|
// Kind is the library bucket: manga or novel. Empty on the way in means
|
|
// "no opinion" — see Upsert.
|
|
Kind string `json:"kind"`
|
|
}
|
|
|
|
// HasNewChapter reports whether the site has published past the read point.
|
|
// A nil LatestChapterNum means nothing has been captured yet, which is not the
|
|
// same as "nothing new".
|
|
func (b Bookmark) HasNewChapter() bool {
|
|
return b.LatestChapterNum != nil && *b.LatestChapterNum > b.LastChapterNum
|
|
}
|
|
|
|
// chapterLeadIn matches the prefix the userscript and the poller both write
|
|
// ("Chapter 250"), so the UI can add exactly one "Ch " of its own instead of
|
|
// doubling it. A manual edit through the web UI stores a bare "250", which is
|
|
// the same string minus the lead-in.
|
|
var chapterLeadIn = regexp.MustCompile(`(?i)^\s*(?:chapter|ch\.?)\s*`)
|
|
|
|
func displayChapter(raw string, num float64) string {
|
|
rest := strings.TrimSpace(chapterLeadIn.ReplaceAllString(raw, ""))
|
|
if rest == "" {
|
|
rest = strconv.FormatFloat(num, 'f', -1, 64)
|
|
}
|
|
// "Ch " only makes sense in front of a number; anything else is a label the
|
|
// site gave us, so pass it through as written.
|
|
if rest[0] < '0' || rest[0] > '9' {
|
|
return rest
|
|
}
|
|
return "Ch " + rest
|
|
}
|
|
|
|
// DisplayChapter is the read-progress line: one canonical "Ch N" whatever
|
|
// format the write came in as.
|
|
func (b Bookmark) DisplayChapter() string {
|
|
return displayChapter(b.LastChapter, b.LastChapterNum)
|
|
}
|
|
|
|
// DisplayLatest is the same for the newest published chapter, which arrives
|
|
// with the same "Chapter N" lead-in from both the userscript and the poller.
|
|
func (b Bookmark) DisplayLatest() string {
|
|
var num float64
|
|
if b.LatestChapterNum != nil {
|
|
num = *b.LatestChapterNum
|
|
}
|
|
return displayChapter(b.LatestChapter, num)
|
|
}
|
|
|
|
// ContinueURL is where the Continue button points: the chapter last read, or
|
|
// the series page when no chapter URL was ever captured.
|
|
func (b Bookmark) ContinueURL() string {
|
|
if b.LastChapterURL != "" {
|
|
return b.LastChapterURL
|
|
}
|
|
return b.SeriesURL
|
|
}
|
|
|
|
// Initial is the monogram the web UI shows in place of a cover when the
|
|
// source site never gave us an og:image. First rune, uppercased; "?" when even
|
|
// the title is missing, so the slot is never empty.
|
|
func (b Bookmark) Initial() string {
|
|
for _, r := range b.Title {
|
|
return strings.ToUpper(string(r))
|
|
}
|
|
return "?"
|
|
}
|
|
|
|
// Library buckets. A bookmark is in exactly one. This cannot be derived from
|
|
// Site: asurascans serves manga and novels from the same /comics/ path, so the
|
|
// userscript that recorded the page is the only party that knows which.
|
|
const (
|
|
KindManga = "manga"
|
|
KindNovel = "novel"
|
|
)
|
|
|
|
// Lifecycle buckets. A bookmark is in exactly one; favorite is orthogonal.
|
|
const (
|
|
StatusReading = "reading"
|
|
StatusArchived = "archived"
|
|
StatusFinished = "finished"
|
|
)
|
|
|
|
const schema = `
|
|
CREATE TABLE IF NOT EXISTS bookmarks (
|
|
key TEXT PRIMARY KEY,
|
|
site TEXT NOT NULL,
|
|
series_id TEXT NOT NULL,
|
|
title TEXT,
|
|
series_url TEXT,
|
|
cover TEXT,
|
|
last_chapter TEXT,
|
|
last_chapter_num REAL,
|
|
last_chapter_url TEXT,
|
|
favorite INTEGER NOT NULL DEFAULT 0,
|
|
latest_chapter TEXT NOT NULL DEFAULT '',
|
|
latest_chapter_num REAL,
|
|
latest_checked_at INTEGER NOT NULL DEFAULT 0,
|
|
status TEXT NOT NULL DEFAULT 'reading',
|
|
kind TEXT NOT NULL DEFAULT 'manga',
|
|
updated_at INTEGER NOT NULL
|
|
);`
|
|
|
|
// The columns above that databases created before them will be missing.
|
|
// SQLite has no ADD COLUMN IF NOT EXISTS, so each is added only when absent.
|
|
var addedColumns = []struct{ name, ddl string }{
|
|
{"favorite", `ALTER TABLE bookmarks ADD COLUMN favorite INTEGER NOT NULL DEFAULT 0`},
|
|
{"latest_chapter", `ALTER TABLE bookmarks ADD COLUMN latest_chapter TEXT NOT NULL DEFAULT ''`},
|
|
{"latest_chapter_num", `ALTER TABLE bookmarks ADD COLUMN latest_chapter_num REAL`},
|
|
// When the server last looked at this series, unix ms; 0 means never, and
|
|
// sorts first so a new bookmark is picked up on the next tick with no
|
|
// special case. Deliberately NOT in bookmarkColumns — see MarkLatestChecked.
|
|
{"latest_checked_at", `ALTER TABLE bookmarks ADD COLUMN latest_checked_at INTEGER NOT NULL DEFAULT 0`},
|
|
// Lifecycle bucket. The DEFAULT backfills every pre-existing row as
|
|
// 'reading', so there is no separate migration step.
|
|
{"status", `ALTER TABLE bookmarks ADD COLUMN status TEXT NOT NULL DEFAULT 'reading'`},
|
|
// Library bucket. The DEFAULT backfills every pre-existing row as 'manga',
|
|
// which is what every row written before novels existed actually is.
|
|
{"kind", `ALTER TABLE bookmarks ADD COLUMN kind TEXT NOT NULL DEFAULT 'manga'`},
|
|
}
|
|
|
|
const bookmarkColumns = `key, site, series_id, title, series_url, cover,
|
|
last_chapter, last_chapter_num, last_chapter_url,
|
|
favorite, latest_chapter, latest_chapter_num, updated_at, status, kind`
|
|
|
|
// Store is the SQLite-backed bookmark store.
|
|
type Store struct {
|
|
db *sql.DB
|
|
}
|
|
|
|
// OpenStore opens (or creates) the SQLite database at path and applies the schema.
|
|
func Open(path string) (*Store, error) {
|
|
// busy_timeout guards against SQLITE_BUSY under the reverse proxy's
|
|
// concurrent requests; a single writer connection keeps writes serialized.
|
|
dsn := path
|
|
if !strings.Contains(dsn, "?") {
|
|
dsn += "?_pragma=busy_timeout(5000)&_pragma=journal_mode(WAL)"
|
|
}
|
|
db, err := sql.Open("sqlite", dsn)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("open sqlite %q: %w", path, err)
|
|
}
|
|
db.SetMaxOpenConns(1)
|
|
if _, err := db.Exec(schema); err != nil {
|
|
db.Close()
|
|
return nil, fmt.Errorf("apply schema: %w", err)
|
|
}
|
|
if err := migrateColumns(db); err != nil {
|
|
db.Close()
|
|
return nil, fmt.Errorf("migrate schema: %w", err)
|
|
}
|
|
if err := migrateAsuraKeys(db); err != nil {
|
|
db.Close()
|
|
return nil, fmt.Errorf("migrate asura keys: %w", err)
|
|
}
|
|
return &Store{db: db}, nil
|
|
}
|
|
|
|
// migrateColumns brings a pre-existing bookmarks table up to the current
|
|
// schema. Safe to run on every start: columns already present are skipped.
|
|
func migrateColumns(db *sql.DB) error {
|
|
have, err := existingColumns(db, "bookmarks")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
for _, c := range addedColumns {
|
|
if _, ok := have[c.name]; ok {
|
|
continue
|
|
}
|
|
if _, err := db.Exec(c.ddl); err != nil {
|
|
return fmt.Errorf("add column %q: %w", c.name, err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// AsuraBuildHash matches the trailing "-xxxxxxxx" site-wide build ID Asura
|
|
// appends to every series slug. It rotates on each site redeploy, so it
|
|
// must not be part of series_id. Must stay in sync with stripBuildHash in
|
|
// userscript/manga-bookmark.user.js.
|
|
var AsuraBuildHash = regexp.MustCompile(`-[0-9a-f]{8}$`)
|
|
|
|
// migrateAsuraKeys rewrites asura bookmarks whose series_id still carries
|
|
// the build hash to the stable, hashless ID. Rows keyed with a hash are
|
|
// orphaned on every Asura redeploy (old-hash URLs 302 to new-hash ones, so
|
|
// detection yields a key that never matches). When two hash-generations of
|
|
// one series collide, the row with the newest updated_at wins and the rest
|
|
// are deleted. Idempotent: hashless IDs never match the regex.
|
|
func migrateAsuraKeys(db *sql.DB) error {
|
|
rows, err := db.Query(`SELECT key, series_id, updated_at FROM bookmarks WHERE site = 'asura'`)
|
|
if err != nil {
|
|
return fmt.Errorf("list asura rows: %w", err)
|
|
}
|
|
type row struct {
|
|
key, id string
|
|
updated int64
|
|
}
|
|
var all []row
|
|
for rows.Next() {
|
|
var r row
|
|
if err := rows.Scan(&r.key, &r.id, &r.updated); err != nil {
|
|
rows.Close()
|
|
return fmt.Errorf("scan asura row: %w", err)
|
|
}
|
|
all = append(all, r)
|
|
}
|
|
if err := rows.Close(); err != nil {
|
|
return err
|
|
}
|
|
|
|
groups := map[string][]row{}
|
|
for _, r := range all {
|
|
stripped := AsuraBuildHash.ReplaceAllString(r.id, "")
|
|
groups[stripped] = append(groups[stripped], r)
|
|
}
|
|
for stripped, g := range groups {
|
|
winner := 0
|
|
for i := range g {
|
|
if g[i].updated > g[winner].updated {
|
|
winner = i
|
|
}
|
|
}
|
|
// Losers go first: rewriting the winner to the stripped key while a
|
|
// pre-existing hashless row still holds it is a primary-key collision.
|
|
for i, r := range g {
|
|
if i == winner {
|
|
continue
|
|
}
|
|
if _, err := db.Exec(`DELETE FROM bookmarks WHERE key = ?`, r.key); err != nil {
|
|
return fmt.Errorf("drop duplicate %q: %w", r.key, err)
|
|
}
|
|
}
|
|
if r := g[winner]; r.id != stripped {
|
|
if _, err := db.Exec(
|
|
`UPDATE bookmarks SET key = ?, series_id = ? WHERE key = ?`,
|
|
"asura:"+stripped, stripped, r.key); err != nil {
|
|
return fmt.Errorf("rewrite key %q: %w", r.key, err)
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func existingColumns(db *sql.DB, table string) (map[string]struct{}, error) {
|
|
rows, err := db.Query(`SELECT name FROM pragma_table_info(?)`, table)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("read %s columns: %w", table, err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
out := map[string]struct{}{}
|
|
for rows.Next() {
|
|
var name string
|
|
if err := rows.Scan(&name); err != nil {
|
|
return nil, fmt.Errorf("scan column name: %w", err)
|
|
}
|
|
out[name] = struct{}{}
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
// scanBookmark reads one row in bookmarkColumns order, translating SQLite's
|
|
// integer bool and nullable latest_chapter_num into Go types.
|
|
//
|
|
// The optional columns are read through Null* types because rows predating
|
|
// this code (or written by hand) may hold NULL where the app only ever writes
|
|
// zero values. Only latest_chapter_num distinguishes the two: everywhere else
|
|
// NULL and the zero value mean the same thing to clients.
|
|
func scanBookmark(scan func(...any) error) (Bookmark, error) {
|
|
var (
|
|
b Bookmark
|
|
title, seriesURL, cover sql.NullString
|
|
lastChapter, lastChapterURL, latestChapter sql.NullString
|
|
status sql.NullString
|
|
lastChapterNum, latestChapterNum sql.NullFloat64
|
|
favorite sql.NullInt64
|
|
)
|
|
if err := scan(
|
|
&b.Key, &b.Site, &b.SeriesID, &title, &seriesURL, &cover,
|
|
&lastChapter, &lastChapterNum, &lastChapterURL,
|
|
&favorite, &latestChapter, &latestChapterNum, &b.UpdatedAt, &status, &b.Kind,
|
|
); err != nil {
|
|
return Bookmark{}, err
|
|
}
|
|
b.Title = title.String
|
|
b.SeriesURL = seriesURL.String
|
|
b.Cover = cover.String
|
|
b.LastChapter = lastChapter.String
|
|
b.LastChapterNum = lastChapterNum.Float64
|
|
b.LastChapterURL = lastChapterURL.String
|
|
b.Favorite = favorite.Int64 != 0
|
|
b.LatestChapter = latestChapter.String
|
|
if latestChapterNum.Valid {
|
|
b.LatestChapterNum = &latestChapterNum.Float64
|
|
}
|
|
// A NULL, empty, or unrecognised bucket (e.g. a hand-edited row) would
|
|
// leave the row in no list at all, so anything outside the three known
|
|
// buckets reads as the default rather than being passed through.
|
|
b.Status = status.String
|
|
if b.Status != StatusReading && b.Status != StatusArchived && b.Status != StatusFinished {
|
|
b.Status = StatusReading
|
|
}
|
|
return b, nil
|
|
}
|
|
|
|
// Close releases the underlying database handle.
|
|
func (s *Store) Close() error { return s.db.Close() }
|
|
|
|
// List returns every bookmark, newest activity first.
|
|
func (s *Store) List() ([]Bookmark, error) {
|
|
rows, err := s.db.Query(`SELECT ` + bookmarkColumns + `
|
|
FROM bookmarks
|
|
ORDER BY updated_at DESC`)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("query bookmarks: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
out := []Bookmark{}
|
|
for rows.Next() {
|
|
b, err := scanBookmark(rows.Scan)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("scan bookmark: %w", err)
|
|
}
|
|
out = append(out, b)
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
// Get returns one bookmark by key. A missing key is not an error: ok is false
|
|
// and err is nil. UI mutations read-modify-write through this so they preserve
|
|
// the fields they do not touch.
|
|
func (s *Store) Get(key string) (Bookmark, bool, error) {
|
|
b, err := scanBookmark(s.db.QueryRow(
|
|
`SELECT `+bookmarkColumns+` FROM bookmarks WHERE key = ?`, key).Scan)
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return Bookmark{}, false, nil
|
|
}
|
|
if err != nil {
|
|
return Bookmark{}, false, fmt.Errorf("get %q: %w", key, err)
|
|
}
|
|
return b, true, nil
|
|
}
|
|
|
|
// Upsert inserts or replaces a bookmark by key (last-write-wins) and returns
|
|
// the row as actually stored.
|
|
//
|
|
// b.UpdatedAt is only a candidate: it is applied when the row is new or when
|
|
// last_chapter_num changes, and otherwise the stored value is kept. Clients
|
|
// order their list by updated_at, so favoriting a series or recording a newly
|
|
// published chapter must not disturb that order — only real reading progress
|
|
// does. Callers must therefore use the returned bookmark, not the argument.
|
|
func (s *Store) Upsert(b Bookmark) (Bookmark, error) {
|
|
tx, err := s.db.Begin()
|
|
if err != nil {
|
|
return Bookmark{}, fmt.Errorf("begin %q: %w", b.Key, err)
|
|
}
|
|
defer tx.Rollback()
|
|
|
|
var latestNum any
|
|
if b.LatestChapterNum != nil {
|
|
latestNum = *b.LatestChapterNum
|
|
}
|
|
|
|
// IS NOT is SQLite's null-safe comparison. Within DO UPDATE, a bare column
|
|
// is the stored row and excluded.* is the incoming one; a brand-new key
|
|
// never reaches this clause, so it keeps the fresh timestamp from VALUES.
|
|
//
|
|
// The status and kind columns resolve on the VALUES side, not in the
|
|
// conflict clause: excluded.* is the row *after* these expressions are
|
|
// evaluated, so a default applied there would look identical to a real
|
|
// 'reading' / 'manga' and would overwrite an archived or novel row on
|
|
// every PUT from a client that knows nothing about the column. Resolved
|
|
// once here, an empty incoming status or kind means "keep what is
|
|
// stored", and only a brand-new row falls through to the literal
|
|
// default. The subquery runs inside this transaction, so it sees the
|
|
// row this statement is about to conflict with.
|
|
if _, err := tx.Exec(`
|
|
INSERT INTO bookmarks (`+bookmarkColumns+`)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
|
|
COALESCE(NULLIF(?, ''), (SELECT status FROM bookmarks WHERE key = ?), 'reading'),
|
|
COALESCE(NULLIF(?, ''), (SELECT kind FROM bookmarks WHERE key = ?), 'manga'))
|
|
ON CONFLICT(key) DO UPDATE SET
|
|
site=excluded.site, series_id=excluded.series_id, title=excluded.title,
|
|
series_url=excluded.series_url, cover=excluded.cover,
|
|
last_chapter=excluded.last_chapter, last_chapter_num=excluded.last_chapter_num,
|
|
last_chapter_url=excluded.last_chapter_url,
|
|
favorite=excluded.favorite,
|
|
latest_chapter=excluded.latest_chapter,
|
|
latest_chapter_num=excluded.latest_chapter_num,
|
|
status=excluded.status,
|
|
kind=excluded.kind,
|
|
updated_at=CASE
|
|
WHEN bookmarks.last_chapter_num IS NOT excluded.last_chapter_num
|
|
THEN excluded.updated_at
|
|
ELSE bookmarks.updated_at
|
|
END`,
|
|
b.Key, b.Site, b.SeriesID, b.Title, b.SeriesURL, b.Cover,
|
|
b.LastChapter, b.LastChapterNum, b.LastChapterURL,
|
|
b.Favorite, b.LatestChapter, latestNum, b.UpdatedAt,
|
|
b.Status, b.Key,
|
|
b.Kind, b.Key); err != nil {
|
|
return Bookmark{}, fmt.Errorf("upsert %q: %w", b.Key, err)
|
|
}
|
|
|
|
stored, err := scanBookmark(tx.QueryRow(
|
|
`SELECT `+bookmarkColumns+` FROM bookmarks WHERE key = ?`, b.Key).Scan)
|
|
if err != nil {
|
|
return Bookmark{}, fmt.Errorf("read back %q: %w", b.Key, err)
|
|
}
|
|
if err := tx.Commit(); err != nil {
|
|
return Bookmark{}, fmt.Errorf("commit %q: %w", b.Key, err)
|
|
}
|
|
return stored, nil
|
|
}
|
|
|
|
// Delete removes a bookmark by key. Deleting a missing key is not an error.
|
|
func (s *Store) Delete(key string) error {
|
|
if _, err := s.db.Exec(`DELETE FROM bookmarks WHERE key = ?`, key); err != nil {
|
|
return fmt.Errorf("delete %q: %w", key, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// DueForLatestCheck returns bookmarks whose server-side latest-chapter check has
|
|
// aged past cutoffMs, least-recently-checked first, at most limit of them.
|
|
//
|
|
// Oldest-first is what keeps the poller fair when the backlog outgrows its
|
|
// throughput: the most neglected series is always next, so a large collection
|
|
// refreshes uniformly slower rather than leaving a tail that never refreshes at
|
|
// all. The userscript sorts its own queue the same way (L453).
|
|
//
|
|
// Bookmarks with no series_url are skipped — there is nothing to fetch, which
|
|
// is the same filter the userscript applies at L452.
|
|
//
|
|
// Finished series are excluded: nothing more is coming, so fetching them only
|
|
// burns requests. Archived ones are deliberately still polled — knowing what a
|
|
// shelved series is up to is the whole reason for archiving instead of deleting.
|
|
func (s *Store) DueForLatestCheck(cutoffMs int64, limit int) ([]Bookmark, error) {
|
|
rows, err := s.db.Query(`SELECT `+bookmarkColumns+`
|
|
FROM bookmarks
|
|
WHERE series_url IS NOT NULL AND series_url <> ''
|
|
AND status IS NOT 'finished'
|
|
AND latest_checked_at <= ?
|
|
ORDER BY latest_checked_at ASC
|
|
LIMIT ?`, cutoffMs, limit)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("query due bookmarks: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
out := []Bookmark{}
|
|
for rows.Next() {
|
|
b, err := scanBookmark(rows.Scan)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("scan due bookmark: %w", err)
|
|
}
|
|
out = append(out, b)
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
// MarkLatestChecked records that the server looked at key at ts, whatever the
|
|
// look turned up. Marking a missing key is not an error: the row may have been
|
|
// deleted while a fetch was in flight.
|
|
//
|
|
// This is the one write that does not go through Upsert, and the column is kept
|
|
// out of bookmarkColumns on purpose. PUT /bookmarks/{key} decodes a whole
|
|
// Bookmark from the client and Upsert writes every column it knows about, so a
|
|
// userscript PUT — which has no idea this field exists — would write a zero and
|
|
// reset the cooldown, making the poller re-fetch that series every tick for as
|
|
// long as the user kept reading it.
|
|
func (s *Store) MarkLatestChecked(key string, ts int64) error {
|
|
if _, err := s.db.Exec(
|
|
`UPDATE bookmarks SET latest_checked_at = ? WHERE key = ?`, ts, key); err != nil {
|
|
return fmt.Errorf("mark checked %q: %w", key, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// LatestCheckedAt reads the column MarkLatestChecked writes. It exists for
|
|
// tests outside this package (the poller's own tests assert on cooldown
|
|
// bookkeeping) — see MarkLatestChecked for why the field itself stays off
|
|
// Bookmark.
|
|
func (s *Store) LatestCheckedAt(key string) (int64, error) {
|
|
var ts int64
|
|
if err := s.db.QueryRow(
|
|
`SELECT latest_checked_at FROM bookmarks WHERE key = ?`, key).Scan(&ts); err != nil {
|
|
return 0, fmt.Errorf("latest checked at %q: %w", key, err)
|
|
}
|
|
return ts, nil
|
|
}
|