Fixed issue with CRLF encoded files causing unintended blank lines to…

… be returned as output from the Semi-Random File Text Includer operator. Also a few more small changes to code as suggested by the compiler.
ajcolson · Dec 4, 2023 · 66c0dd0 · 66c0dd0
1 parent 7efa58b
commit 66c0dd0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/QTCLConfig.cs b/QTCLConfig.cs
@@ -11,7 +11,7 @@ public static class QTCLConfigLoader
         {
             "RandomFileTextLookupOperator":
         	{
-        		"Directory": "{{QTCLH.APP_DIR}}data\random-text-files\",
+            	"Directory": "{{QTCLH.APP_DIR}}data\random-text-files\",
             	"FileType": ".txt"
         	}
         }

diff --git a/QTCLH.cs b/QTCLH.cs
@@ -24,7 +24,7 @@ public static void CheckForAppDir()
         public static void ShowHelp()
         {
             string[] helpText = [
-                "qtcl v1.0 (Beta 1)",
+                "qtcl v1.0 (Beta 2)",
                 "",
                 "Possible Arguments:",
                 "<inputFilepath>\n\tRun the parser and intrepreter from the specified inputFilepath.",

diff --git a/QTCLInterpreter.cs b/QTCLInterpreter.cs
@@ -15,7 +15,7 @@ public string Interpret(string commandString)
                 string[] commandWords = commandString.Split(' ');
                 for (int i = 0; i < commandWords.Length; i++)
                 {
-                    bool HasOperator = QTCLStandardLibrary.QTCLOperatorRegex().IsMatch(commandWords[i].Substring(0, 1));
+                    bool HasOperator = QTCLStandardLibrary.QTCLOperatorRegex().IsMatch(commandWords[i][..1]);
                     if ( HasOperator )
                     {
                         var foundOperator = QTCLStandardLibrary.Operators.Where((c => c.OperatorWord == commandWords[i][..1]));

diff --git a/QTCLStandardLibrary.cs b/QTCLStandardLibrary.cs
@@ -166,9 +166,20 @@ internal static partial class QTCLStandardLibrary
                 if (QTCLH.FILE.Exists(fName))
                 {
                     string[] fileContents = QTCLH.FILE.GetAllContent(fName).Split('\n');
-                    Random r = new();
-                    int ind = r.Next(0, fileContents.Length);
-                    ret = fileContents[ind];
+                    List<string> lineOptions = [];
+                    
+                    //check for return carriages. Don't include the as a possible option.
+                    for (int i = 0; i < fileContents.Length; i++)
+                    {
+                        if (fileContents[i] != "\r")
+                            lineOptions.Add(fileContents[i]);
+                    }
+                    if (lineOptions.Count > 0)
+                    {
+                        Random r = new();
+                        int ind = r.Next(0, lineOptions.Count);
+                        ret = lineOptions[ind];
+                    }
                 } else
                 {
                     QTCLH.CLI.PrintWarning($"Unable to parse the requsted text inclusion for the input named \"{input}\". A blank value will be inserted instead.\nPlease check the following file: \"{fName}\"");