From b347ad8e5e6e12aca4710eb60be73b50dab3e271 Mon Sep 17 00:00:00 2001 From: Umputun Date: Sun, 17 Jun 2018 12:22:41 -0500 Subject: [PATCH] add opts group for avatars --- app/main.go | 68 ++++++++++++++++++++++++++++++++---------------- app/main_test.go | 4 +-- 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/app/main.go b/app/main.go index 8abd80ed..28c7bfd1 100644 --- a/app/main.go +++ b/app/main.go @@ -32,26 +32,26 @@ type Opts struct { SecretKey string `long:"secret" env:"SECRET" required:"true" description:"secret key"` RemarkURL string `long:"url" env:"REMARK_URL" required:"true" description:"url to remark"` - Store StoreGroup `group:"store" namespace:"store" env-namespace:"STORE"` - Sites []string `long:"site" env:"SITE" default:"remark" description:"site names" env-delim:","` - Admins []string `long:"admin" env:"ADMIN" description:"admin(s) names" env-delim:","` - AdminEmail string `long:"admin-email" env:"ADMIN_EMAIL" default:"" description:"admin email"` - DevPasswd string `long:"dev-passwd" env:"DEV_PASSWD" default:"" description:"development mode password"` - BackupLocation string `long:"backup" env:"BACKUP_PATH" default:"./var/backup" description:"backups location"` - MaxBackupFiles int `long:"max-back" env:"MAX_BACKUP_FILES" default:"10" description:"max backups to keep"` - AvatarStore string `long:"avatars" env:"AVATAR_STORE" default:"./var/avatars" description:"avatars location"` - AvatarRszLmt int `long:"avatars-rsz-lmt" env:"AVATAR_RSZ_LMT" default:"0" description:"max image size for resizing avatars on save"` - ImageProxy bool `long:"img-proxy" env:"IMG_PROXY" description:"enable image proxy"` - MaxCommentSize int `long:"max-comment" env:"MAX_COMMENT_SIZE" default:"2048" description:"max comment size"` - MaxCachedItems int `long:"max-cache-items" env:"MAX_CACHE_ITEMS" default:"1000" description:"max cached items"` - MaxCachedValue int `long:"max-cache-value" env:"MAX_CACHE_VALUE" default:"65536" description:"max size of cached value"` - MaxCacheSize int `long:"max-cache-size" env:"MAX_CACHE_SIZE" default:"50000000" description:"max size of total cache"` - LowScore int `long:"low-score" env:"LOW_SCORE" default:"-5" description:"low score threshold"` - CriticalScore int `long:"critical-score" env:"CRITICAL_SCORE" default:"-10" description:"critical score threshold"` - ReadOnlyAge int `long:"read-age" env:"READONLY_AGE" default:"0" description:"read-only age of comments"` - Port int `long:"port" env:"REMARK_PORT" default:"8080" description:"port"` - WebRoot string `long:"web-root" env:"REMARK_WEB_ROOT" default:"./web" description:"web root directory"` - Dbg bool `long:"dbg" env:"DEBUG" description:"debug mode"` + Store StoreGroup `group:"store" namespace:"store" env-namespace:"STORE"` + Avatar AvatarGroup `group:"avatar" namespace:"avatar" env-namespace:"AVATAR"` + + Sites []string `long:"site" env:"SITE" default:"remark" description:"site names" env-delim:","` + Admins []string `long:"admin" env:"ADMIN" description:"admin(s) names" env-delim:","` + AdminEmail string `long:"admin-email" env:"ADMIN_EMAIL" default:"" description:"admin email"` + DevPasswd string `long:"dev-passwd" env:"DEV_PASSWD" default:"" description:"development mode password"` + BackupLocation string `long:"backup" env:"BACKUP_PATH" default:"./var/backup" description:"backups location"` + MaxBackupFiles int `long:"max-back" env:"MAX_BACKUP_FILES" default:"10" description:"max backups to keep"` + ImageProxy bool `long:"img-proxy" env:"IMG_PROXY" description:"enable image proxy"` + MaxCommentSize int `long:"max-comment" env:"MAX_COMMENT_SIZE" default:"2048" description:"max comment size"` + MaxCachedItems int `long:"max-cache-items" env:"MAX_CACHE_ITEMS" default:"1000" description:"max cached items"` + MaxCachedValue int `long:"max-cache-value" env:"MAX_CACHE_VALUE" default:"65536" description:"max size of cached value"` + MaxCacheSize int `long:"max-cache-size" env:"MAX_CACHE_SIZE" default:"50000000" description:"max size of total cache"` + LowScore int `long:"low-score" env:"LOW_SCORE" default:"-5" description:"low score threshold"` + CriticalScore int `long:"critical-score" env:"CRITICAL_SCORE" default:"-10" description:"critical score threshold"` + ReadOnlyAge int `long:"read-age" env:"READONLY_AGE" default:"0" description:"read-only age of comments"` + Port int `long:"port" env:"REMARK_PORT" default:"8080" description:"port"` + WebRoot string `long:"web-root" env:"REMARK_WEB_ROOT" default:"./web" description:"web root directory"` + Dbg bool `long:"dbg" env:"DEBUG" description:"debug mode"` Auth struct { Google AuthGroup `group:"google" namespace:"google" env-namespace:"GOOGLE" description:"Google OAuth"` @@ -76,6 +76,15 @@ type StoreGroup struct { } `group:"bolt" namespace:"bolt" env-namespace:"BOLT"` } +// AvatarGroup defines options group for avatar params +type AvatarGroup struct { + Type string `long:"type" env:"TYPE" description:"type of avatar storage" choice:"fs" choice:"mongo" default:"fs"` + FS struct { + Path string `long:"path" env:"PATH" default:"./var/avatars" description:"avatars location"` + } `group:"fs" namespace:"fs" env-namespace:"FS"` + RszLmt int `long:"rsz-lmt" env:"RSZ_LMT" default:"0" description:"max image size for resizing avatars on save"` +} + var revision = "unknown" // Application holds all active objects @@ -121,7 +130,7 @@ func main() { // doesn't start anything func New(opts Opts) (*Application, error) { - if err := makeDirs(opts.BackupLocation, opts.AvatarStore); err != nil { + if err := makeDirs(opts.BackupLocation); err != nil { return nil, err } @@ -148,8 +157,12 @@ func New(opts Opts) (*Application, error) { jwtService := auth.NewJWT(opts.SecretKey, strings.HasPrefix(opts.RemarkURL, "https://"), 7*24*time.Hour) + avatarStore, err := makeAvatarStore(opts.Avatar) + if err != nil { + return nil, errors.Wrap(err, "failed to make avatar store") + } avatarProxy := &proxy.Avatar{ - Store: proxy.NewFSAvatarStore(opts.AvatarStore, opts.AvatarRszLmt), + Store: avatarStore, RoutePath: "/api/v1/avatar", RemarkURL: strings.TrimSuffix(opts.RemarkURL, "/"), } @@ -253,6 +266,17 @@ func makeStore(group StoreGroup, siteNames []string) (result engine.Interface, e return result, errors.Wrap(err, "can't initialize data store") } +func makeAvatarStore(group AvatarGroup) (result proxy.AvatarStore, err error) { + switch group.Type { + case "fs": + if err = makeDirs(group.FS.Path); err != nil { + return nil, err + } + return proxy.NewFSAvatarStore(group.FS.Path, group.RszLmt), nil + } + return nil, errors.Errorf("unsupported avatart store type %s", group.Type) +} + // mkdir -p for all dirs func makeDirs(dirs ...string) error { diff --git a/app/main_test.go b/app/main_test.go index ceba4218..0e089a14 100644 --- a/app/main_test.go +++ b/app/main_test.go @@ -86,7 +86,7 @@ func TestApplicationShutdown(t *testing.T) { } func TestApplicationMainSignal(t *testing.T) { - os.Args = []string{"test", "--secret=123456", "--store.bolt.path=/tmp/xyz", "--backup=/tmp", "--avatars=/tmp", + os.Args = []string{"test", "--secret=123456", "--store.bolt.path=/tmp/xyz", "--backup=/tmp", "--avatar.fs.path=/tmp", "--port=18100", "--url=https://demo.remark42.com"} go func() { @@ -103,7 +103,7 @@ func prepApp(t *testing.T, port int, duration time.Duration) (*Application, cont opts := Opts{} p := flags.NewParser(&opts, flags.Default) p.ParseArgs([]string{"--secret=123456", "--dev-passwd=password", "--url=https://demo.remark42.com"}) - opts.AvatarStore, opts.BackupLocation = "/tmp", "/tmp" + opts.Avatar.FS.Path, opts.Avatar.Type, opts.BackupLocation = "/tmp", "fs", "/tmp" opts.Store.Bolt.Path = fmt.Sprintf("/tmp/%d", port) opts.Store.Bolt.Timeout = 10 * time.Second opts.Auth.Github.CSEC, opts.Auth.Github.CID = "csec", "cid"