Added transcriber to default args, added default args schema check

Author: AI-Spawn

align.go

@@ -68,7 +68,6 @@ func gentleAlign(url, audioFilePath, transcriptContent string) (GentleResponse,
 
 	// Close the multipart writer
 	writer.Close()
-	fmt.Println("Hello world")
 	// Create the req: http.ResponseWriter, r *http.Requestuest
 	request, err := http.NewRequest("POST", url, body)
 	if err != nil {
@@ -87,7 +86,7 @@ func gentleAlign(url, audioFilePath, transcriptContent string) (GentleResponse,
 	defer response.Body.Close()
 
 	// Read the response body
-	responseBody, err := io.ReadAll(response.Body)
+	responseBody, _ := io.ReadAll(response.Body)
 
 	var gentleRes GentleResponse
 	err = json.Unmarshal(responseBody, &gentleRes)

argparser.go

@@ -17,8 +17,10 @@ import (
 //go:embed all:defaults
 
 var defaults embed.FS
+var ARGS_SCHEMA_VERSION = 1
 
 type Args struct {
+	Schema            int    `json:"schema"`
 	AudioPath         string `json:"audioPath"`
 	CharacterPath     string `json:"characterPath"`
 	Timestamps        string `json:"timestamps"`
@@ -35,7 +37,7 @@ type Args struct {
 	Transcriber       string `json:"transcriber"`
 }
 
-func loadDefaults() Args {
+func loadDefaults() (Args, string) {
 	cacheDir, _ := os.UserCacheDir()
 	matamataPath := filepath.Join(cacheDir, "matamata/")
 
@@ -73,15 +75,23 @@ func loadDefaults() Args {
 		log.Fatal(err)
 	}
 
-	return defArgs
+	return defArgs, defaultsPath
 
 }
 
 func parseArgs() Args {
-	defArgs := loadDefaults()
+	defArgs, defaultsPath := loadDefaults()
 	if defArgs.CheckForUpdates {
 		checkForUpdates()
 	}
+	if defArgs.Schema != ARGS_SCHEMA_VERSION {
+		colorReset := "\033[0m"
+		colorRed := "\033[31m"
+		fmt.Println(string(colorRed)+"You are using an outdated default argument schema("+strconv.Itoa(defArgs.Schema)+" -> "+strconv.Itoa(ARGS_SCHEMA_VERSION)+") Please update or delete the file:", defaultsPath, string(colorReset))
+		fmt.Println("Please note, deleting the file will reset your default arguments")
+		os.Exit(1)
+	}
+
 	audio := flag.String("a", defArgs.AudioPath, "audio path")
 	character := flag.String("c", defArgs.CharacterPath, "character path")
 	timestamps := flag.String("t", defArgs.Timestamps, "Timestamps file path")

checkForUpdates.go

@@ -3,9 +3,10 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"golang.org/x/mod/semver"
 	"io"
 	"net/http"
+
+	"golang.org/x/mod/semver"
 )
 
 type Release struct {
@@ -16,7 +17,7 @@ type Release struct {
 }
 
 func checkForUpdates() {
-	currentSemVer := "v5.1.0"
+	currentSemVer := "v5.1.1"
 
 	logM(1, "Checking for Updates...")
 	endpointUrl := "https://api.github.com/repos/Matamata-Animator/Matamata/releases?per_page=1"

defaults/defaultArguments.json

@@ -1,14 +1,16 @@
 {
+  "schema": 1,
   "audioPath": "",
   "characterPath": "",
   "timestamps": "",
   "verbose": 1,
   "outputPath": "output.mov",
   "transcriberUrl": "https://api.openai.com/v1/",
   "transcriberApiKey": "",
+  "transcriber": "Whisper",
   "alignerUrl": "http://localhost:8765/transcriptions?async=false",
   "phonemesPath": "",
   "skipTranscriber": false,
   "checkForUpdates": true,
   "runProfiler": false
-}
+}

helpers.go

@@ -81,15 +81,6 @@ func unwrapEmbeddedDefaultCharacter() {
 	}
 	unwrapHelper(generateDir, "defaults", dir)
 }
-
-func copyMap(m map[string]string) map[string]string {
-	m2 := make(map[string]string, len(m))
-	for id := range m {
-		m2[id] = m[id]
-	}
-	return m2
-}
-
 func openImage(filePath string) image.Image {
 	f, err := os.Open(filePath)
 	if err != nil {

main.go

@@ -77,7 +77,6 @@ func main() {
 
 	t := time.Now()
 	fmt.Println("Completed in", t.Sub(start))
-	Fatal(nil)
 	if args.RunProfiler {
 		fmt.Println("Run the pprof now")
 		select {}

videoGenerator.go

@@ -3,11 +3,6 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/disintegration/imaging"
-	"github.com/gosuri/uiprogress"
-	"github.com/jmoiron/jsonq"
-	"github.com/mitchellh/mapstructure"
-	"golang.org/x/image/draw"
 	"image"
 	"image/color"
 	"image/jpeg"
@@ -20,6 +15,12 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/disintegration/imaging"
+	"github.com/gosuri/uiprogress"
+	"github.com/jmoiron/jsonq"
+	"github.com/mitchellh/mapstructure"
+	"golang.org/x/image/draw"
 )
 
 type FrameRequest struct {
@@ -65,9 +66,9 @@ func getParts(partsMap map[string]string, character *jsonq.JsonQuery, characterD
 		}
 		path := filepath.Join(characterDir, k, imageName)
 
-		scale, e := character.Float(k, "scale")
-		x, e := character.Int(k, "x")
-		y, e := character.Int(k, "y")
+		scale, _ := character.Float(k, "scale")
+		x, _ := character.Int(k, "x")
+		y, _ := character.Int(k, "y")
 
 		parts = append(parts, Part{
 			path, int16(x), int16(y), float32(scale),