Changeset 26 in code

Timestamp:

Oct 19, 2021, 6:54:10 AM (4 years ago)

Author:

dev

Message:

Accept flags as INI file config

Location:

trunk

Files:

• go.mod (modified) (1 diff)
• partage.go (modified) (2 diffs)

trunk/go.mod

@@ -3 +3 @@
 go 1.17
 
-require github.com/dustin/go-humanize v1.0.0 // indirect
+require (
+        github.com/dustin/go-humanize v1.0.0 // indirect
+        github.com/vharitonsky/iniflags v0.0.0-20180513140207-a33cd0b5f3de // indirect
+)

trunk/partage.go

@@ -15 +15 @@
 
         "github.com/dustin/go-humanize"
+        "github.com/vharitonsky/iniflags"
 )
 
@@ -215 +216 @@
 
 func main() {
-        flag.StringVar(&conf.bind,        "l", "0.0.0.0:8080", "Address to bind to (default: 0.0.0.0:8080)")
-        flag.StringVar(&conf.baseuri,     "b", "http://127.0.0.1:8080", "Base URI to use for links (default: http://127.0.0.1:8080)")
-        flag.StringVar(&conf.filepath,    "f", "./files", "Path to save files to (default: ./files)")
-        flag.StringVar(&conf.metapath,    "m", "./meta", "Path to save metadata to (default: ./meta)")
-        flag.StringVar(&conf.filectx,     "c", "/f/", "Context to serve files from (default: /f/)")
-        flag.StringVar(&conf.metactx,     "d", "/m/", "Context to serve metadata from (default: /m/)")
-        flag.StringVar(&conf.rootdir,     "r", "./static", "Root directory (default: ./static)")
-        flag.StringVar(&conf.templatedir, "t", "./templates", "Templates directory (default: ./templates)")
-        flag.Int64Var(&conf.maxsize,      "s", 30064771072, "Maximum file size (default: 28Gib)")
-        flag.Int64Var(&conf.expiry,       "e", 86400, "Link expiration time (default: 24h)")
-
-        flag.Parse()
+        flag.StringVar(&conf.bind,        "bind",        "0.0.0.0:8080", "Address to bind to (default: 0.0.0.0:8080)")
+        flag.StringVar(&conf.baseuri,     "baseuri",     "http://127.0.0.1:8080", "Base URI to use for links (default: http://127.0.0.1:8080)")
+        flag.StringVar(&conf.filepath,    "filepath",    "./files", "Path to save files to (default: ./files)")
+        flag.StringVar(&conf.metapath,    "metapath",    "./meta", "Path to save metadata to (default: ./meta)")
+        flag.StringVar(&conf.filectx,     "filectx",     "/f/", "Context to serve files from (default: /f/)")
+        flag.StringVar(&conf.metactx,     "metactx",     "/m/", "Context to serve metadata from (default: /m/)")
+        flag.StringVar(&conf.rootdir,     "rootdir",     "./static", "Root directory (default: ./static)")
+        flag.StringVar(&conf.templatedir, "templatedir", "./templates", "Templates directory (default: ./templates)")
+        flag.Int64Var(&conf.maxsize,      "maxsize",     30064771072, "Maximum file size (default: 28Gib)")
+        flag.Int64Var(&conf.expiry,       "expiry",      86400, "Link expiration time (default: 24h)")
+
+        iniflags.Parse()
 
         http.HandleFunc("/", uploader)