Allow zip and tar archive uploads PUT request.

src/update.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"io"
 	"log"
 )
 
@@ -25,42 +26,35 @@ type UpdateResult struct {
 }
 
 func Update(
-	ctx context.Context,
 	webRoot string,
-	repoURL string,
-	branch string,
+	manifest *Manifest,
 ) UpdateResult {
-	var fetchManifest, oldManifest, newManifest *Manifest
+	var oldManifest, newManifest *Manifest
 	var err error
 
-	log.Println("update:", webRoot, repoURL, branch)
-
 	outcome := UpdateError
-	fetchManifest, err = FetchRepository(ctx, repoURL, branch)
-	if errors.Is(err, context.DeadlineExceeded) {
-		outcome = UpdateTimeout
-		err = fmt.Errorf("update timeout")
-	} else if err == nil {
-		oldManifest, _ = backend.GetManifest(webRoot)
-		if IsManifestEmpty(fetchManifest) {
-			newManifest, err = fetchManifest, backend.DeleteManifest(webRoot)
-			if err == nil {
-				if oldManifest == nil {
-					outcome = UpdateNoChange
-				} else {
-					outcome = UpdateDeleted
-				}
+	oldManifest, _ = backend.GetManifest(webRoot)
+	// log.Println("OLD", ManifestDebugJSON(oldManifest))
+	if IsManifestEmpty(manifest) {
+		newManifest, err = manifest, backend.DeleteManifest(webRoot)
+		// log.Println("NEW", ManifestDebugJSON(newManifest))
+		if err == nil {
+			if oldManifest == nil {
+				outcome = UpdateNoChange
+			} else {
+				outcome = UpdateDeleted
 			}
-		} else if err = PrepareManifest(fetchManifest); err == nil {
-			newManifest, err = StoreManifest(webRoot, fetchManifest)
-			if err == nil {
-				if oldManifest == nil {
-					outcome = UpdateCreated
-				} else if CompareManifest(oldManifest, newManifest) {
-					outcome = UpdateNoChange
-				} else {
-					outcome = UpdateReplaced
-				}
+		}
+	} else if err = PrepareManifest(manifest); err == nil {
+		newManifest, err = StoreManifest(webRoot, manifest)
+		// log.Println("NEW", ManifestDebugJSON(newManifest))
+		if err == nil {
+			if oldManifest == nil {
+				outcome = UpdateCreated
+			} else if CompareManifest(oldManifest, newManifest) {
+				outcome = UpdateNoChange
+			} else {
+				outcome = UpdateReplaced
 			}
 		}
 	}
@@ -77,10 +71,61 @@ func Update(
 		case UpdateNoChange:
 			status = "unchanged"
 		}
-		log.Printf("update ok: %s %s %s", webRoot, *newManifest.Commit, status)
+		if newManifest.Commit != nil {
+			log.Printf("update %s ok: %s %s", webRoot, status, *newManifest.Commit)
+		} else {
+			log.Printf("update %s ok: %s", webRoot, status)
+		}
 	} else {
-		log.Printf("update err: %s %s", webRoot, err)
+		log.Printf("update %s err: %s", webRoot, err)
 	}
 
 	return UpdateResult{outcome, newManifest, err}
 }
+
+func UpdateFromRepository(
+	ctx context.Context,
+	webRoot string,
+	repoURL string,
+	branch string,
+) UpdateResult {
+	log.Printf("update %s: %s %s\n", webRoot, repoURL, branch)
+
+	manifest, err := FetchRepository(ctx, repoURL, branch)
+	if errors.Is(err, context.DeadlineExceeded) {
+		return UpdateResult{UpdateTimeout, nil, fmt.Errorf("update timeout")}
+	} else if err != nil {
+		return UpdateResult{UpdateError, nil, err}
+	} else {
+		return Update(webRoot, manifest)
+	}
+}
+
+var errArchiveFormat = errors.New("unsupported archive format")
+
+func UpdateFromArchive(
+	webRoot string,
+	contentType string,
+	reader io.Reader,
+) UpdateResult {
+	var manifest *Manifest
+	var err error
+
+	switch contentType {
+	case "application/x-tar":
+		log.Printf("update %s: (tar)", webRoot)
+		manifest, err = ExtractTar(reader) // yellow? definitely yellow.
+	case "application/zip":
+		log.Printf("update %s: (zip)", webRoot)
+		manifest, err = ExtractZip(reader)
+	default:
+		err = errArchiveFormat
+	}
+
+	if err != nil {
+		log.Printf("update %s err: %s", webRoot, err)
+		return UpdateResult{UpdateError, nil, err}
+	} else {
+		return Update(webRoot, manifest)
+	}
+}