jason/cpolis
1
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases 52 Wiki Activity

Added ability to specify port and RSS file as command line arguments

Browse Source
This commit is contained in:
Jason Streifling 2024-03-30 09:55:37 +01:00
parent 26988ecf6a
commit 6e3c4bf647
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/control/cli.go
View File

@ -10,7 +10,9 @@ type CliArgs struct {
DBName string DBName string
KeyFile string KeyFile string
LogFile string LogFile string
Port string
PicsDir string PicsDir string
RSSFile string
WebDir string WebDir string
} }
@ -18,9 +20,11 @@ func HandleCliArgs() (*CliArgs, error) {
var err error var err error
cliArgs := new(CliArgs) cliArgs := new(CliArgs)
keyFile := flag.String("key", "/var/www/cpolis.key", "key file") keyFile := flag.String("key", "/var/www/cpolis/cpolis.key", "key file")
logFile := flag.String("log", "/var/log/cpolis.log", "log file") logFile := flag.String("log", "/var/log/cpolis.log", "log file")
picsDir := flag.String("pics", "/var/www/cpolis/pics", "pictures directory") picsDir := flag.String("pics", "/var/www/cpolis/pics", "pictures directory")
cliArgs.Port = fmt.Sprint(":", flag.Int("port", 8080, "port"))
rssFile := flag.String("rss", "/var/www/cpolis/cpolis.rss", "RSS file")
webDir := flag.String("web", "/var/www/cpolis/web", "web directory") webDir := flag.String("web", "/var/www/cpolis/web", "web directory")
flag.StringVar(&cliArgs.DBName, "db", "cpolis", "DB name") flag.StringVar(&cliArgs.DBName, "db", "cpolis", "DB name")
flag.Parse() flag.Parse()
@ -29,14 +33,22 @@ func HandleCliArgs() (*CliArgs, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("error finding absolute path for KeyFile: %v", err) return nil, fmt.Errorf("error finding absolute path for KeyFile: %v", err)
} }
cliArgs.LogFile, err = filepath.Abs(*logFile) cliArgs.LogFile, err = filepath.Abs(*logFile)
if err != nil { if err != nil {
return nil, fmt.Errorf("error finding absolute path for LogFile: %v", err) return nil, fmt.Errorf("error finding absolute path for LogFile: %v", err)
} }
cliArgs.PicsDir, err = filepath.Abs(*picsDir) cliArgs.PicsDir, err = filepath.Abs(*picsDir)
if err != nil { if err != nil {
return nil, fmt.Errorf("error finding absolute path for PicsDir: %v", err) return nil, fmt.Errorf("error finding absolute path for PicsDir: %v", err)
} }
cliArgs.RSSFile, err = filepath.Abs(*rssFile)
if err != nil {
return nil, fmt.Errorf("error finding absolute path for RSSFile: %v", err)
}
cliArgs.WebDir, err = filepath.Abs(*webDir) cliArgs.WebDir, err = filepath.Abs(*webDir)
if err != nil { if err != nil {
return nil, fmt.Errorf("error finding absolute path for WebDir: %v", err) return nil, fmt.Errorf("error finding absolute path for WebDir: %v", err)

2
cmd/main.go
View File

@ -78,5 +78,5 @@ func main() {
mux.HandleFunc("POST /update-user/", view.UpdateUser(args, db, store)) mux.HandleFunc("POST /update-user/", view.UpdateUser(args, db, store))
mux.HandleFunc("POST /upload-image/", view.UploadImage(args)) mux.HandleFunc("POST /upload-image/", view.UploadImage(args))
log.Fatalln(http.ListenAndServe(":8080", mux)) log.Fatalln(http.ListenAndServe(args.Port, mux))
} }

2
cmd/view/articles.go
View File

@ -319,7 +319,7 @@ func PublishArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) ht
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return
} }
if err = control.SaveRSS("tmp/orientexpress_alle.rss", feed); err != nil { if err = control.SaveRSS(c.RSSFile, feed); err != nil {
log.Println(err) log.Println(err)
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return