fix: fixup multiple installs (strings.Clone)

Signed-off-by: Ettore Di Giacinto <[email protected]>

Author: mudler

core/http/elements/gallery.go

@@ -23,6 +23,21 @@ func DoneProgress(uid string) string {
 	).Render()
 }
 
+func ErrorProgress(err string) string {
+	return elem.Div(
+		attrs.Props{},
+		elem.H3(
+			attrs.Props{
+				"role":      "status",
+				"id":        "pblabel",
+				"tabindex":  "-1",
+				"autofocus": "",
+			},
+			elem.Text("Error"+err),
+		),
+	).Render()
+}
+
 func ProgressBar(progress string) string {
 	return elem.Div(attrs.Props{
 		"class":           "progress",

core/http/routes/ui.go

@@ -59,22 +59,25 @@ func RegisterUIRoutes(app *fiber.App,
 
 	// https://htmx.org/examples/progress-bar/
 	app.Post("/browse/install/model/:id", auth, func(c *fiber.Ctx) error {
-		galleryID := c.Params("id")
+		galleryID := strings.Clone(c.Params("id")) // strings.Clone is required!
 
-		uuid, err := uuid.NewUUID()
+		id, err := uuid.NewUUID()
 		if err != nil {
 			return err
 		}
 
+		uid := id.String()
+
+		op := gallery.GalleryOp{
+			Id:          uid,
+			GalleryName: galleryID,
+			Galleries:   appConfig.Galleries,
+		}
 		go func() {
-			galleryService.C <- gallery.GalleryOp{
-				Id:          uuid.String(),
-				GalleryName: galleryID,
-				Galleries:   appConfig.Galleries,
-			}
+			galleryService.C <- op
 		}()
 
-		return c.SendString(elements.StartProgressBar(uuid.String(), "0"))
+		return c.SendString(elements.StartProgressBar(uid, "0"))
 	})
 
 	// https://htmx.org/examples/progress-bar/
@@ -87,10 +90,13 @@ func RegisterUIRoutes(app *fiber.App,
 			return c.SendString(elements.ProgressBar("0"))
 		}
 
-		if status.Processed || status.Progress == 100 {
+		if status.Progress == 100 {
 			c.Set("HX-Trigger", "done")
 			return c.SendString(elements.ProgressBar("100"))
 		}
+		if status.Error != nil {
+			return c.SendString(elements.ErrorProgress(status.Error.Error()))
+		}
 
 		return c.SendString(elements.ProgressBar(fmt.Sprint(status.Progress)))
 	})

pkg/downloader/progress.go

@@ -20,6 +20,10 @@ func (pw *progressWriter) Write(p []byte) (n int, err error) {
 		percentage := float64(pw.written) / float64(pw.total) * 100
 		if pw.totalFiles > 1 {
 			// This is a multi-file download
+			// so we need to adjust the percentage
+			// to reflect the progress of the whole download
+			// This is the file pw.fileNo of pw.totalFiles files. We assume that
+			// the files before successfully downloaded.
 			percentage = percentage / float64(pw.totalFiles)
 			if pw.fileNo > 1 {
 				percentage += float64(pw.fileNo-1) * 100 / float64(pw.totalFiles)

pkg/gallery/op.go

@@ -1,11 +1,12 @@
 package gallery
 
 type GalleryOp struct {
-	Req         GalleryModel
 	Id          string
-	Galleries   []Gallery
 	GalleryName string
 	ConfigURL   string
+
+	Req       GalleryModel
+	Galleries []Gallery
 }
 
 type GalleryOpStatus struct {