Changeset 55 in code for trunk/cmd

Timestamp:

Jan 19, 2024, 10:49:09 AM (17 months ago)

Author:

yakumo.izuru

Message:

「swagger」サポートを削除し、あちこちのバグを修正

Location:

trunk/cmd/simplytranslate

Files:

• flag.go (added)
• main.go (modified) (9 diffs)
• readconf.go (added)

trunk/cmd/simplytranslate/main.go

@@ -6 +6 @@
         "net/url"
         "time"
-        "flag"
+        "runtime"
 
         "git.chaotic.ninja/yakumo.izuru/simplytranslate/engines"
         "github.com/gofiber/fiber/v2"
         "github.com/gofiber/template/html/v2"
-        "gopkg.in/ini.v1"
 )
 
@@ -19 +18 @@
         tmplpath string
 }
-func readConf(file string) error {
-        cfg, err := ini.Load(file)
-        if err != nil {
-                return err
-        }
-        conf.listen = cfg.Section("").Key("listen").String()
-        conf.staticpath = cfg.Section("").Key("rootdir").String()
-        conf.tmplpath = cfg.Section("").Key("tmplpath").String()
-
-        return nil
-}
 func main() {
-        var configfile string
-        flag.StringVar(&configfile, "f", "", "Configuration file")
-        flag.Parse()
+        parseFlags()
 
         if configfile != "" {
@@ -39 +25 @@
         }
 
+        // Default settings
         conf.listen = "127.0.0.1:5000"
         conf.staticpath = "./static"
@@ -49 +36 @@
                 Views: engine,
         })
+
+        api := app.Group("/api")
 
         app.All("/", func(c *fiber.Ctx) error {
@@ -149 +138 @@
         })
 
-        app.All("/api/translate", func(c *fiber.Ctx) error {
+        api.All("/api/translate", func(c *fiber.Ctx) error {
                 from := ""
                 to := ""
@@ -180 +169 @@
         })
 
-        app.Get("/api/source_languages", func(c *fiber.Ctx) error {
+        api.Get("/api/source_languages", func(c *fiber.Ctx) error {
                 engine := c.Query("engine")
                 if _, ok := engines.Engines[engine]; !ok || engine == "" {
@@ -192 +181 @@
         })
 
-        app.Get("/api/target_languages", func(c *fiber.Ctx) error {
+        api.Get("/api/target_languages", func(c *fiber.Ctx) error {
                 engine := c.Query("engine")
                 if _, ok := engines.Engines[engine]; !ok || engine == "" {
@@ -204 +193 @@
         })
 
-        app.Get("/api/tts", func(c *fiber.Ctx) error {
+        api.Get("/api/tts", func(c *fiber.Ctx) error {
                 engine := c.Query("engine")
                 if _, ok := engines.Engines[engine]; !ok || engine == "" {
@@ -231 +220 @@
                 }
         })
-
+        api.Get("/version", func(c *fiber.Ctx) error {
+                return c.JSON(fiber.Map{
+                        "fiberversion": fiber.Version,
+                        "goversion": runtime.Version(),
+                })
+        })
         app.Post("/switchlanguages", func(c *fiber.Ctx) error {
                 if c.Cookies("from") != "" {