mirror of
https://codeberg.org/aryak/mozhi
synced 2024-12-22 18:39:44 +05:30
Merge pull request 'feat: support for long inputs and post requests' (#7) from Bnyro/mozhi:fix-long-inputs into master
Reviewed-on: https://codeberg.org/aryak/mozhi/pulls/7
This commit is contained in:
commit
3f7ba6b071
@ -75,10 +75,10 @@ func HandleTTS(c *fiber.Ctx) error {
|
||||
// @Success 200 {object} libmozhi.LangOut
|
||||
// @Router /api/translate [get]
|
||||
func HandleTranslate(c *fiber.Ctx) error {
|
||||
engine := utils.Sanitize(c.Query("engine"), "alpha")
|
||||
from := utils.Sanitize(c.Query("from"), "alpha")
|
||||
to := utils.Sanitize(c.Query("to"), "alpha")
|
||||
text := c.Query("text")
|
||||
engine := utils.Sanitize(getQueryOrFormValue(c, "engine"), "alpha")
|
||||
from := utils.Sanitize(getQueryOrFormValue(c, "from"), "alpha")
|
||||
to := utils.Sanitize(getQueryOrFormValue(c, "to"), "alpha")
|
||||
text := getQueryOrFormValue(c, "text")
|
||||
if engine == "" || from == "" || to == "" || text == "" {
|
||||
return fiber.NewError(fiber.StatusBadRequest, "from, to, engine, text are required query strings.")
|
||||
}
|
||||
|
@ -1,9 +1,11 @@
|
||||
package pages
|
||||
|
||||
import (
|
||||
"os"
|
||||
"slices"
|
||||
|
||||
"codeberg.org/aryak/libmozhi"
|
||||
"github.com/gofiber/fiber/v2"
|
||||
"os"
|
||||
)
|
||||
|
||||
func envTrueNoExist(env string) bool {
|
||||
@ -35,7 +37,6 @@ func engineList() map[string]string {
|
||||
return engines
|
||||
}
|
||||
|
||||
|
||||
// DeduplicateLists deduplicates a slice of List based on the Id field
|
||||
func deDuplicateLists(input []libmozhi.List) []libmozhi.List {
|
||||
// Create a map to store unique Ids
|
||||
@ -67,23 +68,25 @@ func langListMerge(engines map[string]string) ([]libmozhi.List, []libmozhi.List)
|
||||
return deDuplicateLists(sl), deDuplicateLists(tl)
|
||||
}
|
||||
|
||||
func getQueryOrFormValue(c *fiber.Ctx, key string) string {
|
||||
if c.Method() == "POST" {
|
||||
return c.FormValue(key)
|
||||
} else {
|
||||
return c.Query(key)
|
||||
}
|
||||
}
|
||||
|
||||
func HandleIndex(c *fiber.Ctx) error {
|
||||
engines := engineList()
|
||||
var engine string
|
||||
var originalText string
|
||||
if c.Query("engine") == "" {
|
||||
var enginesAsArray []string
|
||||
for engine := range engines {
|
||||
enginesAsArray = append(enginesAsArray, engine)
|
||||
}
|
||||
|
||||
var engine = getQueryOrFormValue(c, "engine")
|
||||
if engine == "" || !slices.Contains(enginesAsArray, engine) {
|
||||
engine = "google"
|
||||
}
|
||||
if c.Query("engine") != "" {
|
||||
for key, _ := range engines {
|
||||
if c.Query("engine") == key {
|
||||
engine = c.Query("engine")
|
||||
}
|
||||
}
|
||||
if engine == "" {
|
||||
engine = "google"
|
||||
}
|
||||
}
|
||||
|
||||
var sourceLanguages []libmozhi.List
|
||||
var targetLanguages []libmozhi.List
|
||||
@ -94,9 +97,10 @@ func HandleIndex(c *fiber.Ctx) error {
|
||||
targetLanguages, _ = libmozhi.LangList(engine, "tl")
|
||||
}
|
||||
|
||||
originalText = c.Query("text")
|
||||
to := c.Query("to")
|
||||
from := c.Query("from")
|
||||
originalText := getQueryOrFormValue(c, "text")
|
||||
to := getQueryOrFormValue(c, "to")
|
||||
from := getQueryOrFormValue(c, "from")
|
||||
|
||||
var translation libmozhi.LangOut
|
||||
var translationExists bool
|
||||
var transall []libmozhi.LangOut
|
||||
|
@ -85,6 +85,7 @@ func Serve(port string) {
|
||||
|
||||
api := app.Group("/api")
|
||||
api.Get("/translate", pages.HandleTranslate)
|
||||
api.Post("/translate", pages.HandleTranslate)
|
||||
api.Get("/source_languages", pages.HandleSourceLanguages)
|
||||
api.Get("/target_languages", pages.HandleTargetLanguages)
|
||||
api.Get("/tts", pages.HandleTTS)
|
||||
@ -97,6 +98,7 @@ func Serve(port string) {
|
||||
api.Get("/swagger/*", swagger.HandlerDefault) // default
|
||||
|
||||
app.Get("/", pages.HandleIndex)
|
||||
app.Post("/", pages.HandleIndex)
|
||||
app.Get("/about", pages.HandleAbout)
|
||||
app.Get("/switchlanguages", func(c *fiber.Ctx) error {
|
||||
engine := c.Query("engine")
|
||||
|
@ -14,8 +14,8 @@
|
||||
</div>
|
||||
|
||||
<br /><br />
|
||||
<form action="/" method="GET" id="translation-form">
|
||||
<!-- This hidden input is so that the engine gets sent in the GET request even though its not declared here -->
|
||||
<form action="/" method="POST" id="translation-form">
|
||||
<!-- This hidden input is so that the engine gets sent in the request even though its not declared here -->
|
||||
<input name="engine" value="{{.Engine}}" type="hidden" />
|
||||
|
||||
<div class="wrap languages">
|
||||
|
Loading…
Reference in New Issue
Block a user