added serialization/deserialization capabilities to the cli tool #4 #5

Author: s4ke

cli/pom.xml

@@ -18,6 +18,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.s4ke</groupId>
+            <artifactId>moar-json</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>

cli/src/main/java/com/github/s4ke/moar/cli/Main.java

@@ -1,15 +1,18 @@
 package com.github.s4ke.moar.cli;
 
 import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 
 import com.github.s4ke.moar.MoaMatcher;
 import com.github.s4ke.moar.MoaPattern;
+import com.github.s4ke.moar.json.MoarJSONSerializer;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
@@ -29,6 +32,9 @@ public static void main(String[] args) throws ParseException, IOException {
 		options.addOption( "rf", true, "regexFile" );
 		options.addOption( "r", true, "regex" );
 
+		options.addOption( "mf", true, "moaFile" );
+		options.addOption( "mo", true, "moaOutputFolder (overwrites if existent)" );
+
 		options.addOption( "sf", true, "stringFile" );
 		options.addOption( "s", true, "string" );
 
@@ -44,13 +50,15 @@ public static void main(String[] args) throws ParseException, IOException {
 			formatter.printHelp( "moar-cli", options );
 		}
 
+		List<String> patternNames = new ArrayList<>();
 		List<MoaPattern> patterns = new ArrayList<>();
 		List<String> stringsToCheck = new ArrayList<>();
 
 		if ( cmd.hasOption( "r" ) ) {
 			String regexStr = cmd.getOptionValue( "r" );
 			try {
 				patterns.add( MoaPattern.compile( regexStr ) );
+				patternNames.add( regexStr );
 			}
 			catch (Exception e) {
 				System.out.println( e.getMessage() );
@@ -67,6 +75,7 @@ public static void main(String[] args) throws ParseException, IOException {
 				if ( emptyLineCountAfterRegex >= 1 ) {
 					if ( regexStr.length() > 0 ) {
 						patterns.add( MoaPattern.compile( regexStr.toString() ) );
+						patternNames.add(regexStr.toString());
 					}
 					regexStr.setLength( 0 );
 					emptyLineCountAfterRegex = 0;
@@ -83,6 +92,7 @@ public static void main(String[] args) throws ParseException, IOException {
 			if ( regexStr.length() > 0 ) {
 				try {
 					patterns.add( MoaPattern.compile( regexStr.toString() ) );
+					patternNames.add(regexStr.toString());
 				}
 				catch (Exception e) {
 					System.out.println( e.getMessage() );
@@ -92,6 +102,28 @@ public static void main(String[] args) throws ParseException, IOException {
 			}
 		}
 
+		if ( cmd.hasOption( "mf" ) ) {
+			String fileName = cmd.getOptionValue( "mf" );
+			File file = new File( fileName );
+			if ( file.isDirectory() ) {
+				System.out.println( fileName + " is a directory, using all *.moar files as patterns" );
+				File[] moarFiles = file.listFiles(
+						pathname -> pathname.getName().endsWith( ".moar" )
+				);
+				for ( File moar : moarFiles ) {
+					String jsonString = readWholeFile( moar );
+					patterns.add( MoarJSONSerializer.fromJSON( jsonString ) );
+					patternNames.add(moar.getAbsolutePath());
+				}
+			}
+			else {
+				System.out.println( fileName + " is a single file. using it directly (no check for *.moar suffix)" );
+				String jsonString = readWholeFile( file );
+				patterns.add( MoarJSONSerializer.fromJSON( jsonString ) );
+				patternNames.add(fileName);
+			}
+		}
+
 		if ( cmd.hasOption( "s" ) ) {
 			String str = cmd.getOptionValue( "s" );
 			stringsToCheck.add( str );
@@ -115,28 +147,56 @@ public static void main(String[] args) throws ParseException, IOException {
 
 		boolean multiLine = cmd.hasOption( "m" );
 
-		if ( stringsToCheck.size() == 0 ) {
-			System.out.println( "no strings to check" );
-			return;
-		}
 		if ( patterns.size() == 0 ) {
 			System.out.println( "no patterns to check" );
 			return;
 		}
 
+		if ( cmd.hasOption( "mo" ) ) {
+			String folder = cmd.getOptionValue( "mo" );
+			File folderFile = new File( folder );
+			if ( !folderFile.exists() ) {
+				System.out.println( folder + " does not exist. creating..." );
+				if ( !folderFile.mkdirs() ) {
+					System.out.println( "folder " + folder + " could not be created" );
+				}
+			}
+			int cnt = 0;
+			for ( MoaPattern pattern : patterns ) {
+				String patternAsJSON = MoarJSONSerializer.toJSON( pattern );
+				try (BufferedWriter writer = new BufferedWriter(
+						new FileWriter(
+								new File(
+										folderFile,
+										"pattern" + ++cnt + ".moar"
+								)
+						)
+				)) {
+					writer.write( patternAsJSON );
+				}
+			}
+			System.out.println( "stored " + cnt + " patterns in " + folder );
+		}
+
+		if ( stringsToCheck.size() == 0 ) {
+			System.out.println( "no strings to check" );
+			return;
+		}
+
 		for ( String string : stringsToCheck ) {
+			int curPattern = 0;
 			for ( MoaPattern pattern : patterns ) {
 				MoaMatcher matcher = pattern.matcher( string );
 				if ( !multiLine ) {
 					if ( matcher.matches() ) {
-						System.out.println( "\"" + pattern + "\" matches \"" + string + "\"" );
+						System.out.println( "\"" + patternNames.get(curPattern) + "\" matches \"" + string + "\"" );
 					}
 					else {
-						System.out.println( "\"" + pattern + "\" does not match \"" + string + "\"" );
+						System.out.println( "\"" + patternNames.get(curPattern) + "\" does not match \"" + string + "\"" );
 					}
 				}
 				else {
-					StringBuffer buffer = new StringBuffer( string );
+					StringBuilder buffer = new StringBuilder( string );
 					int additionalCharsPerMatch = ("<match>" + "</match>").length();
 					int matchCount = 0;
 					while ( matcher.nextMatch() ) {
@@ -153,7 +213,20 @@ public static void main(String[] args) throws ParseException, IOException {
 					System.out.println( buffer.toString() );
 				}
 			}
+			++curPattern;
+		}
+	}
+
+	private static String readWholeFile(File file) throws IOException {
+		StringBuilder ret = new StringBuilder();
+		try (FileInputStream fis = new FileInputStream( file );
+			 BufferedReader reader = new BufferedReader( new InputStreamReader( fis ) )) {
+			String str;
+			while ( (str = reader.readLine()) != null ) {
+				ret.append( str ).append( "\n" );
+			}
 		}
+		return ret.toString();
 	}
 
 	private static List<String> readFileContents(File file) throws IOException {

json/src/main/java/com/github/s4ke/moar/json/MoarJSONSerializer.java

@@ -142,13 +142,19 @@ else if ( stateObj.has( "set" ) ) {
 							if ( matcher.matches() ) {
 								String action = matcher.getVariableContent( "action" );
 								String variableName = matcher.getVariableContent( "name" );
+								if ( !variables.containsKey( variableName ) ) {
+									throw new IllegalArgumentException( "variable with name " + variableName + " does not exist" );
+								}
 								memoryActionSet.add(
 										new MemoryAction(
 												ActionType.fromString( action ),
 												variableName
 										)
 								);
 							}
+							else {
+								throw new IllegalArgumentException( memoryActionString + " is no valid memoryAction string" );
+							}
 						}
 					}
 				}