XingfenD
7baadedeb4
- H now holds only small port interfaces (UserStore/LibraryStore/BookStore/ ProgressStore/BookmarkStore/RateLimiter/Scanner/Media/UploadSessions); NewRouter is the composition root distributing *store.Store and *redispkg.R - ports.Media gains EnsurePage; ChaptersOf returns ports.Chapter (media's local duplicate dropped); *media.M now provably satisfies ports.Media; ports.UploadSessions gains LibraryID for root validation before Complete - content.go: duplicated page-index cache + cover self-heal + page extract logic removed in favor of media service — same redis keys, same contract; path traversal check stays in handler (403 semantics preserved) - getLibrary/getLibRow merged into getLib(c, id); idParam helper dedupes :id parsing; isUnique replaced by ports.IsUniqueViolation (Task 28 partial) - main.go assembles media + upload and passes upload.U as scanner Sweeper Full gate green: gofmt, vet, go test -p 1 (real PG+Redis, 0 skip)
77 lines
1.9 KiB
Go
77 lines
1.9 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"log"
|
|
"net/http"
|
|
"os/signal"
|
|
"syscall"
|
|
"time"
|
|
|
|
"booklib/cmd/webui/api"
|
|
"booklib/internal/config"
|
|
"booklib/internal/db"
|
|
"booklib/internal/media"
|
|
"booklib/internal/redispkg"
|
|
"booklib/internal/scanner"
|
|
"booklib/internal/seed"
|
|
"booklib/internal/store"
|
|
"booklib/internal/upload"
|
|
)
|
|
|
|
func main() {
|
|
cfg, err := config.Load()
|
|
if err != nil {
|
|
log.Fatalf("config: %v", err)
|
|
}
|
|
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
|
defer stop()
|
|
|
|
p, err := db.Connect(ctx, cfg.DatabaseURL)
|
|
if err != nil {
|
|
log.Fatalf("db connect: %v", err)
|
|
}
|
|
defer p.Close()
|
|
if err := db.Migrate(ctx, p); err != nil {
|
|
log.Fatalf("migrate: %v", err)
|
|
}
|
|
st := store.New(p)
|
|
if err := seed.Admin(ctx, st, cfg.AdminUser, cfg.AdminPassword); err != nil {
|
|
log.Fatalf("seed: %v", err)
|
|
}
|
|
rdb := redispkg.New(cfg.RedisURL)
|
|
med := media.New(cfg, rdb)
|
|
up := upload.New(cfg.BooksDir, cfg.UploadMaxMB)
|
|
sc := scanner.New(st, cfg, rdb, up) // B16: sweep rides the scan ticker
|
|
go sc.Run(ctx)
|
|
|
|
serveErr := make(chan error, 1)
|
|
srv := &http.Server{Addr: cfg.Addr, Handler: api.NewRouter(cfg, st, rdb, sc, med, up),
|
|
ReadHeaderTimeout: 10 * time.Second}
|
|
go func() {
|
|
log.Printf("listening on %s", cfg.Addr)
|
|
if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
|
serveErr <- err
|
|
}
|
|
close(serveErr)
|
|
}()
|
|
|
|
// Wait for signal OR serve error.
|
|
select {
|
|
case <-ctx.Done():
|
|
case err := <-serveErr:
|
|
if err != nil {
|
|
log.Printf("serve: %v", err)
|
|
}
|
|
}
|
|
// stop() 先取消 ctx → scanner 循环退出;再等 HTTP 收尾。
|
|
// 在途 ScanLibraryByID(WithoutCancel)不受 ctx 控制,靠 redis 锁 TTL 兜底(已文档化的上限)。
|
|
stop()
|
|
shutdownCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
|
defer cancel()
|
|
if err := srv.Shutdown(shutdownCtx); err != nil {
|
|
log.Printf("shutdown: %v", err)
|
|
}
|
|
}
|