From 262439d43001b6e258077d933c6f5a39b9f63abf Mon Sep 17 00:00:00 2001
From: Seongmin Lee <git@boltless.me>
Date: Sat, 23 May 2026 00:46:07 +0900
Subject: [PATCH] appview/strings: multi-file support

Signed-off-by: Seongmin Lee <git@boltless.me>
---
 .../templates/strings/fragments/formBody.html |   2 -
 appview/strings/strings.go                    | 125 +++++++++++-------
 2 files changed, 78 insertions(+), 49 deletions(-)

diff --git a/appview/pages/templates/strings/fragments/formBody.html b/appview/pages/templates/strings/fragments/formBody.html
index 4845fc73..b556f4a8 100644
--- a/appview/pages/templates/strings/fragments/formBody.html
+++ b/appview/pages/templates/strings/fragments/formBody.html
@@ -23,7 +23,6 @@
 <div class="flex justify-between items-center">
   <div id="error"></div>
   <div class="flex gap-2">
-    <!-- TODO: accept multiple files in a string
     <button
       type="button"
       class="w-fit btn rounded py-0"
@@ -37,7 +36,6 @@
         Add file
       </span>
     </button>
-    -->
     <button
       type="submit"
       class="w-fit btn-create group"
diff --git a/appview/strings/strings.go b/appview/strings/strings.go
index bd1f36c3..ad66ad3f 100644
--- a/appview/strings/strings.go
+++ b/appview/strings/strings.go
@@ -12,8 +12,10 @@ import (
 	"net/http"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
+	"golang.org/x/sync/errgroup"
 	"tangled.org/core/api/tangled"
 	"tangled.org/core/appview/db"
 	"tangled.org/core/appview/middleware"
@@ -349,39 +351,54 @@ func (s *Strings) edit(w http.ResponseWriter, r *http.Request) {
 			description = &val
 		}
 
-		filename := r.FormValue("filename")
-		if filename == "" {
-			fail("Empty filename.", nil)
-			return
-		}
-
-		content := r.FormValue("content")
-		if content == "" {
-			fail("Empty content.", nil)
+		fileNames := r.Form["filename"]
+		fileContents := r.Form["content"]
+		if len(fileNames) != len(fileContents) {
+			s.Pages.Notice(w, "error", "mismatched file name & content lengths")
 			return
 		}
 
 		client, err := s.OAuth.AuthorizedClient(r)
 		if err != nil {
-			fail("Failed to create record.", err)
+			l.Error("failed to get authorized client", "err", err)
+			s.Pages.Notice(w, "error", "Failed to create string.")
 			return
 		}
 
-		blob, err := xrpc.RepoUploadBlob(ctx, client, strings.NewReader(content), textPlain)
-		if err != nil {
-			fail("Failed to create record.", err)
+		files := make([]models.String_File, len(fileNames))
+		var mu sync.Mutex
+
+		g, gctx := errgroup.WithContext(ctx)
+		g.SetLimit(10)
+		for i := range len(files) {
+			g.Go(func() error {
+				blob, err := xrpc.RepoUploadBlob(gctx, client, strings.NewReader(fileContents[i]), textPlain)
+				if err != nil {
+					return err
+				}
+				if blob.Blob == nil {
+					return fmt.Errorf("uploadBlob: blob is missing from response")
+				}
+
+				mu.Lock()
+				files[i] = models.String_File{
+					Name:    fileNames[i],
+					Content: *blob.Blob,
+				}
+				mu.Unlock()
+				return nil
+			})
+		}
+		if err := g.Wait(); err != nil {
+			l.Warn("failed to upload blobs", "err", err)
+			s.Pages.Notice(w, "error", "Failed to upload blobs.")
 			return
 		}
 
 		newString := oldString
 		newString.Title = title
 		newString.Description = description
-		newString.Files = []models.String_File{
-			{
-				Name:    filename,
-				Content: *blob.Blob,
-			},
-		}
+		newString.Files = files
 
 		// first replace the existing record in the PDS
 		var exCid string
@@ -414,8 +431,7 @@ func (s *Strings) edit(w http.ResponseWriter, r *http.Request) {
 
 		// if that went okay, updated the db
 		if err = db.AddString(s.Db, newString); err != nil {
-			fail("Failed to update string.", err)
-			return
+			l.Error("db: failed to update string", "err", err)
 		}
 
 		s.Notifier.EditString(ctx, &newString)
@@ -440,9 +456,9 @@ func (s *Strings) create(w http.ResponseWriter, r *http.Request) {
 			l.Error("failed to render", "err", err)
 		}
 	case http.MethodPost:
-		fail := func(msg string, err error) {
-			l.Error(msg, "err", err)
-			s.Pages.Notice(w, "error", msg)
+		if err := r.ParseForm(); err != nil {
+			s.Pages.Notice(w, "error", "bad request")
+			return
 		}
 
 		var title *string
@@ -455,27 +471,47 @@ func (s *Strings) create(w http.ResponseWriter, r *http.Request) {
 			description = &val
 		}
 
-		filename := r.FormValue("filename")
-		if filename == "" {
-			fail("Empty filename.", nil)
-			return
-		}
-
-		content := r.FormValue("content")
-		if content == "" {
-			fail("Empty content.", nil)
+		fileNames := r.Form["filename"]
+		fileContents := r.Form["content"]
+		if len(fileNames) != len(fileContents) {
+			s.Pages.Notice(w, "error", "mismatched file name & content lengths")
 			return
 		}
 
 		client, err := s.OAuth.AuthorizedClient(r)
 		if err != nil {
-			fail("Failed to create record.", err)
+			l.Error("failed to get authorized client", "err", err)
+			s.Pages.Notice(w, "error", "Failed to create string.")
 			return
 		}
 
-		blob, err := xrpc.RepoUploadBlob(ctx, client, strings.NewReader(content), textPlain)
-		if err != nil {
-			fail("Failed to create record.", err)
+		files := make([]models.String_File, len(fileNames))
+		var mu sync.Mutex
+
+		g, gctx := errgroup.WithContext(ctx)
+		g.SetLimit(10)
+		for i := range len(files) {
+			g.Go(func() error {
+				blob, err := xrpc.RepoUploadBlob(gctx, client, strings.NewReader(fileContents[i]), textPlain)
+				if err != nil {
+					return err
+				}
+				if blob.Blob == nil {
+					return fmt.Errorf("uploadBlob: blob is missing from response")
+				}
+
+				mu.Lock()
+				files[i] = models.String_File{
+					Name:    fileNames[i],
+					Content: *blob.Blob,
+				}
+				mu.Unlock()
+				return nil
+			})
+		}
+		if err := g.Wait(); err != nil {
+			l.Warn("failed to upload blobs", "err", err)
+			s.Pages.Notice(w, "error", "Failed to upload blobs.")
 			return
 		}
 
@@ -484,13 +520,8 @@ func (s *Strings) create(w http.ResponseWriter, r *http.Request) {
 			Rkey:        syntax.RecordKey(tid.TID()),
 			Title:       title,
 			Description: description,
-			Files: []models.String_File{
-				{
-					Name:    filename,
-					Content: *blob.Blob,
-				},
-			},
-			Created: time.Now(),
+			Files:       files,
+			Created:     time.Now(),
 		}
 
 		resp, err := comatproto.RepoPutRecord(ctx, client, &atproto.RepoPutRecord_Input{
@@ -500,7 +531,8 @@ func (s *Strings) create(w http.ResponseWriter, r *http.Request) {
 			Record:     &lexutil.LexiconTypeDecoder{Val: newString.AsRecord()},
 		})
 		if err != nil {
-			fail("Failed to create record.", err)
+			l.Error("failed to create string", "err", err)
+			s.Pages.Notice(w, "error", "Failed to create string.")
 			return
 		}
 		l := l.With("aturi", resp.Uri)
@@ -508,8 +540,7 @@ func (s *Strings) create(w http.ResponseWriter, r *http.Request) {
 
 		// insert into DB
 		if err = db.AddString(s.Db, newString); err != nil {
-			fail("Failed to create string.", err)
-			return
+			l.Error("db: failed to insert string", "err", err)
 		}
 
 		s.Notifier.NewString(ctx, &newString)
-- 
2.51.2