Work on features and bugs

Viktor Chernev · Viktor Chernev · commit 64fb30d36532 · 2024-10-26T23:30:24.000+03:00
diff --git a/DescribeTranspiler.AWS/Function.cs b/DescribeTranspiler.AWS/Function.cs
@@ -589,16 +589,6 @@ public APIGatewayProxyResponse HTranspile_SingleDmlToSingleHtmlPlain(APIGatewayP
         }
     }
 }
-
-public class InputJson
-{
-    public string Command { get; set; }
-    public string Verbosity { get; set; }
-    public string Translator { get; set; }
-
-    public string Filename { get; set; }
-    public string Code { get; set; }
-}
 public class OutputJson
 {
     public string? Command { get; set; }
diff --git a/DescribeTranspiler.AWS/FunctionsMessages.cs b/DescribeTranspiler.AWS/FunctionsMessages.cs
@@ -75,97 +75,7 @@ public static void printCmdJson(string? json)
         }
 
 
-        //errors
-        public static void printCmdLine(InputJson source)
-        {
-            string s = "> ";
-
-            s += "{ \"Command\":\"" + source.Command + "\", ";
-            s += "\"Translator\":\"" + source.Translator + "\", ";
-            s += "\"Verbosity\":\"" + source.Verbosity + "\", ";
-
-            string code = source.Code;
-            if (code.Length > 12) code = code.Substring(0, 12) + " ... ";
-            s += "\"Code\":\"" + code + "\"; }";
-            ConsoleLogInfo(s);
-        }
-        public static void printCmdLineForGET(APIGatewayProxyRequest request)
-        {
-            string s = "> ";
-
-            string command = "null";
-            if(request.QueryStringParameters.ContainsKey("command"))
-            {
-                command = request.QueryStringParameters["command"];
-            }
-            s += "{ \"Command\":\"" + command + "\", ";
-
-            string translator = "null";
-            if (request.QueryStringParameters.ContainsKey("translator"))
-            {
-                translator = request.QueryStringParameters["translator"];
-            }
-            s += "\"Translator\":\"" + translator + "\", ";
-
-            string verbosity = "null";
-            if (request.QueryStringParameters.ContainsKey("verbosity"))
-            {
-                verbosity = request.QueryStringParameters["verbosity"];
-            }
-            s += "\"Verbosity\":\"" + verbosity + "\", ";
-
-            string code = "null";
-            if (request.QueryStringParameters.ContainsKey("code"))
-            {
-                code = request.QueryStringParameters["code"];
-                if(code.Length > 12) code = code.Substring(0, 12) + " ... ";
-            }
-            s += "\"Code\":\"" + code + "\"; }";
-
-            ConsoleLogInfo(s);
-        }
-        public static void printCmdLineForPOST(string? command = null, string? translator = null, 
-            string? verbosity = null, string? beautified = null, string? language_version = null, string? filename = null,
-            string? input_password = null, string? output_password = null, string? log_password = null)
-        {
-            string s = "> ";
-
-            if(command == null) command = "null";
-            s += "{ \"Command\":\"" + command + "\", ";
-
-            if (translator == null) translator = "null";
-            s += "\"Translator\":\"" + translator + "\", ";
-
-            if (verbosity == null) verbosity = "null";
-            s += "\"Verbosity\":\"" + verbosity + "\", ";
-
-            if (language_version == null) language_version = "null";
-            s += "\"Language version\":\"" + language_version + "\", ";
-
-            if (beautified == null) beautified = "null";
-            s += "\"Beautified\":\"" + beautified + "\", ";
-
-            if (filename == null) filename = "null";
-            s += "\"Filename\":\"" + filename + "\", ";
-
-            if (input_password == null) input_password = "null";
-            else input_password = "***";
-            s += "\"Input Password\":\"" + input_password + "\", ";
-
-            if (output_password == null) output_password = "null";
-            else output_password = "***";
-            s += "\"Output Password\":\"" + output_password + "\", ";
-
-            if (log_password == null) log_password = "null";
-            else log_password = "***";
-            s += "\"Log Password\":\"" + log_password + "\", ";
-
-            s += "\"Code\":[CODE] ; }";
-
-            ConsoleLogInfo(s);
-        }
- 
-        
+        //errors        
         public static void printCompilationSuccess()
         {
             //add to log
diff --git a/DescribeTranspiler.AWS/TestInputs/APIGatewayProxyRequest_Empty.json b/DescribeTranspiler.AWS/TestInputs/APIGatewayProxyRequest_Empty.json
diff --git a/DescribeTranspiler.AWS/TestInputs/APIGatewayProxyRequest_MultiParse.json b/DescribeTranspiler.AWS/TestInputs/APIGatewayProxyRequest_MultiParse.json
diff --git a/DescribeTranspiler.AWS/TestInputs/testHelp.json b/DescribeTranspiler.AWS/TestInputs/testHelp.json
diff --git a/DescribeTranspiler.AWS/TestInputs/testParse.json b/DescribeTranspiler.AWS/TestInputs/testParse.json
diff --git a/DescribeTranspiler.AWS/aws-configs/HTML aws-lambda-tools-defaults.json b/DescribeTranspiler.AWS/aws-configs/HTML aws-lambda-tools-defaults.json
@@ -17,7 +17,7 @@
   "function-name": "Transpile_SingleDmlToSingleHtml",
   "function-description": "Compile Describe Source code to HTML",
   "package-type": "Zip",
-  "function-role": "arn:aws:iam::580393905125:role/lambda_exec_CompileDescribeCodeToHtml",
+  "function-role": "arn:aws:iam::580393905125:role/lambda_exec_CompileDescribeCodeToJson",
   "function-subnets": "",
   "function-security-groups": "",
   "tracing-mode": "PassThrough",
diff --git a/DescribeTranspiler.AWS/aws-configs/HTML_PLAIN aws-lambda-tools-defaults.json b/DescribeTranspiler.AWS/aws-configs/HTML_PLAIN aws-lambda-tools-defaults.json
@@ -17,7 +17,7 @@
   "function-name": "Transpile_SingleDmlToSingleHtmlPlain",
   "function-description": "Compile Describe Source code to Html",
   "package-type": "Zip",
-  "function-role": "arn:aws:iam::580393905125:role/lambda_exec_CompileDescribeCodeToHtmlPlain",
+  "function-role": "arn:aws:iam::580393905125:role/lambda_exec_CompileDescribeCodeToJson",
   "function-subnets": "",
   "function-security-groups": "",
   "tracing-mode": "PassThrough",
diff --git a/DescribeTranspiler.AWS/aws-configs/JSON aws-lambda-tools-defaults.json b/DescribeTranspiler.AWS/aws-configs/JSON aws-lambda-tools-defaults.json
@@ -1,27 +1,26 @@
-
 {
-    "Information" : [
-        "This file provides default values for the deployment wizard inside Visual Studio and the AWS Lambda commands added to the .NET Core CLI.",
-        "To learn more about the Lambda commands with the .NET Core CLI execute the following command at the command line in the project root directory.",
-        "dotnet lambda help",
-        "All the command line options for the Lambda command can be specified in this file."
-    ],
-    "profile"     : "default",
-    "region"      : "eu-north-1",
-    "configuration" : "Release",
-    "function-architecture" : "x86_64",
-    "function-runtime"      : "dotnet8",
-    "function-memory-size"  : 3008,
-    "function-timeout"      : 30,
-    "function-handler"      : "DescribeTranspiler.AWS::DescribeTranspiler.AWS.Function::HTranspile_SingleDmlToSingleJson",
-    "framework"             : "net8.0",
-    "function-name"         : "Transpile_SingleDmlToSingleJson",
-    "function-description"  : "Compile Describe Source code to JSON",
-    "package-type"          : "Zip",
-    "function-role"         : "arn:aws:iam::580393905125:role/lambda_exec_CompileDescribeCodeToJson",
-    "function-subnets"      : "",
-    "function-security-groups" : "",
-    "tracing-mode"             : "PassThrough",
-    "environment-variables"    : "",
-    "image-tag"                : ""
+  "Information": [
+    "This file provides default values for the deployment wizard inside Visual Studio and the AWS Lambda commands added to the .NET Core CLI.",
+    "To learn more about the Lambda commands with the .NET Core CLI execute the following command at the command line in the project root directory.",
+    "dotnet lambda help",
+    "All the command line options for the Lambda command can be specified in this file."
+  ],
+  "profile": "default",
+  "region": "eu-north-1",
+  "configuration": "Release",
+  "function-architecture": "x86_64",
+  "function-runtime": "dotnet8",
+  "function-memory-size": 3008,
+  "function-timeout": 30,
+  "function-handler": "DescribeTranspiler.AWS::DescribeTranspiler.AWS.Function::HTranspile_SingleDmlToSingleJson",
+  "framework": "net8.0",
+  "function-name": "Transpile_SingleDmlToSingleJson",
+  "function-description": "Compile Describe Source code to JSON",
+  "package-type": "Zip",
+  "function-role": "arn:aws:iam::580393905125:role/lambda_exec_CompileDescribeCodeToJson",
+  "function-subnets": "",
+  "function-security-groups": "",
+  "tracing-mode": "PassThrough",
+  "environment-variables": "",
+  "image-tag": ""
 }
diff --git a/DescribeTranspiler.AWS/aws-configs/JSON_LISTIARY aws-lambda-tools-defaults.json b/DescribeTranspiler.AWS/aws-configs/JSON_LISTIARY aws-lambda-tools-defaults.json
@@ -17,7 +17,7 @@
   "function-name": "Transpile_SingleDmlToSingleJsonListiary",
   "function-description": "Compile Describe Source code to JSON",
   "package-type": "Zip",
-  "function-role": "arn:aws:iam::580393905125:role/lambda_exec_CompileDescribeCodeToJsonListiary",
+  "function-role": "arn:aws:iam::580393905125:role/lambda_exec_CompileDescribeCodeToJson",
   "function-subnets": "",
   "function-security-groups": "",
   "tracing-mode": "PassThrough",
diff --git a/DescribeTranspiler.AWS/aws-configs/XML aws-lambda-tools-defaults.json b/DescribeTranspiler.AWS/aws-configs/XML aws-lambda-tools-defaults.json
@@ -17,7 +17,7 @@
   "function-name": "Transpile_SingleDmlToSingleXml",
   "function-description": "Compile Describe Source code to Xml",
   "package-type": "Zip",
-  "function-role": "arn:aws:iam::580393905125:role/lambda_exec_CompileDescribeCodeToXml",
+  "function-role": "arn:aws:iam::580393905125:role/lambda_exec_CompileDescribeCodeToJson",
   "function-subnets": "",
   "function-security-groups": "",
   "tracing-mode": "PassThrough",
diff --git a/DescribeTranspiler.CLI/Properties/launchSettings.json b/DescribeTranspiler.CLI/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "DescribeTranspiler.CLI": {
       "commandName": "Project",
-      "commandLineArgs": "parse-file \"C:\\Users\\Viktor Chernev\\Desktop\\@Ds\\MyLife\\!MySchemes\\ULOT.txt\" \"C:\\Users\\Viktor Chernev\\Desktop\\testing\\!compiled\\JSON_LISTIARY\\MySchemes.json\" translator=JSON_LISTIARY beautify=true verbosity=h log-file=\"C:\\Users\\Viktor Chernev\\Desktop\\testing\\!compiled\\JSON_LISTIARY\\MySchemes.log\" theme=\"DBLUE\""
+      "commandLineArgs": "parse-folder \"C:\\Users\\Viktor Chernev\\Desktop\\Lists-Cli\\MyData\\Videos\" \"C:\\Users\\Viktor Chernev\\Desktop\\Lists-Cli\\Videos.html\" translator=html_page beautify=true verbosity=low logfile=\"C:\\Users\\Viktor Chernev\\Desktop\\Lists-Cli\\Videos.log\" dsonly=false toponly=false onerror=ignore"
     }
   }
 }
