update: general formatting and cleanup

2024-08-14 00:32:48 +03:00
parent 25f30b51f0
commit 87a9236e01
15 changed files with 402 additions and 344 deletions
--- a/routes/configs.go
+++ b/routes/configs.go
@ -4,137 +4,145 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"log"
 	"os"
 	"path"
 	"strings"

 	"git.matterlinux.xyz/Matter/website/lib"
+	"git.matterlinux.xyz/Matter/website/log"
 	"github.com/bigkevmcd/go-configparser"
 	"github.com/gofiber/fiber/v2"
 )

 type Config struct {
-  Redirect string `json:"redirect"`
-  Image string    `json:"image"`
-  Url string      `json:"url"`
+	Redirect string `json:"redirect"`
+	Image    string `json:"image"`
+	Url      string `json:"url"`

-  Name string
-  Desc string
-  Author string
-  Keywords string 
+	Name     string
+	Desc     string
+	Author   string
+	Keywords string
 }

-func LoadConfig(c *Config) (error) {
-  agent := fiber.Get(c.Url)
-  code, body, errs := agent.Bytes()
-  if len(errs) > 0 {
-    return fmt.Errorf("request to %s failed", c.Url)
-  }
+func (c *Config) Load() error {
+	agent := fiber.Get(c.Url)
+	code, body, errs := agent.Bytes()
+	if len(errs) > 0 {
+		return fmt.Errorf("request to %s failed", c.Url)
+	}

-  if code != 200 {
-    return fmt.Errorf("bad response from %s", c.Url)
-  }
+	if code != 200 {
+		return fmt.Errorf("bad response from %s", c.Url)
+	}

-  parser := configparser.New()
-  err := parser.ParseReader(bytes.NewReader(body))
-  if err != nil {
-    return fmt.Errorf("failed to parse %s: %s", c.Url, err.Error())
-  }
+	parser := configparser.New()
+	err := parser.ParseReader(bytes.NewReader(body))
+	if err != nil {
+		return fmt.Errorf("failed to parse %s: %s", c.Url, err.Error())
+	}

-  name, err := parser.Get("details", "name")
-  if err != nil {
-    return fmt.Errorf("failed get details/name: %s", c.Url)
-  }
-  
-  keywords, err := parser.Get("details", "keywords")
-  if err != nil {
-    return fmt.Errorf("failed get details/keywords: %s", c.Url)
-  }
+	name, err := parser.Get("details", "name")
+	if err != nil {
+		return fmt.Errorf("failed get details/name: %s", c.Url)
+	}

-  author, err := parser.Get("details", "author")
-  if err != nil {
-    return fmt.Errorf("failed get details/keywords: %s", c.Url)
-  }
-  
-  desc, err := parser.Get("details", "desc")
+	keywords, err := parser.Get("details", "keywords")
+	if err != nil {
+		return fmt.Errorf("failed get details/keywords: %s", c.Url)
+	}

-  c.Name = name
-  c.Desc = desc 
-  c.Author = author
-  c.Keywords = strings.ReplaceAll(keywords, ",", ", ")
+	author, err := parser.Get("details", "author")
+	if err != nil {
+		return fmt.Errorf("failed get details/keywords: %s", c.Url)
+	}

-  if(!lib.IsStringValid(c.Name) || 
-     !lib.IsStringValid(c.Desc) ||
-     !lib.IsStringValid(c.Author) ||
-     !lib.IsStringValid(c.Keywords)){
-    return fmt.Errorf("keywords or name contain illegal chars: %s", c.Url)
-  }
+	desc, err := parser.Get("details", "desc")

-  return nil
+	c.Name = name
+	c.Desc = desc
+	c.Author = author
+	c.Keywords = strings.ReplaceAll(keywords, ",", ", ")
+
+	if !lib.IsStringValid(c.Name) ||
+		!lib.IsStringValid(c.Desc) ||
+		!lib.IsStringValid(c.Author) ||
+		!lib.IsStringValid(c.Keywords) {
+		return fmt.Errorf("keywords or name contain illegal chars: %s", c.Url)
+	}
+
+	return nil
 }

 func GetConfigs() ([]Config, error) {
-  var data map[string][]Config
+	var data map[string][]Config

-  configs_path := path.Join(lib.CONTENT_PATH, "configs.json")
-  raw, err := os.ReadFile(configs_path)
-  if err != nil {
-    return nil, err
-  }
+	configs_path := path.Join(lib.CONTENT_PATH, "configs.json")
+	raw, err := os.ReadFile(configs_path)
+	if err != nil {
+		return nil, err
+	}

-  err = json.Unmarshal(raw, &data)
-  if err != nil {
-    return nil, err
-  }
+	err = json.Unmarshal(raw, &data)
+	if err != nil {
+		return nil, err
+	}

-  if _, ok := data["list"]; !ok {
-    return nil, fmt.Errorf("json data does not contain the list key")
-  }
+	if _, ok := data["list"]; !ok {
+		return nil, fmt.Errorf("json data does not contain the list key")
+	}

-  for i := range data["list"] {
-    err = LoadConfig(&data["list"][i])
-    if err != nil {
-      return nil, err
-    }
-  }
+	for i := range data["list"] {
+		if err = data["list"][i].Load(); err != nil {
+			return nil, err
+		}
+	}

-  return data["list"], nil
+	return data["list"], nil
 }

-func ConfigsRoute(c *fiber.Ctx) error{
-  con, err := lib.GetContent("", "configs")
-  if err != nil {
-    log.Printf("GetContent failed: %s", err.Error())
-    return lib.RenderError(c, 500)
-  }
-  
-  configs, err := GetConfigs()
-  if err != nil {
-    log.Printf("GetConfigs failed: %s", err.Error())
-    return lib.RenderError(c, 500)
-  }
-  
-  return c.Render("configs", fiber.Map{
-    "content": con,
-    "list": configs,
-  })
+func GET_Configs(c *fiber.Ctx) error {
+	var (
+		err     error
+		con     lib.Content
+		configs []Config
+	)
+
+	if con, err = lib.GetContent("", "configs"); err != nil {
+		log.Error("GetContent failed: %s", err.Error())
+		return lib.RenderError(c, 500)
+	}
+
+	if configs, err = GetConfigs(); err != nil {
+		log.Error("GetConfigs failed: %s", err.Error())
+		return lib.RenderError(c, 500)
+	}
+
+	return c.Render("configs", fiber.Map{
+		"content": con,
+		"list":    configs,
+	})
 }

-func ConfigRoute(c *fiber.Ctx) error{
-  name := c.Params("name")
+func GET_Config(c *fiber.Ctx) error {
+	var (
+		err     error
+		name    string
+		configs []Config
+	)

-  configs, err := GetConfigs()
-  if err != nil {
-    log.Printf("GetConfigs failed: %s", err.Error())
-    return lib.RenderError(c, 500)
-  }
+	name = c.Params("name")

-  for _, cur := range configs {
-    if cur.Name == name || cur.Name+".git" == name {
-      return c.Status(301).Redirect(cur.Redirect)
-    }
-  }
+	if configs, err = GetConfigs(); err != nil {
+		log.Error("GetConfigs failed: %s", err.Error())
+		return lib.RenderError(c, 500)
+	}

-  return lib.RenderError(c, 404)
+	for _, cur := range configs {
+		if cur.Name == name || cur.Name+".git" == name {
+			return c.Status(301).Redirect(cur.Redirect)
+		}
+	}
+
+	return lib.RenderError(c, 404)
 }
--- a/routes/download.go
+++ b/routes/download.go
@ -1,20 +1,23 @@
 package routes

 import (
-	"log"
-
 	"git.matterlinux.xyz/Matter/website/lib"
+	"git.matterlinux.xyz/Matter/website/log"
 	"github.com/gofiber/fiber/v2"
 )

-func DownloadRoute(c *fiber.Ctx) error{
-  con, err := lib.GetContent("", "download")
-  if err != nil {
-    log.Printf("GetContent failed: %s", err.Error())
-    return lib.RenderError(c, 500)
-  }
+func GET_Download(c *fiber.Ctx) error {
+	var (
+		con lib.Content
+		err error
+	)

-  return c.Render("download", fiber.Map{
-    "content": con,
-  })
+	if con, err = lib.GetContent("", "download"); err != nil {
+		log.Error("GetContent failed: %s", err.Error())
+		return lib.RenderError(c, 500)
+	}
+
+	return c.Render("download", fiber.Map{
+		"content": con,
+	})
 }
--- a/routes/index.go
+++ b/routes/index.go
@ -1,20 +1,23 @@
 package routes

 import (
-	"log"
-
 	"git.matterlinux.xyz/Matter/website/lib"
+	"git.matterlinux.xyz/Matter/website/log"
 	"github.com/gofiber/fiber/v2"
 )

-func IndexRoute(c *fiber.Ctx) error{
-  con, err := lib.GetContent("", "index")
-  if err != nil {
-    log.Printf("GetContent failed: %s", err.Error())
-    return lib.RenderError(c, 500)
-  }
+func GET_Index(c *fiber.Ctx) error {
+	var (
+		err error
+		con lib.Content
+	)

-  return c.Render("index", fiber.Map{
-    "readme": con,
-  })
+	if con, err = lib.GetContent("", "index"); err != nil {
+		log.Error("GetContent failed: %s", err.Error())
+		return lib.RenderError(c, 500)
+	}
+
+	return c.Render("index", fiber.Map{
+		"readme": con,
+	})
 }
--- a/routes/news.go
+++ b/routes/news.go
@ -1,69 +1,69 @@
 package routes

 import (
-	"log"
 	"sort"

 	"git.matterlinux.xyz/Matter/website/lib"
+	"git.matterlinux.xyz/Matter/website/log"
 	"github.com/gofiber/fiber/v2"
 )

-func NewsRoute(c *fiber.Ctx) error {
-  contents, err := lib.ListContent("news")
-  if err != nil {
-    log.Printf("ListContent failed: %s", err.Error())
-    return lib.RenderError(c, 500)
-  }
+func GET_News(c *fiber.Ctx) error {
+	contents, err := lib.ListContent("news")
+	if err != nil {
+		log.Error("ListContent failed: %s", err.Error())
+		return lib.RenderError(c, 500)
+	}

-  sort.Slice(contents, func(i, j int) bool { 
-    time1, err := lib.TimeFromString(contents[i].Date) 
-    if err != nil { 
-      log.Printf("Bad date while sorting: %s", err.Error())
-      return false 
-    }
+	sort.Slice(contents, func(i, j int) bool {
+		time1, err := lib.TimeFromString(contents[i].Date)
+		if err != nil {
+			log.Error("Bad date while sorting: %s", err.Error())
+			return false
+		}

-    time2, err := lib.TimeFromString(contents[j].Date) 
-    if err != nil { 
-      log.Printf("Bad date while sorting: %s", err.Error())
-      return false 
-    }
-   
-    return time1.After(time2) 
-  })
+		time2, err := lib.TimeFromString(contents[j].Date)
+		if err != nil {
+			log.Error("Bad date while sorting: %s", err.Error())
+			return false
+		}

-  return c.Render("news", fiber.Map{
-    "news": contents,
-  })
+		return time1.After(time2)
+	})
+
+	return c.Render("news", fiber.Map{
+		"news": contents,
+	})
 }

-func PostRoute(c *fiber.Ctx) error {
-  postid := c.Params("id")
-  if len(postid) == 0 {
-    return lib.RenderError(c, 404)
-  }
+func GET_New(c *fiber.Ctx) error {
+	postid := c.Params("id")
+	if len(postid) == 0 {
+		return lib.RenderError(c, 404)
+	}

-  contents, err := lib.ListContent("news")
-  if err != nil {
-    log.Printf("ListContent failed: %s", err.Error())
-    return lib.RenderError(c, 500)
-  }
+	contents, err := lib.ListContent("news")
+	if err != nil {
+		log.Error("ListContent failed: %s", err.Error())
+		return lib.RenderError(c, 500)
+	}

-  for _, con := range contents {
-    if(con.ID != postid) {
-      continue
-    }
+	for _, con := range contents {
+		if con.ID != postid {
+			continue
+		}

-    con, err = lib.GetContent(con.Dir, con.Name)
-    if err != nil {
-      log.Printf("ListContent failed: %s", err.Error())
-      return lib.RenderError(c, 500)
-    }
+		con, err = lib.GetContent(con.Dir, con.Name)
+		if err != nil {
+			log.Error("ListContent failed: %s", err.Error())
+			return lib.RenderError(c, 500)
+		}

-    return c.Render("post", fiber.Map{
-      "title": con.Title,
-      "post": con,
-    }) 
-  }
+		return c.Render("post", fiber.Map{
+			"title": con.Title,
+			"post":  con,
+		})
+	}

-  return lib.RenderError(c, 404) 
+	return lib.RenderError(c, 404)
 }
--- a/routes/wiki.go
+++ b/routes/wiki.go
@ -1,54 +1,62 @@
 package routes

 import (
-	"log"
-
 	"git.matterlinux.xyz/Matter/website/lib"
+	"git.matterlinux.xyz/Matter/website/log"
 	"github.com/gofiber/fiber/v2"
 )

-func WikiMainRoute(c *fiber.Ctx) error {
-  con, err := lib.GetContent("wiki", "main")
-  if err != nil {
-    log.Printf("GetContent failed: %s", err.Error())
-    return lib.RenderError(c, 500)
-  } 
+func GET_Wiki(c *fiber.Ctx) error {
+	var (
+		con lib.Content
+		err error
+	)

-  return c.Render("post", fiber.Map{
-    "title": "Wiki",
-    "post": con,
-  })
+	if con, err = lib.GetContent("wiki", "main"); err != nil {
+		log.Error("GetContent failed: %s", err.Error())
+		return lib.RenderError(c, 500)
+	}
+
+	return c.Render("post", fiber.Map{
+		"title": "Wiki",
+		"post":  con,
+	})
 }

-func WikiRoute(c *fiber.Ctx) error{
-  docid := c.Params("id")
-  if len(docid) == 0 {
-    return lib.RenderError(c, 404)
-  }
+func GET_WikiPage(c *fiber.Ctx) error {
+	var (
+		contents []lib.Content
+		err      error
+	)

-  contents, err := lib.ListContent("wiki")
-  if err != nil {
-    log.Printf("ListContent failed: %s", err.Error())
-    return lib.RenderError(c, 500)
-  }
+	docid := c.Params("id")
+	if len(docid) == 0 {
+		return lib.RenderError(c, 404)
+	}

-  for _, con := range contents {
-    if(con.ID != docid) {
-      continue
-    }
+	if contents, err = lib.ListContent("wiki"); err != nil {
+		log.Error("ListContent failed: %s", err.Error())
+		return lib.RenderError(c, 500)
+	}

-    con, err = lib.GetContent(con.Dir, con.Name)
-    if err != nil {
-      log.Printf("GetContent failed: %s", err.Error())
-      return lib.RenderError(c, 500)
-    }
+	for _, con := range contents {
+		if con.ID != docid {
+			continue
+		}

-    con.Title = "Wiki: "+con.Title
-    return c.Render("post", fiber.Map{
-      "title": con.Title,
-      "post": con,
-    }) 
-  }
+		con, err = lib.GetContent(con.Dir, con.Name)
+		if err != nil {
+			log.Error("GetContent failed: %s", err.Error())
+			return lib.RenderError(c, 500)
+		}

-  return lib.RenderError(c, 404) 
+		con.Title = "Wiki: " + con.Title
+
+		return c.Render("post", fiber.Map{
+			"title": con.Title,
+			"post":  con,
+		})
+	}
+
+	return lib.RenderError(c, 404)
 }