summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config.go8
-rw-r--r--database.go26
-rw-r--r--handler.go28
-rw-r--r--storage.go2
4 files changed, 9 insertions, 55 deletions
diff --git a/config.go b/config.go
index e48016a..4b5ecf0 100644
--- a/config.go
+++ b/config.go
@@ -32,27 +32,23 @@ type DatabaseConfig struct {
func GetRuntimeConfig() RuntimeConfig {
- // init empty return value
config := RuntimeConfig{}
- // read command line flags
- flag.StringVar(&config.Path, "c", "/etc/ceres/config.json", "Path to ceres configuration file")
+ flag.StringVar(&config.Path, "c", "/etc/ceres/config.json",
+ "Path to ceres configuration file")
flag.Parse()
- // open config file
configFile, err := os.Open(config.Path)
defer configFile.Close()
if err != nil {
log.Fatalf("Could not open configuration file %s", config.Path)
}
- // read byte content
configData, err := ioutil.ReadAll(configFile)
if err != nil {
log.Fatalf("Could not read configuration file %s", config.Path)
}
- // parse content to config structs
err = json.Unmarshal(configData, &config)
if err != nil {
log.Fatalf("Could not parse configuration file %s", config.Path)
diff --git a/database.go b/database.go
index 6451599..ffc44e3 100644
--- a/database.go
+++ b/database.go
@@ -14,8 +14,7 @@ import (
_ "github.com/go-sql-driver/mysql"
)
-const databaseSchemaVersion int = 2 // this defines the needed version for the
-// executable
+const neededSchemaVersion int = 2
func setupDatabase() *sql.DB {
@@ -45,23 +44,19 @@ func setupDatabase() *sql.DB {
func migrate(db *sql.DB) {
- const t = databaseSchemaVersion // targeted database schema version
-
for {
- v := schemaVersion(db) // read schema version from DB table
+ v := schemaVersion(db)
- // handle current database schema which is newer than targeted one
- if v > t {
+ if v > neededSchemaVersion {
log.Fatalf(
- "Current database schema version is %d but newest is %d!", v, t)
+ "Current database schema version is %d but newest is %d!", v,
+ neededSchemaVersion)
}
- // break if targeted version is already reached
- if v == t {
+ if v == neededSchemaVersion {
break
}
- // execute migration
log.Printf("Starting database schema migration to version %d.\n", v+1)
path := filepath.Join(config.Database.Migrations,
fmt.Sprintf("%04d_migration.sql", v+1))
@@ -98,27 +93,20 @@ func RunSqlScript(path string) {
func schemaVersion(db *sql.DB) int {
- // ask database for schema version
cmd := "SELECT value FROM meta WHERE (identifier='version');"
rows, err := db.Query(cmd)
-
- // handle missing meta table
if err != nil {
log.Fatal(err)
}
-
- // handle successful schema version query
defer rows.Close()
+
rows.Next()
var version string
err = rows.Scan(&version)
-
- // handle missing version field in meta table
if err != nil {
log.Fatal(err)
}
- // convert to integer and handle error
v, err := strconv.Atoi(version)
if err != nil {
log.Fatalf("Could not convert database schema version '%s' to int.\n",
diff --git a/handler.go b/handler.go
index 0c51bf6..0166d95 100644
--- a/handler.go
+++ b/handler.go
@@ -17,7 +17,6 @@ const (
func indexGet(w http.ResponseWriter, r *http.Request) {
- // get data from database
cmd := "SELECT id,title FROM recipes ORDER BY title;"
rows, err := db.Query(cmd)
if err != nil {
@@ -26,14 +25,12 @@ func indexGet(w http.ResponseWriter, r *http.Request) {
}
defer rows.Close()
- // prepare data store
type Element struct {
Id string
Title string
}
elements := make([]Element, 0)
- // scan database rows to data store
for rows.Next() {
var element Element
err := rows.Scan(&element.Id, &element.Title)
@@ -45,14 +42,12 @@ func indexGet(w http.ResponseWriter, r *http.Request) {
}
}
- // render and return template
path := filepath.Join(config.Http.Templates, "index.html")
ServeTemplate(w, "index", path, elements)
}
func recipeGet(w http.ResponseWriter, r *http.Request) {
- // get id from URL parameters
ids := r.URL.Query()["id"]
if len(ids) != 1 {
msg := fmt.Sprintf("Exactly 1 'id' URL parameter expected but %d provided.", len(ids))
@@ -61,14 +56,12 @@ func recipeGet(w http.ResponseWriter, r *http.Request) {
}
idStr := ids[0]
- // validate id
idRegex := regexp.MustCompile(VALID_ID_REGEX)
if !(idRegex.MatchString(idStr)) {
http.Error(w, "Bad 'id' URL parameter.", 400)
return
}
- // get data from database
cmd := fmt.Sprintf("SELECT title,upstream_url,description_markdown FROM recipes WHERE (id='%s');", idStr)
rows, err := db.Query(cmd)
if err != nil {
@@ -77,7 +70,6 @@ func recipeGet(w http.ResponseWriter, r *http.Request) {
}
defer rows.Close()
- // prepare data store
type Element struct {
Id string
Title string
@@ -87,7 +79,6 @@ func recipeGet(w http.ResponseWriter, r *http.Request) {
}
elements := make([]Element, 0)
- // scan database rows to data store
for rows.Next() {
var element Element
element.Id = idStr
@@ -100,7 +91,6 @@ func recipeGet(w http.ResponseWriter, r *http.Request) {
}
}
- // check result
if len(elements) != 1 {
http.Error(w, "Expected exactly 1 recipe from database.", 500)
return
@@ -111,14 +101,12 @@ func recipeGet(w http.ResponseWriter, r *http.Request) {
goldmark.Convert([]byte(elements[0].DescriptionMarkdown), &buf)
elements[0].RenderedDescriptionMarkdown = buf.String()
- // render and return template
path := filepath.Join(config.Http.Templates, "recipe.html")
ServeTemplate(w, "recipe", path, elements[0])
}
func recipePost(w http.ResponseWriter, r *http.Request) {
- // get id from URL parameters
ids := r.URL.Query()["id"]
if len(ids) != 1 {
msg := fmt.Sprintf("Exactly 1 'id' URL parameter expected but %d provided.", len(ids))
@@ -127,14 +115,12 @@ func recipePost(w http.ResponseWriter, r *http.Request) {
}
idStr := ids[0]
- // validate id
idRegex := regexp.MustCompile(VALID_ID_REGEX)
if !(idRegex.MatchString(idStr)) {
http.Error(w, "Bad 'id' URL parameter.", 400)
return
}
- // read request body
buffer, _ := ioutil.ReadAll(r.Body) // FIXME error handling
body := string(buffer)
updateRecipe(body, idStr)
@@ -142,7 +128,6 @@ func recipePost(w http.ResponseWriter, r *http.Request) {
func recipeEditGet(w http.ResponseWriter, r *http.Request) {
- // get id from URL parameters
ids := r.URL.Query()["id"]
if len(ids) != 1 {
http.Error(w, "Exactly 1 'id' URL parameter expected.", 400)
@@ -150,14 +135,12 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request) {
}
idStr := ids[0]
- // validate id
idRegex := regexp.MustCompile(VALID_ID_REGEX)
if !(idRegex.MatchString(idStr)) {
http.Error(w, "Bad 'id' URL parameter.", 400)
return
}
- // get data from database
cmd := fmt.Sprintf("SELECT title,upstream_url,description_markdown FROM recipes WHERE (id='%s');", idStr)
rows, err := db.Query(cmd)
if err != nil {
@@ -166,7 +149,6 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request) {
}
defer rows.Close()
- // prepare data store
type Element struct {
Id string
Title string
@@ -176,7 +158,6 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request) {
}
elements := make([]Element, 0)
- // scan database rows to data store
for rows.Next() {
var element Element
element.Id = idStr
@@ -189,20 +170,17 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request) {
}
}
- // check result
if len(elements) != 1 {
http.Error(w, "Did not get exactly one recipe from database.", 500)
return
}
- // render and return template
path := filepath.Join(config.Http.Templates, "recipe_edit.html")
ServeTemplate(w, "recipe", path, elements[0])
}
func recipeEditPost(w http.ResponseWriter, r *http.Request) {
- // get id from URL parameters
ids := r.URL.Query()["id"]
if len(ids) != 1 {
http.Error(w, "Exactly 1 'id' URL parameter expected.", 400)
@@ -210,14 +188,12 @@ func recipeEditPost(w http.ResponseWriter, r *http.Request) {
}
idStr := ids[0]
- // validate id
idRegex := regexp.MustCompile(VALID_ID_REGEX)
if !(idRegex.MatchString(idStr)) {
http.Error(w, "Bad 'id' URL parameter.", 400)
return
}
- // read request body
buffer, _ := ioutil.ReadAll(r.Body) // FIXME error handling
body := string(buffer)
updateRecipe(body, idStr)
@@ -225,7 +201,6 @@ func recipeEditPost(w http.ResponseWriter, r *http.Request) {
func updateRecipe(body string, idStr string) {
- // execute SQL UPDATE
_, _ = db.Exec(`
UPDATE
recipes
@@ -242,7 +217,6 @@ func updateRecipe(body string, idStr string) {
func recipeImageGet(w http.ResponseWriter, r *http.Request) {
- // get ID
ids := r.URL.Query()["id"]
if len(ids) != 1 {
http.Error(w, "Expected exactly one 'id' URL parameter.", 400)
@@ -250,14 +224,12 @@ func recipeImageGet(w http.ResponseWriter, r *http.Request) {
}
idStr := ids[0]
- // validate ID
idRegex := regexp.MustCompile(VALID_ID_REGEX)
if !idRegex.MatchString(idStr) {
http.Error(w, "Bad 'id' URL parameter.", 400)
return
}
- // serve image
path := fmt.Sprintf("recipes/image/%s.jpg", idStr)
ServeStorage(w, r, path)
}
diff --git a/storage.go b/storage.go
index e063d6b..dd6feb2 100644
--- a/storage.go
+++ b/storage.go
@@ -9,7 +9,6 @@ import (
func ServeStorage(w http.ResponseWriter, r *http.Request, path string) {
- // generate absolute, cleaned path of ressource
path = filepath.Join(config.Http.Storage, path)
path, err := filepath.Abs(path)
if err != nil {
@@ -20,7 +19,6 @@ func ServeStorage(w http.ResponseWriter, r *http.Request, path string) {
// TODO check if path is still in storage folder
- // serve the file if nothing has been wrong
http.ServeFile(w, r, path)
}
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-04-04 21:10:21 +0000