diff --git a/DescribeTranspiler/Compiler/Compiler/DescribeCompiler.cs b/DescribeTranspiler/Compiler/Compiler/DescribeCompiler.cs
@@ -93,7 +93,9 @@ public bool ParseFolder(DirectoryInfo dirInfo, ref DescribeUnfold unfold)
                 if (PARSE_DS_ONLY) searchMask = "*.ds";
 
                 //unfold.InitialDir = dirInfo.FullName;
-                sourceFiles = Directory.GetFiles(dirInfo.FullName, searchMask, searchOption).ToList();
+                sourceFiles = Directory.GetFiles(dirInfo.FullName, searchMask, searchOption)
+                    .Where(file => !file.EndsWith(".dr", StringComparison.OrdinalIgnoreCase))
+                    .ToList();
                 if (sourceFiles.Count() == 0)
                 {
                     LogError("Directory is empty");
@@ -214,7 +216,9 @@ public bool ParseFolder(DirectoryInfo dirInfo, out List<DescribeUnfold> unfolds)
                 if (PARSE_DS_ONLY) searchMask = "*.ds";
 
                 //unfold.InitialDir = dirInfo.FullName;
-                sourceFiles = Directory.GetFiles(dirInfo.FullName, searchMask, searchOption).ToList();
+                sourceFiles = Directory.GetFiles(dirInfo.FullName, searchMask, searchOption)
+                    .Where(file => !file.EndsWith(".dr", StringComparison.OrdinalIgnoreCase))
+                    .ToList();
                 if (sourceFiles.Count() == 0)
                 {
                     LogError("Directory is empty");
@@ -335,7 +339,9 @@ public bool ParseFolder(DirectoryInfo dirInfo, out List<AstScriptureNode> roots)
                 if (PARSE_DS_ONLY) searchMask = "*.ds";
 
                 //unfold.InitialDir = dirInfo.FullName;
-                sourceFiles = Directory.GetFiles(dirInfo.FullName, searchMask, searchOption).ToList();
+                sourceFiles = Directory.GetFiles(dirInfo.FullName, searchMask, searchOption)
+                    .Where(file => !file.EndsWith(".dr", StringComparison.OrdinalIgnoreCase))
+                    .ToList();
                 if (sourceFiles.Count() == 0)
                 {
                     LogError("Directory is empty");
diff --git a/DescribeTranspiler/Translators/Translators/Html/HtmlBasicTranslator.cs b/DescribeTranspiler/Translators/Translators/Html/HtmlBasicTranslator.cs
@@ -357,39 +357,55 @@ string TranslateItem(DescribeUnfold u, string id)
             }
 
             //replace in template
+            string before = "";
+            string after = "";
+            string res = itemTemplate!.Replace("{ITEM}", HttpUtility.HtmlEncode(u.Translations[id]));
+            res = res.Replace("{LINKS}", linkage);
             if (u.Decorators.ContainsKey(id))
             {
                 List<DescribeDecorator> decorators = u.Decorators[id];
                 foreach (DescribeDecorator decorator in decorators)
                 {
                     if (decorator.Name == "empty")
                     {
-                        return emptyItemTemplate!;
+                        res = emptyItemTemplate!;
                     }
                     else if (decorator.Name == "comment")
                     {
-                        string res = commentItemTemplate!.Replace("{ITEM}", HttpUtility.HtmlEncode(u.Translations[id]));
+                        res = commentItemTemplate!.Replace("{ITEM}", HttpUtility.HtmlEncode(u.Translations[id]));
                         res = res.Replace("{LINKS}", linkage);
-                        return res;
                     }
                     else if (decorator.Name == "nlcomment")
                     {
-                        string res = nlcommentItemTemplate!.Replace("{ITEM}", HttpUtility.HtmlEncode(u.Translations[id]));
+                        res = nlcommentItemTemplate!.Replace("{ITEM}", HttpUtility.HtmlEncode(u.Translations[id]));
                         res = res.Replace("{LINKS}", linkage);
-                        return res;
                     }
                     else if (decorator.Name == "color")
                     {
-                        string res = coloredItemTemplate!.Replace("{ITEM}", HttpUtility.HtmlEncode(u.Translations[id]));
+                        res = coloredItemTemplate!.Replace("{ITEM}", HttpUtility.HtmlEncode(u.Translations[id]));
                         res = res.Replace("{LINKS}", linkage);
                         res = res.Replace("{COLOR}", decorator.Value);
-                        return res;
+                    }
+                    else if (decorator.Name == "bold")
+                    {
+                        before += "<span style='font-weight:bold;'>";
+                        res += "</span>";
+                    }
+                    else if (decorator.Name == "italic")
+                    {
+                        res = "<span style='font-style:italic;'>" + res + "</span>";
+                    }
+                    else if (decorator.Name == "underlined")
+                    {
+                        res = "<span style='text-decoration-line:underline;'>" + res + "</span>";
+                    }
+                    else if (decorator.Name == "striked")
+                    {
+                        res = "<span style='text-decoration-line:line-through;'>" + res + "</span>";
                     }
                 }
             }
-            string it = itemTemplate!.Replace("{ITEM}", HttpUtility.HtmlEncode(u.Translations[id]));
-            it = it.Replace("{LINKS}", linkage);
-            return it;
+            return before + res + after;
         }
 
 
diff --git a/DescribeTranspiler/Translators/Translators/Html/HtmlPageTranslator.cs b/DescribeTranspiler/Translators/Translators/Html/HtmlPageTranslator.cs

Original file line number	Diff line number	Diff line change
`@@ -589,16 +589,6 @@ public APIGatewayProxyResponse HTranspile_SingleDmlToSingleHtmlPlain(APIGatewayP`
`589`	`589`	`}`
`590`	`590`	`}`
`591`	`591`	`}`
`592`		`-`
`593`		`-public class InputJson`
`594`		`-{`
`595`		`- public string Command { get; set; }`
`596`		`- public string Verbosity { get; set; }`
`597`		`- public string Translator { get; set; }`
`598`		`-`
`599`		`- public string Filename { get; set; }`
`600`		`- public string Code { get; set; }`
`601`		`-}`
`602`	`592`	`public class OutputJson`
`603`	`593`	`{`
`604`	`594`	`public string? Command { get; set; }`