diff --git a/assets/js/uploader.js b/assets/js/uploader.js
index ee6732cc..7f87ef9a 100644
--- a/assets/js/uploader.js
+++ b/assets/js/uploader.js
@@ -9,17 +9,28 @@
const invalid = "is-invalid";
- // Modal elements
- const pouetM = document.getElementById("uploaderPouet");
+ // Poeut modal elements
+ const pouetM = document.getElementById("uploader-pouet");
if (pouetM == null) {
throw new Error("The uploader-pouet element is null.");
}
+ pouetM.addEventListener("shown.bs.modal", function () {
+ poeutInput.focus();
+ });
const pouetModal = new bootstrap.Modal(pouetM);
+ const poeutInput = document.getElementById("pouet-submission");
+ if (poeutInput == null) {
+ throw new Error("The pouet-submission element is null.");
+ }
- const demozooM = document.getElementById("uploader-demozoo");
+ // Demozoo modal elements
+ const demozooM = document.getElementById("uploader-demozoo");
if (demozooM == null) {
throw new Error("The uploader-demozoo element is null.");
}
+ demozooM.addEventListener("shown.bs.modal", function () {
+ demozooInput.focus();
+ });
const demozooModal = new bootstrap.Modal(demozooM);
const demozooInput = document.getElementById("demozoo-submission");
if (demozooInput == null) {
@@ -71,30 +82,38 @@
// Keyboard shortcuts event listener
document.addEventListener("keydown", function (event) {
+ const demozoo = "d",
+ pouet = "p",
+ intro = "i",
+ nfo = "n",
+ graphic = "g",
+ magazine = "m",
+ advanced = "a",
+ glossaryOfTerms = "t";
if (event.ctrlKey && event.altKey) {
switch (event.key) {
- case "d":
+ case demozoo:
demozooModal.show();
break;
- case "p":
+ case pouet:
pouetModal.show();
break;
- case "i":
+ case intro:
demozooModal.show();
break;
- case "n": // n for nfo
+ case nfo:
txtModal.show();
break;
- case "g": // g for gfx
+ case graphic:
imgModal.show();
break;
- case "m":
+ case magazine:
magModal.show();
break;
- case "a":
+ case advanced:
advModal.show();
break;
- case "t": // t for terms
+ case glossaryOfTerms:
glossModal.show();
break;
}
@@ -186,17 +205,6 @@
const imgFrm = document.getElementById("imageUploader");
const magFrm = document.getElementById("magUploader");
const advFrm = document.getElementById("advancedUploader");
- // Focus on the first input field when the modal is shown
- demozooM.addEventListener("shown.bs.modal", function () {
- demozooInput.focus();
- });
- // Focus on the first input field when the modal is shown
- const pouetId = document.getElementById("pouetProdsID");
- document
- .getElementById("uploaderPouet")
- .addEventListener("shown.bs.modal", function () {
- pouetId.focus();
- });
// Elements for the intro uploader
const introFile = document.getElementById("introFile");
diff --git a/handler/app/context.go b/handler/app/context.go
index 73bceb5f..6e781bf9 100644
--- a/handler/app/context.go
+++ b/handler/app/context.go
@@ -1041,7 +1041,7 @@ func ProdPouet(logr *zap.SugaredLogger, c echo.Context, id string) error {
if logr == nil {
return InternalErr(logr, c, name, ErrZap)
}
- p := pouet.Pouet{}
+ p := pouet.Production{}
i, err := strconv.Atoi(id)
if err != nil {
return c.String(http.StatusNotFound, err.Error())
diff --git a/handler/htmx/htmx.go b/handler/htmx/htmx.go
index 5d83d4d0..0697a475 100644
--- a/handler/htmx/htmx.go
+++ b/handler/htmx/htmx.go
@@ -31,6 +31,12 @@ func Routes(logr *zap.SugaredLogger, e *echo.Echo) *echo.Echo {
submit.POST("/demozoo/production/submit/:id", func(x echo.Context) error {
return DemozooSubmit(logr, x)
})
+ submit.POST("/pouet/production", func(x echo.Context) error {
+ return PouetProd(x)
+ })
+ submit.POST("/pouet/production/submit/:id", func(x echo.Context) error {
+ return PouetSubmit(logr, x)
+ })
submit.POST("/search/releaser", func(x echo.Context) error {
return SearchReleaser(logr, x)
})
diff --git a/handler/htmx/pouet.go b/handler/htmx/pouet.go
new file mode 100644
index 00000000..d781d8d4
--- /dev/null
+++ b/handler/htmx/pouet.go
@@ -0,0 +1,188 @@
+package htmx
+
+import (
+ "context"
+ "fmt"
+ "net/http"
+ "strconv"
+ "strings"
+
+ "github.com/Defacto2/server/internal/helper"
+ "github.com/Defacto2/server/internal/postgres"
+ "github.com/Defacto2/server/internal/pouet"
+ "github.com/Defacto2/server/model"
+ "github.com/labstack/echo/v4"
+ "go.uber.org/zap"
+)
+
+// PouetProd fetches the multiple download_links values from the
+// Pouet production API and attempts to download and save one of the
+// linked files. If multiple links are found, the first link is used as
+// they should all point to the same asset.
+//
+// Both the Pouet production ID param and the Defacto2 UUID query
+// param values are required as params to fetch the production data and
+// to save the file to the correct filename.
+func PouetProd(c echo.Context) error {
+ sid := c.FormValue("pouet-submission")
+ id, err := strconv.Atoi(sid)
+ if err != nil {
+ return c.String(http.StatusNotAcceptable,
+ "The Pouet production ID must be a numeric value, "+sid)
+ }
+
+ db, err := postgres.ConnectDB()
+ if err != nil {
+ return ErrDB
+ }
+ defer db.Close()
+ ctx := context.Background()
+
+ deleted, key, err := model.FindPouetFile(ctx, db, int64(id))
+ if err != nil {
+ return c.String(http.StatusServiceUnavailable,
+ "error, the database query failed")
+ }
+ if key != 0 && !deleted {
+ html := fmt.Sprintf("This Pouet production is already in use .", helper.ObfuscateID(key))
+ return c.HTML(http.StatusOK, html)
+ }
+ if key != 0 && deleted {
+ return c.HTML(http.StatusOK, "This Pouet production is already in use.")
+ }
+
+ resp, err := PouetValid(c, id)
+ if err != nil {
+ return err
+ } else if resp.Prod.ID == "" {
+ return nil
+ }
+ if !resp.Success {
+ return c.String(http.StatusNotFound, "error, the Pouet production ID is not found")
+ }
+
+ prod := resp.Prod
+ if pid, err := strconv.Atoi(prod.ID); err != nil {
+ return c.String(http.StatusNotFound, "error, the Pouet production ID is invalid")
+ } else if pid < 1 {
+ return nil
+ }
+
+ info := []string{prod.Title}
+ if len(prod.Groups) > 0 {
+ info = append(info, "by")
+ for _, a := range prod.Groups {
+ info = append(info, a.Name)
+ }
+ }
+ if prod.ReleaseDate != "" {
+ info = append(info, "on", prod.ReleaseDate)
+ }
+ if prod.Platfs.String() != "" {
+ info = append(info, "for", prod.Platfs.String())
+ }
+
+ html := ``
+ html += fmt.Sprintf(`Submit ID %d `, id, id)
+ html += `
`
+ html += fmt.Sprintf(`%s
`, strings.Join(info, " "))
+ return c.HTML(http.StatusOK, html)
+}
+
+// PouetValid fetches the first usable download link from the Pouet API.
+// The production ID is validated and the production is checked to see if it
+// is suitable for Defacto2. If the production is not suitable, an empty
+// production is returned with a htmx message.
+func PouetValid(c echo.Context, id int) (pouet.Response, error) {
+ if id < 1 {
+ return pouet.Response{},
+ c.String(http.StatusNotAcceptable, fmt.Sprintf("invalid id: %d", id))
+ }
+
+ var prod pouet.Response
+ if err := prod.Get(id); err != nil {
+ return pouet.Response{}, c.String(http.StatusNotFound, err.Error())
+ }
+
+ plat := prod.Prod.Platfs
+ sect := prod.Prod.Types
+ if !plat.Valid() || !sect.Valid() {
+ return pouet.Response{}, c.HTML(http.StatusOK,
+ fmt.Sprintf("Production %d is probably not suitable for Defacto2."+
+ "