v0.9.2

Author: Viktor Chernev

@DescribeCompilerAPI/Compiler/DescribeCompiler#Properties.cs

@@ -1,4 +1,5 @@
-using System;
+using DescribeCompiler.Compiler;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -35,5 +36,24 @@ public string LoadedGrammarName
             get;
             private set;
         }
+
+        /// <summary>
+        /// The artifact mode of the parser:
+        /// Weather to Make, Take, Both or ignore artifacts all-together
+        /// </summary>
+        public ArtifactMode ArtifactMode
+        { 
+            get; 
+            set; 
+        }
+
+        /// <summary>
+        /// The path to the artifact folder to be used
+        /// </summary>
+        public string ArtifactsPath
+        {
+            get;
+            set;
+        }
     }
 }

@DescribeCompilerAPI/Compiler/DescribeCompiler#VerbosityHigh.cs

@@ -69,6 +69,10 @@ bool ParseFolder_HighVerbosity(DirectoryInfo dirInfo, DescribeUnfold unfold)
                 {
                     unfold.FailedFiles.Add(filename);
                     if (STOP_ON_ERROR) return false;
+                    else
+                    {
+                        unfold.Files.RemoveAt(0);
+                    }
                 }
             }
 

@DescribeCompilerAPI/Compiler/DescribeCompiler#VerbosityLow.cs

@@ -67,6 +67,10 @@ bool ParseFolder_LowVerbosity(DirectoryInfo dirInfo, DescribeUnfold unfold)
                 {
                     unfold.FailedFiles.Add(filename);
                     if (STOP_ON_ERROR) return false;
+                    else
+                    {
+                        unfold.Files.RemoveAt(0);
+                    }
                 }
             }
 

@DescribeCompilerAPI/Compiler/DescribeCompiler#VerbosityMedium.cs

@@ -69,6 +69,10 @@ bool ParseFolder_MediumVerbosity(DirectoryInfo dirInfo, DescribeUnfold unfold)
                 {
                     unfold.FailedFiles.Add(filename);
                     if(STOP_ON_ERROR) return false;
+                    else
+                    {
+                        unfold.Files.RemoveAt(0);
+                    }
                 }
             }
 

@DescribeCompilerAPI/Translators/DescribeTranslator.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -43,6 +44,12 @@ public abstract bool IsInitialized
             get;
             protected set;
         }
+
+
+        public abstract string TranslateUnfold(DescribeUnfold u);
+        public abstract bool LoadExternalTemplates(string path);
+        public abstract bool LoadInternalTemplates(string name);
+
     }
 }
 // After we have parsed our files and optimized the resulting parse tree to content in an Unfold

@DescribeCompilerAPI/Translators/HtmlTranslator.cs

@@ -107,7 +107,7 @@ public HtmlTranslator()
         /// </summary>
         /// <param name="path">The path to the desired templates folder</param>
         /// <returns>True if successful</returns>
-        public bool LoadExternalTemplates(string path)
+        public override bool LoadExternalTemplates(string path)
         {
             try
             {
@@ -159,7 +159,7 @@ public bool LoadExternalTemplates(string path)
         /// </summary>
         /// <param name="name">The name of the internal folder</param>
         /// <returns>True if successful</returns>
-        public bool LoadInternalTemplates(string name)
+        public override bool LoadInternalTemplates(string name)
         {
             try
             {
@@ -193,7 +193,7 @@ public bool LoadInternalTemplates(string name)
         /// </summary>
         /// <param name="u">The unfold to be translated</param>
         /// <returns>The generated html code</returns>
-        public string TranslateUnfold(DescribeUnfold u)
+        public override string TranslateUnfold(DescribeUnfold u)
         {
             if (IsInitialized == false) return null;
 

@DescribeCompilerAPI/Translators/JsonTranslator.cs

@@ -284,7 +284,7 @@ public JsonTranslator(Action<string> logText, Action<string> logError, Action<st
         /// </summary>
         /// <param name="path">The path to the desired templates folder</param>
         /// <returns>True if successful</returns>
-        public bool LoadExternalTemplates(string path)
+        public override bool LoadExternalTemplates(string path)
         {
             try
             {
@@ -337,7 +337,7 @@ public bool LoadExternalTemplates(string path)
         /// </summary>
         /// <param name="name">The name of the internal folder</param>
         /// <returns>True if successful</returns>
-        public bool LoadInternalTemplates(string name)
+        public override bool LoadInternalTemplates(string name)
         {
             try
             {
@@ -374,7 +374,7 @@ public bool LoadInternalTemplates(string name)
         /// </summary>
         /// <param name="u">The unfold to be translated</param>
         /// <returns>The generated JSON code</returns>
-        public string TranslateUnfold(DescribeUnfold u)
+        public override string TranslateUnfold(DescribeUnfold u)
         {
             if (IsInitialized == false) return null;
 

@DescribeCompilerCLI/DescribeCompilerCLI.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>-h</StartArguments>
+    <StartArguments>parse-folder "C:\Users\Viktor Chernev\Desktop\docs-scratch\TestData" "C:\Users\Viktor Chernev\Desktop\docs-scratch\result.json" template="JSON_COMMONER" verbosity=low logfile="C:\Users\Viktor Chernev\Desktop\docs-scratch\last-log.txt" dsonly toponly=false onerror=ignore</StartArguments>
   </PropertyGroup>
   <PropertyGroup>
     <PublishUrlHistory>C:\Users\Viktor Chernev\Desktop\DescribeParser\%40CompilerCLI\Release\|publish\</PublishUrlHistory>

@DescribeCompilerCLI/FunctionsArguments.cs

@@ -1,10 +1,6 @@
 using DescribeCompiler;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DescribeCompilerCLI
 {
@@ -90,7 +86,7 @@ internal static bool readInputFileArgument(string arg, int argindex)
             }
             catch (Exception ex)
             {
-                Messages.printArgumentError(arg, argindex, "is not a valid file or folder");
+                Messages.printArgumentError(arg, argindex, "is not a valid file");
                 return false;
             }
         }
@@ -120,7 +116,7 @@ internal static bool readInputFolderArgument(string arg, int argindex)
             }
             catch (Exception ex)
             {
-                Messages.printArgumentError(arg, argindex, "is not a valid file or folder");
+                Messages.printArgumentError(arg, argindex, "is not a valid folder");
                 return false;
             }
         }
@@ -131,7 +127,7 @@ internal static bool readInputFolderArgument(string arg, int argindex)
         /// <param name="arg">The argument raw text</param>
         /// <param name="argindex">The index of the argument (for logging purposes)</param>
         /// <returns>True if successful</returns>
-        internal static bool readOutputArgument(string arg, int argindex)
+        internal static bool readOutputArgument(string arg, int argindex, bool isDir)
         {
             try
             {
@@ -155,8 +151,7 @@ internal static bool readOutputArgument(string arg, int argindex)
                     DirectoryInfo di = Directory.GetParent(arg);
                     if (di.Exists)
                     {
-                        if (Path.GetFileName(arg) == string.Empty) Datnik.isOutputDir = true;
-                        else Datnik.isOutputDir = false;
+                        Datnik.isOutputDir = isDir;
                         Datnik.output = arg;
                         return true;
                     }
@@ -204,17 +199,9 @@ internal static bool readOutputFileArgument(string arg, int argindex)
                     DirectoryInfo di = Directory.GetParent(arg);
                     if (di.Exists)
                     {
-                        if (Path.GetFileName(arg) == string.Empty)
-                        {
-                            Messages.printArgumentError(arg, argindex, "is a folder. File is required");
-                            return false;
-                        }
-                        else
-                        {
-                            Datnik.output = arg;
-                            Datnik.isOutputDir = false;
-                            return true;
-                        }
+                        Datnik.output = arg;
+                        Datnik.isOutputDir = false;
+                        return true;
                     }
                     else
                     {
@@ -241,13 +228,13 @@ internal static bool readOutputFolderArgument(string arg, int argindex)
         {
             try
             {
-                //existing file - ok
+                //existing file - not ok
                 if (File.Exists(arg))
                 {
                     Messages.printArgumentError(arg, argindex, "is a file. Folder is required");
                     return false;
                 }
-                //existing dir - not ok
+                //existing dir - ok
                 else if (Directory.Exists(arg))
                 {
                     Datnik.output = arg;
@@ -260,17 +247,9 @@ internal static bool readOutputFolderArgument(string arg, int argindex)
                     DirectoryInfo di = Directory.GetParent(arg);
                     if (di.Exists)
                     {
-                        if (Path.GetFileName(arg) == string.Empty)
-                        {
-                            Datnik.output = arg;
-                            Datnik.isOutputDir = true;
-                            return true;
-                        }
-                        else
-                        {
-                            Messages.printArgumentError(arg, argindex, "is a file. Folder is required");
-                            return false;
-                        }
+                        Datnik.output = arg;
+                        Datnik.isOutputDir = true;
+                        return true;
                     }
                     else
                     {
@@ -306,9 +285,8 @@ internal static bool readDsonlyArgument(string arg, int argindex)
                     Messages.printArgumentError(arg, argindex, "");
                     return false;
                 }
-                else if (val == "true" || val == "l") Datnik.verbosity = LogVerbosity.Low;
-                else if (val == "medium" || val == "m") Datnik.verbosity = LogVerbosity.Medium;
-                else if (val == "high" || val == "h") Datnik.verbosity = LogVerbosity.High;
+                else if (val == "true") Datnik.dsOnly = true;
+                else if (val == "false") Datnik.dsOnly = false;
                 else
                 {
                     Messages.printArgumentError(arg,
@@ -453,8 +431,7 @@ internal static bool readTemplateArgument(string arg, int argindex)
                 }
                 else
                 {
-                    FileAttributes attr = File.GetAttributes(val);
-                    if ((attr & FileAttributes.Directory) == FileAttributes.Directory)
+                    if(Directory.Exists(val))
                     {
                         Datnik.templateName = new DirectoryInfo(val).Name;
                         Datnik.templatePath = val;
@@ -464,7 +441,6 @@ internal static bool readTemplateArgument(string arg, int argindex)
                     else
                     {
                         string[] names = ResourceUtil.extractResourceNames();
-                        bool flag = false;
                         foreach (string s in names)
                         {
                             if (s.StartsWith("DescribeCompiler.Templates." + val + "."))
@@ -499,27 +475,37 @@ internal static bool readLogfileArgument(string arg, int argindex)
         {
             try
             {
+                string val = arg.Substring(arg.IndexOf("=") + 1);
+                if (string.IsNullOrEmpty(val) || string.IsNullOrWhiteSpace(val))
+                {
+                    Messages.printArgumentError(arg, argindex, "");
+                    return false;
+                }
+                //there is a bug in visual studio I think where if your path
+                //in the command line parameter is in parentheses and ends with
+                //a backslash, it is treated as an escaped backslash
+
                 //existing file - ok
-                if (File.Exists(arg))
+                if (File.Exists(val))
                 {
-                    Datnik.logFilePath = arg;
+                    Datnik.logFilePath = val;
                     Datnik.logToFile = true;
                     return true;
                 }
                 //existing dir - ok
-                else if (Directory.Exists(arg))
+                else if (Directory.Exists(val))
                 {
-                    Datnik.logFilePath = arg;
+                    Datnik.logFilePath = Path.Combine(val, "lastlog.txt");
                     Datnik.logToFile = true;
                     return true;
                 }
                 else
                 {
                     // notexisting file or dir - we want parent dir to exist
-                    DirectoryInfo di = Directory.GetParent(arg);
+                    DirectoryInfo di = Directory.GetParent(val);
                     if (di.Exists)
                     {
-                        Datnik.logFilePath = arg;
+                        Datnik.logFilePath = val;
                         Datnik.logToFile = true;
                         return true;
                     }
@@ -558,9 +544,10 @@ internal static bool readArtifactsArgument(string arg, int argindex)
                     Messages.printArgumentError(arg, argindex, "");
                     return false;
                 }
-                else if (val == "low" || val == "l") Datnik.verbosity = LogVerbosity.Low;
-                else if (val == "medium" || val == "m") Datnik.verbosity = LogVerbosity.Medium;
-                else if (val == "high" || val == "h") Datnik.verbosity = LogVerbosity.High;
+                else if (val == "m" || val == "makeonly") Datnik.artifactMode = DescribeCompiler.Compiler.ArtifactMode.MakeOnly;
+                else if (val == "t" || val == "takeonly") Datnik.artifactMode = DescribeCompiler.Compiler.ArtifactMode.TakeOnly;
+                else if (val == "u" || val == "use") Datnik.artifactMode = DescribeCompiler.Compiler.ArtifactMode.Use;
+                else if (val == "n" || val == "no") Datnik.artifactMode = DescribeCompiler.Compiler.ArtifactMode.No;
                 else
                 {
                     Messages.printArgumentError(arg,
@@ -588,10 +575,17 @@ internal static bool readArtifactsPathArgument(string arg, int argindex)
         {
             try
             {
+                string val = arg.Substring(arg.IndexOf("=") + 1);
+                if (string.IsNullOrEmpty(val) || string.IsNullOrWhiteSpace(val))
+                {
+                    Messages.printArgumentError(arg, argindex, "");
+                    return false;
+                }
+
                 //existing dir - ok
-                if (Directory.Exists(arg))
+                if (Directory.Exists(val))
                 {
-                    Datnik.artifactsFolderPath = arg;
+                    Datnik.artifactsFolderPath = val;
                     return true;
                 }
                 else
@@ -610,7 +604,4 @@ internal static bool readArtifactsPathArgument(string arg, int argindex)
             }
         }
     }
-}
-// If we have an error and thus not able to set the datnik
-// field, we should reset it. Otherwise we might get half-set datnik
-// structure or previous command left-overs in the future
+}