Fix CLI opts

akilegaspi · Jan 17, 2025 · 8298b65 · 8298b65
1 parent 57681ae
commit 8298b65
Show file tree

Hide file tree

Showing 4 changed files with 13,753 additions and 7 deletions.
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
diff --git a/src/main/scala/com/skyline/warlangmod/Main.scala b/src/main/scala/com/skyline/warlangmod/Main.scala
@@ -40,17 +40,17 @@ object Main extends CommandApp(
     ).withDefault(defaultOutFile)
 
     (localOperation,fileType, inFile, originalFile, outFile).mapN {
-      (localOps, fileTypeOp, inputFileName, originalFileName, outputFileName) =>
+      (localOps, fileType, inputFileName, originalFileName, outputFileName) =>
         if (localOps) {
           // run a local instance of the program
           println("-----Running Locally----")
           App.runOffline(inputFileName, originalFileName, outputFileName)
         } else {
           // program will fetch a file from the github repository
           println("------Running Online------")
-          fileTypeOp match {
-            case Some(fileType) =>  App.runOnline(inputFileName,defaultUnitsLink,fileType)
+          fileType match {
             case None => sys.error("fileType is required when running online")
+            case Some(fileType) =>  App.runOnline(inputFileName,defaultUnitsLink,fileType)
           }
 
         }

diff --git a/src/main/scala/com/skyline/warlangmod/cli/Params.scala b/src/main/scala/com/skyline/warlangmod/cli/Params.scala
@@ -6,13 +6,17 @@ import com.monovore.decline.Argument
 object Params {
 
   sealed trait TranslationFileType
-  case object Units extends TranslationFileType
-  case object Weaponry extends TranslationFileType
+
+  object TranslationFileType {
+    case object Units extends TranslationFileType
+
+    case object Weaponry extends TranslationFileType
+  }
 
   implicit val translationFileTypeArgument: Argument[TranslationFileType] =
     Argument.from("Either 'units' or 'weaponry'"){
-      case "units" => Validated.valid(Units)
-      case "weaponry" => Validated.valid(Weaponry)
+      case "units" => Validated.valid(TranslationFileType.Units)
+      case "weaponry" => Validated.valid(TranslationFileType.Weaponry)
       case _ => Validated.invalidNel("Invalid translation file type")
     }