dtoro
634abc2a95
Lets a user pick a sub-folder under their library as a working index root, stored server-side (new sidecar user_prefs table). The Library tree, reindex, and both duplicate views (stacks + cross-folder scan) now re-root to it via a single userLibraryBase() helper. Also fixes the cross-folder scan/archive endpoints, which previously walked/touched the whole originals root instead of being scoped per-user (archive now rejects out-of-scope paths, 403). Removes PhotoPrism settings (Search/Maps/Server-UI/Features/Import) that only steered PhotoPrism's own bundled SPA and were never read by mulimage's UI. Also fixes the Library tree occasionally getting stuck on "Loading folders…" by dropping gcTime:0 and gating the spinner on isLoading instead of isPending. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
79 lines
2.8 KiB
Go
79 lines
2.8 KiB
Go
package main
|
|
|
|
import (
|
|
"time"
|
|
|
|
"gorm.io/driver/mysql"
|
|
"gorm.io/gorm"
|
|
"gorm.io/gorm/logger"
|
|
)
|
|
|
|
// Mark mirrors the per-photo extras the web client stores via the marks
|
|
// endpoints — rating + four-colour label. Composite primary key
|
|
// (photo_uid, user_name) so each user has independent marks. Both payload
|
|
// fields are nullable so the sparse "no rating / no colour" state
|
|
// round-trips cleanly.
|
|
type Mark struct {
|
|
PhotoUID string `gorm:"primaryKey;size:64;column:photo_uid" json:"-"`
|
|
UserName string `gorm:"primaryKey;size:128;column:user_name" json:"-"`
|
|
Rating *int `gorm:"column:rating" json:"rating,omitempty"`
|
|
Color *string `gorm:"size:16;column:color" json:"color,omitempty"`
|
|
UpdatedAt time.Time `gorm:"column:updated_at" json:"updatedAt"`
|
|
}
|
|
|
|
// TableName pins the GORM-pluralised default to a name that matches the
|
|
// other tables the M4 plan calls out (`marks`, `heap_shares`, …) so
|
|
// nothing surprising lands in the schema.
|
|
func (Mark) TableName() string { return "marks" }
|
|
|
|
// UserPref holds the per-user, server-side preferences PhotoPrism's account
|
|
// model has no slot for. Today that's just `IndexPath` — the originals-
|
|
// relative sub-folder (under the user's BasePath) the web client re-roots the
|
|
// Library tree to and scopes the reindex to. Empty string = "whole folder".
|
|
// Keyed by username so each user has independent prefs, matching `Mark`.
|
|
type UserPref struct {
|
|
UserName string `gorm:"primaryKey;size:128;column:user_name" json:"-"`
|
|
IndexPath string `gorm:"size:1024;column:index_path" json:"indexPath"`
|
|
UpdatedAt time.Time `gorm:"column:updated_at" json:"-"`
|
|
}
|
|
|
|
// TableName pins the table name (GORM would pluralise to `user_prefs` anyway,
|
|
// but pin it explicitly to stay consistent with Mark).
|
|
func (UserPref) TableName() string { return "user_prefs" }
|
|
|
|
// asJSON returns the wire shape clients expect — same flat object the
|
|
// Node prototype emitted. An empty Mark (rating=nil, color=nil) renders
|
|
// as `{}` which the client treats as "no mark on this photo".
|
|
func (m *Mark) asJSON() map[string]any {
|
|
out := map[string]any{}
|
|
if m == nil {
|
|
return out
|
|
}
|
|
if m.Rating != nil {
|
|
out["rating"] = *m.Rating
|
|
}
|
|
if m.Color != nil && *m.Color != "" {
|
|
out["color"] = *m.Color
|
|
}
|
|
if !m.UpdatedAt.IsZero() {
|
|
// ISO-8601 with millisecond precision, UTC — matches the Node
|
|
// prototype's `new Date().toISOString()` so clients written against
|
|
// the old endpoint stay happy.
|
|
out["updatedAt"] = m.UpdatedAt.UTC().Format("2006-01-02T15:04:05.000Z")
|
|
}
|
|
return out
|
|
}
|
|
|
|
func openDB(dsn string) (*gorm.DB, error) {
|
|
db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{
|
|
Logger: logger.Default.LogMode(logger.Warn),
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if err := db.AutoMigrate(&Mark{}, &UserPref{}); err != nil {
|
|
return nil, err
|
|
}
|
|
return db, nil
|
|
}
|