Console App dos2ux added

Author: A9G-Data-Droid

TextFileConvert.sln

@@ -5,6 +5,8 @@ VisualStudioVersion = 15.0.27428.2037
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TextFileConvert", "TextFileConvert\TextFileConvert.vbproj", "{C6D516A4-A83D-405A-8F46-DF37C9C25D4B}"
 EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "dos2ux", "dos2ux\dos2ux.vbproj", "{AA1FC840-1A4A-4F07-BAFC-8B281CEE6F10}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{C6D516A4-A83D-405A-8F46-DF37C9C25D4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C6D516A4-A83D-405A-8F46-DF37C9C25D4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6D516A4-A83D-405A-8F46-DF37C9C25D4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA1FC840-1A4A-4F07-BAFC-8B281CEE6F10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA1FC840-1A4A-4F07-BAFC-8B281CEE6F10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA1FC840-1A4A-4F07-BAFC-8B281CEE6F10}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA1FC840-1A4A-4F07-BAFC-8B281CEE6F10}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TextFileConvert/ConvertLineEndings.vb

@@ -22,26 +22,29 @@ Public Class ConvertLineEndings
     ''' </summary>
     ''' <param name="originalFile">The file to convert.</param>
     ''' <param name="newFile">The name of a new file to create.</param>
-    Public Sub Dos2Ux(originalFile As String, newFile As String)
-        ReplaceLineEndings(originalFile, newFile, TextConvertMode.Dos2Ux)
-    End Sub
+    ''' <returns>Exit code.</returns>
+    Public Shared Async Function Dos2Ux(originalFile As String, newFile As String) As Task(Of Integer)
+        Return Await ReplaceLineEndings(originalFile, newFile, TextConvertMode.Dos2Ux)
+    End Function
 
     ''' <summary>
     ''' Converts a DOS text file to have Unix line endings.
     ''' </summary>
     ''' <param name="originalFile">The file to convert.</param>
     ''' <param name="newFile">The name of a new file to create.</param>
-    Public Sub Ux2Dos(originalFile As String, newFile As String)
-        ReplaceLineEndings(originalFile, newFile, TextConvertMode.Ux2Dos)
-    End Sub
+    ''' <returns>Exit code.</returns>
+    Public Shared Async Function Ux2Dos(originalFile As String, newFile As String) As Task(Of Integer)
+        Return Await ReplaceLineEndings(originalFile, newFile, TextConvertMode.Ux2Dos)
+    End Function
 
     ''' <summary>
     ''' Loads a whole text file in to memory, Performs a find\replace, and writes a new file.
     ''' </summary>
     ''' <param name="originalFile">The file to convert.</param>
     ''' <param name="newFile">The name of a new file to create.</param>
     ''' <param name="convertMode">This is the type of conversion we are going to perform</param>
-    Private Async Sub ReplaceLineEndings(originalFile As String, newFile As String, convertMode As TextConvertMode)
+    ''' <returns>Exit code.</returns>
+    Private Shared Async Function ReplaceLineEndings(originalFile As String, newFile As String, convertMode As TextConvertMode) As Task(Of Integer)
         Dim convertedText As New StringBuilder
         Dim oldFileStream As FileStream = Nothing
         Try
@@ -70,16 +73,27 @@ Public Class ConvertLineEndings
                             End If
                         Case Else
                             Debug.Print("Unimplemented text conversion mode")
-                            Exit Sub
+                            Return -1
                     End Select
                     convertedText.Append(readBuffer)
                 Loop
             End Using
             oldFileStream = Nothing
         Catch ex As Exception
             Debug.Print("Error: " & ex.Message & vbCrLf & "Number: " & ex.HResult)
+            Return ex.HResult
         Finally
             If oldFileStream IsNot Nothing Then oldFileStream.Dispose()
         End Try
-    End Sub
+
+        'Write the result out to a new file
+        Try
+            Await File.WriteAllTextAsync(newFile, convertedText.ToString())
+        Catch ex As Exception
+            Debug.Print("Error: " & ex.Message & vbCrLf & "Number: " & ex.HResult)
+            Return ex.HResult
+        End Try
+
+        Return 0 ' Exit status 0 is a good thing
+    End Function
 End Class

dos2ux/Program.vb

@@ -0,0 +1,45 @@
+Imports System
+Imports TextFileConvert
+
+Module Program
+    Sub Main(args As String())
+        Dim exitCode As Integer
+        If args.LongCount() > 2 OrElse args(0) = Nothing OrElse args(1) = Nothing Then
+            PrintInstructions()
+            exitCode = 87
+        Else
+            Console.WriteLine("Perform DOS to UNIX conversion")
+            Dim runAsync As Task(Of Integer) = ConvertLineEndings.Dos2Ux(args(0), args(1))
+            Try
+                runAsync.Wait()
+            Catch ex As Exception
+                ' We handle failure later
+            End Try
+
+            If runAsync.Status = TaskStatus.Faulted Then
+                Console.WriteLine("Conversion failed.")
+                exitCode = 188
+            Else
+                Console.WriteLine("Conversion complete.")
+                exitCode = runAsync.Result
+            End If
+        End If
+
+        Environment.ExitCode = exitCode
+    End Sub
+
+    Private Sub PrintInstructions()
+        Dim helpMessage As String
+        helpMessage =
+            "NAME
+    dos2ux - Convert ASCII file format
+
+SYNOPSIS
+    dos2ux oldfilename newfilename
+
+DESCRIPTION
+    dos2ux reads oldfilename and writes out newfilename, converting line endings from UNIX (LF) to DOS (CRLF)
+            "
+        Console.WriteLine(helpMessage)
+    End Sub
+End Module

dos2ux/dos2ux.vbproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>dos2ux</RootNamespace>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\TextFileConvert\TextFileConvert.vbproj" />
+  </ItemGroup>
+
+</Project>