Added sub commands for doing admin stuff
This commit is contained in:
parent
329de2f953
commit
4a6b79db17
18 changed files with 531 additions and 185 deletions
118
cmds/pubtargets.go
Normal file
118
cmds/pubtargets.go
Normal file
|
|
@ -0,0 +1,118 @@
|
|||
package cmds
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"text/tabwriter"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
"lmika.dev/lmika/weiro/config"
|
||||
"lmika.dev/lmika/weiro/models"
|
||||
"lmika.dev/lmika/weiro/services"
|
||||
)
|
||||
|
||||
func PubTargetsAdd() *cobra.Command {
|
||||
var (
|
||||
siteGUID string
|
||||
targetType string
|
||||
targetRef string
|
||||
targetKey string
|
||||
baseURL string
|
||||
enabled bool
|
||||
)
|
||||
|
||||
cmd := &cobra.Command{
|
||||
Use: "add",
|
||||
Short: "Add a publication target",
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
cfg, err := config.LoadConfig()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
svcs, err := services.New(cfg)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
defer svcs.Close()
|
||||
|
||||
ctx := context.Background()
|
||||
site, err := svcs.DB.SelectSiteByGUID(ctx, siteGUID)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
target := &models.SitePublishTarget{
|
||||
SiteID: site.ID,
|
||||
GUID: models.NewNanoID(),
|
||||
Enabled: enabled,
|
||||
BaseURL: baseURL,
|
||||
TargetType: targetType,
|
||||
TargetRef: targetRef,
|
||||
TargetKey: targetKey,
|
||||
}
|
||||
|
||||
if err := svcs.DB.SavePublishTarget(ctx, target); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
fmt.Printf("Added publish target %s\n", target.GUID)
|
||||
},
|
||||
}
|
||||
|
||||
cmd.Flags().StringVarP(&siteGUID, "site", "s", "", "Site GUID")
|
||||
cmd.Flags().StringVarP(&targetType, "type", "t", "", "Target type (localfs, netlify)")
|
||||
cmd.Flags().StringVarP(&targetRef, "ref", "r", "", "Target reference")
|
||||
cmd.Flags().StringVarP(&targetKey, "key", "k", "", "Target key")
|
||||
cmd.Flags().StringVarP(&baseURL, "url", "u", "", "Base URL")
|
||||
cmd.Flags().BoolVar(&enabled, "enabled", true, "Enable target")
|
||||
|
||||
cmd.MarkFlagRequired("site")
|
||||
cmd.MarkFlagRequired("type")
|
||||
cmd.MarkFlagRequired("ref")
|
||||
cmd.MarkFlagRequired("url")
|
||||
|
||||
return cmd
|
||||
}
|
||||
|
||||
func PubTargets() *cobra.Command {
|
||||
cmd := &cobra.Command{
|
||||
Use: "pubtargets <site-guid>",
|
||||
Short: "Manage publication targets",
|
||||
Args: cobra.ExactArgs(1),
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
cfg, err := config.LoadConfig()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
svcs, err := services.New(cfg)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
defer svcs.Close()
|
||||
|
||||
ctx := context.Background()
|
||||
site, err := svcs.DB.SelectSiteByGUID(ctx, args[0])
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
targets, err := svcs.DB.SelectPublishTargetsOfSite(ctx, site.ID)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
|
||||
fmt.Fprintln(w, "GUID\tTARGET_TYPE\tENABLED\tTARGET_REF")
|
||||
for _, target := range targets {
|
||||
fmt.Fprintf(w, "%s\t%s\t%v\t%s\n", target.GUID, target.TargetType, target.Enabled, target.TargetRef)
|
||||
}
|
||||
w.Flush()
|
||||
},
|
||||
}
|
||||
cmd.AddCommand(PubTargetsAdd())
|
||||
return cmd
|
||||
}
|
||||
139
cmds/server.go
Normal file
139
cmds/server.go
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
package cmds
|
||||
|
||||
import (
|
||||
"context"
|
||||
"html"
|
||||
"html/template"
|
||||
"log"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/gofiber/fiber/v3"
|
||||
"github.com/gofiber/fiber/v3/extractors"
|
||||
"github.com/gofiber/fiber/v3/middleware/session"
|
||||
"github.com/gofiber/fiber/v3/middleware/static"
|
||||
"github.com/gofiber/storage/sqlite3/v2"
|
||||
fiber_html "github.com/gofiber/template/html/v3"
|
||||
"github.com/gofiber/utils/v2"
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/yuin/goldmark"
|
||||
"github.com/yuin/goldmark/extension"
|
||||
"lmika.dev/lmika/weiro/config"
|
||||
"lmika.dev/lmika/weiro/handlers"
|
||||
"lmika.dev/lmika/weiro/handlers/middleware"
|
||||
"lmika.dev/lmika/weiro/services"
|
||||
)
|
||||
|
||||
func Root() *cobra.Command {
|
||||
cmd := &cobra.Command{
|
||||
Use: "weiro",
|
||||
Short: "Weiro is a simple blogging platform",
|
||||
Long: `Weiro is a simple blogging platform.
|
||||
|
||||
Starting weiro without any arguments will start the server.
|
||||
`,
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
cfg, err := config.LoadConfig()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
svcs, err := services.New(cfg)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
defer svcs.Close()
|
||||
|
||||
svcs.PublisherQueue.Start(context.Background())
|
||||
|
||||
fiberTemplate := fiber_html.New("./views", ".html")
|
||||
fiberTemplate.Funcmap["sub"] = func(x, y int) int { return x - y }
|
||||
fiberTemplate.Funcmap["markdown"] = func() func(s string) template.HTML {
|
||||
mdParser := goldmark.New(
|
||||
goldmark.WithExtensions(extension.GFM),
|
||||
)
|
||||
return func(s string) template.HTML {
|
||||
var sb strings.Builder
|
||||
if err := mdParser.Convert([]byte(s), &sb); err != nil {
|
||||
return template.HTML("Markdown error: " + html.EscapeString(err.Error()))
|
||||
}
|
||||
return template.HTML(sb.String())
|
||||
}
|
||||
}()
|
||||
|
||||
// Initialize custom config
|
||||
store := sqlite3.New(sqlite3.Config{
|
||||
Database: filepath.Join(cfg.DataDir, "./fiber.db"),
|
||||
Table: "fiber_storage",
|
||||
Reset: false,
|
||||
GCInterval: 10 * time.Second,
|
||||
MaxOpenConns: 100,
|
||||
MaxIdleConns: 100,
|
||||
ConnMaxLifetime: 1 * time.Second,
|
||||
})
|
||||
|
||||
app := fiber.New(fiber.Config{
|
||||
Views: fiberTemplate,
|
||||
ViewsLayout: "layouts/main",
|
||||
PassLocalsToViews: true,
|
||||
})
|
||||
app.Use(session.New(session.Config{
|
||||
// Storage
|
||||
Storage: store,
|
||||
|
||||
// Security
|
||||
CookieSecure: cfg.IsProd(),
|
||||
CookieSameSite: "Lax",
|
||||
|
||||
// Session Management
|
||||
IdleTimeout: 24 * time.Hour, // Inactivity timeout
|
||||
AbsoluteTimeout: 7 * 24 * time.Hour, // Maximum session duration
|
||||
|
||||
// Cookie Settings
|
||||
CookiePath: "/",
|
||||
CookieDomain: cfg.SiteDomain,
|
||||
CookieSessionOnly: false, // Persist across browser restarts
|
||||
|
||||
// Session ID
|
||||
Extractor: extractors.FromCookie("__wro-session_id"),
|
||||
KeyGenerator: utils.SecureToken,
|
||||
|
||||
// Error Handling
|
||||
ErrorHandler: func(c fiber.Ctx, err error) {
|
||||
log.Printf("Session error: %v", err)
|
||||
},
|
||||
}))
|
||||
|
||||
ih := handlers.IndexHandler{SiteService: svcs.Sites}
|
||||
lh := handlers.LoginHandler{Config: cfg, AuthService: svcs.Auth}
|
||||
ph := handlers.PostsHandler{PostService: svcs.Posts}
|
||||
|
||||
app.Get("/login", lh.Login)
|
||||
app.Post("/login", lh.DoLogin)
|
||||
app.Post("/logout", lh.Logout)
|
||||
|
||||
siteGroup := app.Group("/sites/:siteID", middleware.RequireUser(svcs.Auth), middleware.RequiresSite(svcs.Sites))
|
||||
|
||||
siteGroup.Get("/posts", ph.Index)
|
||||
siteGroup.Get("/posts/new", ph.New)
|
||||
siteGroup.Get("/posts/:postID", ph.Edit)
|
||||
siteGroup.Post("/posts", ph.Update)
|
||||
siteGroup.Patch("/posts/:postID", ph.Patch)
|
||||
siteGroup.Delete("/posts/:postID", ph.Delete)
|
||||
|
||||
app.Get("/", middleware.OptionalUser(svcs.Auth), ih.Index)
|
||||
app.Get("/first-run", ih.FirstRun)
|
||||
app.Post("/first-run", ih.FirstRunSubmit)
|
||||
|
||||
app.Get("/static/*", static.New("./static"))
|
||||
|
||||
if err := app.Listen(":3000"); err != nil {
|
||||
log.Println(err)
|
||||
}
|
||||
},
|
||||
}
|
||||
cmd.AddCommand(Sites())
|
||||
cmd.AddCommand(PubTargets())
|
||||
return cmd
|
||||
}
|
||||
46
cmds/sites.go
Normal file
46
cmds/sites.go
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
package cmds
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"text/tabwriter"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
"lmika.dev/lmika/weiro/config"
|
||||
"lmika.dev/lmika/weiro/services"
|
||||
)
|
||||
|
||||
func Sites() *cobra.Command {
|
||||
cmd := &cobra.Command{
|
||||
Use: "sites",
|
||||
Short: "Manage sites",
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
cfg, err := config.LoadConfig()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
svcs, err := services.New(cfg)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
defer svcs.Close()
|
||||
|
||||
ctx := context.Background()
|
||||
sites, err := svcs.Sites.ListAllSitesWithOwners(ctx)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
|
||||
fmt.Fprintln(w, "GUID\tOWNER\tNAME")
|
||||
for _, site := range sites {
|
||||
fmt.Fprintf(w, "%s\t%s\t%s\n", site.GUID, site.Username, site.Title)
|
||||
}
|
||||
w.Flush()
|
||||
},
|
||||
}
|
||||
return cmd
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue