Merge pull request 'Development' (#2) from adelgado/CET-Split-FANUC-Program-Backup:Development into next

Reviewed-on: http://cet-git:80/A9G-Data-Droid/CET-Split-FANUC-Program-Backup/pulls/2

Author: Adam Kauffman

Split-FANUC-Program-Backup/Program.cs

@@ -12,20 +12,29 @@ static class Program
     {
         private static string ThisExecutableName => AppDomain.CurrentDomain.FriendlyName;
         private static Version? AssemblyVersion => Assembly.GetExecutingAssembly().GetName().Version;
-        private static string VersionNumber => AssemblyVersion?.ToString() ?? String.Empty;
+        private static string VersionNumber => AssemblyVersion?.ToString() ?? string.Empty;
         private static string BuildDate
         {
             get {
+                DateTime buildDateTime;
                 Version? version = AssemblyVersion;
-                return new DateTime(2000, 1, 1)
-                    .AddDays(version.Build)
-                    .AddSeconds(version.Revision * 2).ToString("o");
+                if (version == null)
+                {
+                    buildDateTime = File.GetLastWriteTime(AppContext.BaseDirectory);
+                }
+                else
+                {
+                    buildDateTime = new DateTime(2000, 1, 1).AddDays(version.Build).AddSeconds(version.Revision * 2);
+                }
+
+                return buildDateTime.ToString("o");
             }
         }
 
         private const string cncProgramFileExtension = ".CNC";
         private const string defaultCNCprogramName = "Unknown";
         private const char programDelimiter = '%';
+        private static readonly char[] subFolderTrim = { ' ', '/' };
         private const int minimumProgramSize = 7;
 
         /// <summary>
@@ -67,7 +76,7 @@ static async Task<int> Main(string[] args)
             }
 
             // Make a subfolder named like the filename to hold all the programs we split out of it
-            string outputFolder = Path.Combine(backupFile.DirectoryName ?? String.Empty, Path.GetFileNameWithoutExtension(backupFile.Name));
+            string outputFolder = Path.Combine(backupFile.DirectoryName ?? string.Empty, Path.GetFileNameWithoutExtension(backupFile.Name));
             try
             {
                 Directory.CreateDirectory(outputFolder);
@@ -142,7 +151,7 @@ private static string GetProgramNameFromHeader(string cncProgramText)
                     }
 
                     // Strip out the directory flag and slashes to get just the folder name.
-                    subFolder = Regex.Replace(line, directoryFlag, string.Empty).Trim('/');
+                    subFolder = Regex.Replace(line, directoryFlag, string.Empty).Trim(subFolderTrim);
                     Directory.CreateDirectory(Path.Combine(outputFolder, subFolder));
 
                     // Don't append notation to next program
@@ -170,21 +179,22 @@ private static string GetProgramNameFromHeader(string cncProgramText)
         static string CncProgramText(StringBuilder content)
         {
             // Prevent IndexOutOfBounds exceptions if final program is empty
-            if (content.Length < minimumProgramSize)
+            if (content.Length > minimumProgramSize)
             {
-                return content.ToString();
-            }
+                // Add % to the top 
+                if (content.ToString()[0] != programDelimiter)
+                {
+                    content.Insert(0, Environment.NewLine);
+                    content.Insert(0, programDelimiter);
+                }
 
-            // Add % to the top 
-            if (content.ToString()[0] != programDelimiter)
-            {
-                content.Insert(0, Environment.NewLine);
-                content.Insert(0, programDelimiter);
+                // Add % to the bottom when missing
+                if (content.ToString().TrimEnd()[^1] != programDelimiter)
+                {
+                    content.AppendLine(programDelimiter.ToString());
+                }
             }
 
-            // Add % to the bottom when missing
-            if (content.ToString().TrimEnd()[^1] != programDelimiter) { content.AppendLine(programDelimiter.ToString()); }
-
             return content.ToString();
         }
 

Split-FANUC-Program-Backup/Split-FANUC-Program-Backup.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <RootNamespace>SplitFANUCProgramBackup</RootNamespace>
     <StartupObject></StartupObject>
     <Deterministic>False</Deterministic>