Working command-line file translation

DnA-IntRicate · DnA-IntRicate · commit 766d65f050e8 · 2022-12-14T15:30:53.000+02:00
diff --git a/Main.go b/Main.go
@@ -10,84 +10,109 @@ import (
 )
 
 func Help(exitCode int) {
-	// messages
+	fmt.Println("Help menu")
 	os.Exit(exitCode)
 }
 
-func main() {
+func TranslateFile(srcPath, dstPath, srcLang, dstLang string, quiet bool) error {
 	t := translator.New()
 
+	inFile := OpenFile(srcPath)
+	outFile := CreateFile(dstPath)
+
+	scanner := bufio.NewScanner(inFile)
+	for scanner.Scan() {
+		line := scanner.Text()
+		var outBuf string
+
+		if !isNumber(line) && !strings.Contains(line, "-->") && line != "\n" {
+			translated, err := t.Translate(line, srcLang, dstLang)
+			if err != nil {
+				return err
+			}
+			outBuf = translated.Text + "\n"
+		} else {
+			outBuf = line + "\n"
+		}
+
+		outFile.WriteString(outBuf)
+		if !quiet {
+			fmt.Print(outBuf)
+		}
+	}
+
+	inFile.Close()
+	outFile.Close()
+
+	return nil
+}
+
+func main() {
 	var SourcePath, DestinationPath string
 	var DstLanguage string = "en"
 	var SrcLanguage string = "auto"
-
 	var Quiet bool = false
 
-	if (len(os.Args) == 2) && ((os.Args[1] == "help") || (os.Args[1] == "?")) {
+	if len(os.Args) <= 1 {
+		Help(1)
+	} else if (len(os.Args) == 2) && ((os.Args[1] == "help") || (os.Args[1] == "?")) {
 		Help(0)
-		//	} else {
-		//		fmt.Println("Unknown argument!\nRun 'SubtitleTranslator help' for a list of valid arguments.")
-		//		os.Exit(1)
 	}
 
+	validArgFound := false
 	for i := 1; i < len(os.Args); i++ {
 		currentArg := os.Args[i]
 		if currentArg[0] == '-' {
-			var nextArg string
-			Assert(i+1 < len(os.Args), "Switch is missing an argument!") // Array indices are zero-based but array lengths are not
-			nextArg = os.Args[i+1]
-
 			switch currentArg {
 			case "-i", "--in", "--input":
-				SourcePath = nextArg
-				break
+				Assert(i+1 < len(os.Args), "Switch "+"\""+currentArg+"\""+" is missing an argument!")
+				i++
+				SourcePath = os.Args[i]
+				validArgFound = true
 			case "-o", "--out", "--output":
-				DestinationPath = nextArg
-				break
+				Assert(i+1 < len(os.Args), "Switch "+"\""+currentArg+"\""+" is missing an argument!")
+				i++
+				DestinationPath = os.Args[i]
+				validArgFound = true
 			case "-s", "--src", "--source":
-				SrcLanguage = nextArg
-				break
+				Assert(i+1 < len(os.Args), "Switch "+"\""+currentArg+"\""+" is missing an argument!")
+				i++
+				SrcLanguage = os.Args[i]
+				validArgFound = true
 			case "-d", "--dest", "--destination":
-				DstLanguage = nextArg
-				break
+				Assert(i+1 < len(os.Args), "Switch "+"\""+currentArg+"\""+" is missing an argument!")
+				i++
+				DstLanguage = os.Args[i]
+				validArgFound = true
 			case "-q", "--quiet":
 				Quiet = true
-				break
+				validArgFound = true
 			default:
-				fmt.Printf("Bad switch: '%s'", currentArg)
+				fmt.Printf("Unknown switch: \"%s\".\n", currentArg)
 				Help(1)
 			}
 		}
 	}
 
-	// Abstract this out to a separate function
-	inFile := OpenFile(SourcePath)
-	outFile := CreateFile(DestinationPath)
-
-	scanner := bufio.NewScanner(inFile)
-	for scanner.Scan() {
-		line := scanner.Text()
-		var outBuf string
-
-		if !isNumber(line) && !strings.Contains(line, "-->") && line != "\n" {
-			translated, err := t.Translate(line, SrcLanguage, DstLanguage)
-			if err != nil {
-				panic(err)
-			}
-			outBuf = translated.Text + "\n"
-		} else {
-			outBuf = line + "\n"
-		}
+	if !validArgFound {
+		fmt.Println("Unknown command!")
+		Help(1)
+	}
 
-		outFile.WriteString(outBuf)
+	if SourcePath == "" {
+		fmt.Println("No source path was specified!")
+		os.Exit(1)
+	}
 
-		if !Quiet {
-			fmt.Print(outBuf)
-		}
+	if DestinationPath == "" {
+		fmt.Println("No destination path was specified!")
+		os.Exit(1)
 	}
 
-	inFile.Close()
-	outFile.Close()
+	fmt.Printf("Translating \"%s\" to \"%s\".\n", SourcePath, DestinationPath)
+	fmt.Println("============================================================================")
+	err := TranslateFile(SourcePath, DestinationPath, SrcLanguage, DstLanguage, Quiet)
+	AssertError(err)
 
 	fmt.Println("\nTranslation has concluded!")
 	fmt.Scanln()
diff --git a/Utils.go b/Utils.go
@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"os"
-	"strings"
 	"unicode"
 )
 
@@ -17,39 +16,30 @@ func isNumber(s string) bool {
 	return true
 }
 
-func CreateFile(path string) *os.File {
-	f, err := os.Create(path)
-	if err != nil {
-		panic(err)
+func Assert(check bool, msg string) {
+	if !check {
+		fmt.Println(msg)
+		os.Exit(1)
 	}
-
-	return f
 }
 
-func OpenFile(path string) *os.File {
-	file, err := os.Open(path)
+func AssertError(err error) {
 	if err != nil {
-		panic(err)
+		fmt.Println(err.Error())
+		os.Exit(1)
 	}
-
-	return file
 }
 
-func DispatchArg(arg string) {
-	argSwitch := arg[1:strings.Index(arg, " ")]
-	fmt.Println(argSwitch)
-}
+func CreateFile(path string) *os.File {
+	f, err := os.Create(path)
+	AssertError(err)
 
-func GetCommandLineArgs() {
-	args := os.Args[1:]
-	for i := 0; i < len(args); i++ {
-		DispatchArg(args[i])
-	}
+	return f
 }
 
-func Assert(check bool, msg string) {
-	if !check {
-		fmt.Println(msg)
-		os.Exit(1)
-	}
+func OpenFile(path string) *os.File {
+	file, err := os.Open(path)
+	AssertError(err)
+
+	return file
 }
