Use filenames to render all

andrewmarklloyd · Apr 24, 2023 · 9921ce8 · 9921ce8
1 parent cbab98c
commit 9921ce8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/main.go b/main.go
@@ -110,17 +110,17 @@ func subscribeHandler(renderMessage mqtt.RenderMessage) error {
 		return fmt.Errorf("publishing ack message: %w", err)
 	}
 
-	if _, err := os.Stat(fmt.Sprintf("%s/%s", clonePath, renderMessage.FileName)); errors.Is(err, os.ErrNotExist) {
-		return fmt.Errorf("file %s not found, cannot render", renderMessage.FileName)
+	if _, err := os.Stat(fmt.Sprintf("%s/%s", clonePath, renderMessage.FileNames)); errors.Is(err, os.ErrNotExist) {
+		return fmt.Errorf("file %s not found, cannot render", renderMessage.FileNames)
 	}
 
 	err = render(renderMessage)
 	if err != nil {
 		return fmt.Errorf("error rendering: %s", err.Error())
 	}
 
-	path := fmt.Sprintf("%s/media/videos/%s/720p30/%s.mp4", clonePath, renderMessage.ClassName, renderMessage.ClassName)
-	err = awsClient.UploadFile(context.Background(), path, fmt.Sprintf("%s.mp4", renderMessage.ClassName))
+	path := fmt.Sprintf("%s/media/videos/%s/720p30/%s.mp4", clonePath, "", "")
+	err = awsClient.UploadFile(context.Background(), path, fmt.Sprintf("%s.mp4", ""))
 	if err != nil {
 		return fmt.Errorf("error uploading to s3: %w", err)
 	}
@@ -129,7 +129,7 @@ func subscribeHandler(renderMessage mqtt.RenderMessage) error {
 }
 
 func render(renderMessage mqtt.RenderMessage) error {
-	c := fmt.Sprintf(`docker run --rm --user="$(id -u):$(id -g)" -v "%s":/manim manimcommunity/manim:stable manim %s -qm --progress_bar none`, clonePath, renderMessage.FileName)
+	c := fmt.Sprintf(`docker run --rm --user="$(id -u):$(id -g)" -v "%s":/manim manimcommunity/manim:stable manim %s -qm --progress_bar none`, clonePath, "")
 	cmd := exec.Command("bash", "-c", c)
 	out, err := cmd.CombinedOutput()
 	if err != nil {

diff --git a/pkg/mqtt/config.go b/pkg/mqtt/config.go
@@ -12,7 +12,6 @@ const (
 )
 
 type RenderMessage struct {
-	FileName  string `json:"fileName"`
-	ClassName string `json:"className"`
+	FileNames string `json:"fileNames"`
 	RepoURL   string `json:"repoURL"`
 }