Aggiungi tab modifica file Okuma

TrasferimentoProgrammiOkuma.App/Form1.vb

@@ -42,6 +42,13 @@ Public Class Form1
     Private ReadOnly nudIntervalloStatoMoxa As New NumericUpDown()
     Private ReadOnly lstStatoMoxa As New ListView()
     Private ReadOnly imgStatoMoxa As New ImageList()
+    Private ReadOnly txtFileModifica As New TextBox()
+    Private ReadOnly txtNomeFileModifica As New TextBox()
+    Private ReadOnly btnSfogliaModifica As New Button()
+    Private ReadOnly btnRendiMaiuscolo As New Button()
+    Private ReadOnly btnAggiungiElementiOkuma As New Button()
+    Private ReadOnly btnSalvaModifica As New Button()
+    Private ReadOnly rtbEditorModifica As New RichTextBox()
     Private ReadOnly statusTimer As New System.Windows.Forms.Timer()
     Private ReadOnly txtLog As New TextBox()
     Private ReadOnly progress As New ProgressBar()
@@ -52,6 +59,7 @@ Public Class Form1
     Private controlsUnlocked As Boolean
     Private loadingSelection As Boolean
     Private checkingMoxaStatus As Boolean
+    Private currentEditDirectory As String = ""
 
     Public Sub New()
         InitializeComponent()
@@ -87,8 +95,10 @@ Public Class Form1
 
         Dim tabs As New TabControl With {.Dock = DockStyle.Fill, .Margin = Padding.Empty}
         Dim tabTrasferimento As New TabPage("Trasferimento programmi")
+        Dim tabModificaFile As New TabPage("Modifica file")
         Dim tabStatoMoxa As New TabPage("Stato Moxa")
         tabs.TabPages.Add(tabTrasferimento)
+        tabs.TabPages.Add(tabModificaFile)
         tabs.TabPages.Add(tabStatoMoxa)
         shell.Controls.Add(tabs, 0, 1)
 
@@ -253,6 +263,7 @@ Public Class Form1
         AddHandler btnAnnulla.Click, Sub() cts?.Cancel()
 
         txtFileRicezione.Text = GetInitialReceiveDirectory()
+        BuildEditFileTab(tabModificaFile)
         BuildStatusTab(tabStatoMoxa)
         Log($"Pronto. Configurazione: {ConfigPath()}")
     End Sub
@@ -281,6 +292,232 @@ Public Class Form1
         Return Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory)
     End Function
 
+    Private Sub BuildEditFileTab(tab As TabPage)
+        Dim root As New TableLayoutPanel With {
+            .Dock = DockStyle.Fill,
+            .ColumnCount = 1,
+            .RowCount = 3,
+            .Padding = New Padding(14)
+        }
+        root.RowStyles.Add(New RowStyle(SizeType.AutoSize))
+        root.RowStyles.Add(New RowStyle(SizeType.Percent, 100))
+        root.RowStyles.Add(New RowStyle(SizeType.AutoSize))
+        tab.Controls.Add(root)
+
+        Dim selectors As New TableLayoutPanel With {.Dock = DockStyle.Top, .ColumnCount = 4, .RowCount = 2, .AutoSize = True}
+        selectors.ColumnStyles.Add(New ColumnStyle(SizeType.AutoSize))
+        selectors.ColumnStyles.Add(New ColumnStyle(SizeType.Percent, 100))
+        selectors.ColumnStyles.Add(New ColumnStyle(SizeType.AutoSize))
+        selectors.ColumnStyles.Add(New ColumnStyle(SizeType.Absolute, 150))
+        root.Controls.Add(selectors, 0, 0)
+
+        ConfigureButton(btnSfogliaModifica, "Sfoglia")
+        ConfigureButton(btnRendiMaiuscolo, "Rendi Maiuscolo")
+        ConfigureButton(btnAggiungiElementiOkuma, "Aggiungi elementi Necessari")
+        ConfigureButton(btnSalvaModifica, "Salva")
+        txtFileModifica.Dock = DockStyle.Fill
+        txtFileModifica.ReadOnly = True
+        txtNomeFileModifica.Dock = DockStyle.Fill
+
+        selectors.Controls.Add(New Label With {.Text = "File", .AutoSize = True, .Anchor = AnchorStyles.Left}, 0, 0)
+        selectors.Controls.Add(txtFileModifica, 1, 0)
+        selectors.Controls.Add(btnSfogliaModifica, 2, 0)
+        selectors.Controls.Add(New Label With {.Text = "Nome salvataggio", .AutoSize = True, .Anchor = AnchorStyles.Left, .Margin = New Padding(0, 8, 3, 0)}, 0, 1)
+        selectors.Controls.Add(txtNomeFileModifica, 1, 1)
+
+        rtbEditorModifica.Dock = DockStyle.Fill
+        rtbEditorModifica.Font = New Font("Consolas", 10.0F)
+        rtbEditorModifica.WordWrap = False
+        rtbEditorModifica.AcceptsTab = True
+        rtbEditorModifica.ScrollBars = RichTextBoxScrollBars.Both
+        rtbEditorModifica.DetectUrls = False
+        rtbEditorModifica.HideSelection = False
+        rtbEditorModifica.Margin = New Padding(0, 12, 0, 12)
+        root.Controls.Add(rtbEditorModifica, 0, 1)
+
+        Dim actions As New FlowLayoutPanel With {.Dock = DockStyle.Fill, .AutoSize = True, .FlowDirection = FlowDirection.LeftToRight}
+        actions.Controls.Add(btnRendiMaiuscolo)
+        actions.Controls.Add(btnAggiungiElementiOkuma)
+        actions.Controls.Add(btnSalvaModifica)
+        root.Controls.Add(actions, 0, 2)
+
+        AddHandler btnSfogliaModifica.Click, AddressOf SelectEditFile
+        AddHandler btnRendiMaiuscolo.Click, AddressOf UppercaseEditFile
+        AddHandler btnAggiungiElementiOkuma.Click, AddressOf AddOkumaElements
+        AddHandler btnSalvaModifica.Click, AddressOf SaveEditedFile
+    End Sub
+
+    Private Sub SelectEditFile(sender As Object, e As EventArgs)
+        Using dialog As New OpenFileDialog With {
+            .Title = "Seleziona file da modificare",
+            .Filter = "Tutti i file (*.*)|*.*",
+            .CheckFileExists = True
+        }
+            If Directory.Exists(currentEditDirectory) Then
+                dialog.InitialDirectory = currentEditDirectory
+            Else
+                dialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory)
+            End If
+
+            If dialog.ShowDialog(Me) <> DialogResult.OK Then
+                Return
+            End If
+
+            Dim bytes = File.ReadAllBytes(dialog.FileName)
+            Dim content = Encoding.Latin1.GetString(bytes)
+            txtFileModifica.Text = dialog.FileName
+            txtNomeFileModifica.Text = Path.GetFileName(dialog.FileName)
+            currentEditDirectory = Path.GetDirectoryName(dialog.FileName)
+            rtbEditorModifica.Text = ToVisibleControlText(content)
+            Log($"File caricato per modifica: {dialog.FileName}")
+        End Using
+    End Sub
+
+    Private Sub UppercaseEditFile(sender As Object, e As EventArgs)
+        rtbEditorModifica.Text = rtbEditorModifica.Text.ToUpperInvariant()
+    End Sub
+
+    Private Sub AddOkumaElements(sender As Object, e As EventArgs)
+        Dim fileName = txtNomeFileModifica.Text.Trim()
+        If String.IsNullOrWhiteSpace(fileName) Then
+            MessageBox.Show(Me, "Inserire il nome del file da usare nell'intestazione Okuma.", "Modifica file", MessageBoxButtons.OK, MessageBoxIcon.Warning)
+            Return
+        End If
+
+        Dim content = FromVisibleControlText(rtbEditorModifica.Text)
+        Dim header = ChrW(&H12) & " $" & fileName & " %" & vbCrLf
+        Dim footer = "%" & vbCrLf & ChrW(&H14)
+
+        If Not content.StartsWith(ChrW(&H12), StringComparison.Ordinal) Then
+            content = header & content
+        End If
+
+        If Not EndsWithOkumaFooter(content) Then
+            If content.Length > 0 AndAlso Not content.EndsWith(vbCrLf, StringComparison.Ordinal) Then
+                content &= vbCrLf
+            End If
+            content &= footer
+        End If
+
+        rtbEditorModifica.Text = ToVisibleControlText(content)
+    End Sub
+
+    Private Sub SaveEditedFile(sender As Object, e As EventArgs)
+        Dim fileName = txtNomeFileModifica.Text.Trim()
+        If String.IsNullOrWhiteSpace(fileName) OrElse fileName.IndexOfAny(Path.GetInvalidFileNameChars()) >= 0 Then
+            MessageBox.Show(Me, "Inserire un nome file valido.", "Salva file", MessageBoxButtons.OK, MessageBoxIcon.Warning)
+            Return
+        End If
+
+        Using dialog As New SaveFileDialog With {
+            .Title = "Salva file modificato",
+            .Filter = "Tutti i file (*.*)|*.*",
+            .FileName = fileName,
+            .OverwritePrompt = True
+        }
+            If Directory.Exists(currentEditDirectory) Then
+                dialog.InitialDirectory = currentEditDirectory
+            ElseIf Not String.IsNullOrWhiteSpace(txtFileModifica.Text) AndAlso Directory.Exists(Path.GetDirectoryName(txtFileModifica.Text)) Then
+                dialog.InitialDirectory = Path.GetDirectoryName(txtFileModifica.Text)
+            Else
+                dialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory)
+            End If
+
+            If dialog.ShowDialog(Me) <> DialogResult.OK Then
+                Return
+            End If
+
+            Dim content = FromVisibleControlText(rtbEditorModifica.Text)
+            File.WriteAllBytes(dialog.FileName, Encoding.Latin1.GetBytes(content))
+            currentEditDirectory = Path.GetDirectoryName(dialog.FileName)
+            txtFileModifica.Text = dialog.FileName
+            txtNomeFileModifica.Text = Path.GetFileName(dialog.FileName)
+            Log($"File modificato salvato: {dialog.FileName}")
+        End Using
+    End Sub
+
+    Private Shared Function EndsWithOkumaFooter(content As String) As Boolean
+        Dim trimmed = content.TrimEnd(ControlChars.Cr, ControlChars.Lf, ControlChars.NullChar, " "c, ControlChars.Tab)
+        Return trimmed.EndsWith(ChrW(&H14), StringComparison.Ordinal)
+    End Function
+
+    Private Shared Function ToVisibleControlText(content As String) As String
+        Dim builder As New StringBuilder(content.Length)
+        For Each ch In content
+            Select Case AscW(ch)
+                Case &H0
+                    builder.Append("[NUL]")
+                Case &HA
+                    builder.Append("[LF]")
+                Case &HD
+                    builder.Append("[CR]")
+                Case &H12
+                    builder.Append("[DC2]")
+                Case &H14
+                    builder.Append("[DC4]")
+                Case 1 To 8, 11, 12, 14 To 17, 19, 21 To 31
+                    builder.Append($"[0x{AscW(ch):X2}]")
+                Case Else
+                    builder.Append(ch)
+            End Select
+        Next
+        Return builder.ToString()
+    End Function
+
+    Private Shared Function FromVisibleControlText(visibleText As String) As String
+        Dim builder As New StringBuilder(visibleText.Length)
+        Dim i = 0
+        While i < visibleText.Length
+            If visibleText(i) = "["c Then
+                Dim closeIndex = visibleText.IndexOf("]"c, i + 1)
+                If closeIndex > i Then
+                    Dim token = visibleText.Substring(i + 1, closeIndex - i - 1)
+                    Dim controlChar As Char
+                    If TryParseControlToken(token, controlChar) Then
+                        builder.Append(controlChar)
+                        i = closeIndex + 1
+                        Continue While
+                    End If
+                End If
+            End If
+
+            builder.Append(visibleText(i))
+            i += 1
+        End While
+        Return builder.ToString()
+    End Function
+
+    Private Shared Function TryParseControlToken(token As String, ByRef controlChar As Char) As Boolean
+        Select Case token.Trim().ToUpperInvariant()
+            Case "NUL"
+                controlChar = ChrW(&H0)
+                Return True
+            Case "LF"
+                controlChar = ControlChars.Lf
+                Return True
+            Case "CR"
+                controlChar = ControlChars.Cr
+                Return True
+            Case "DC2"
+                controlChar = ChrW(&H12)
+                Return True
+            Case "DC4"
+                controlChar = ChrW(&H14)
+                Return True
+        End Select
+
+        If token.StartsWith("0x", StringComparison.OrdinalIgnoreCase) Then
+            Dim value As Integer
+            If Integer.TryParse(token.Substring(2), Globalization.NumberStyles.HexNumber, Globalization.CultureInfo.InvariantCulture, value) AndAlso value >= 0 AndAlso value <= 31 Then
+                controlChar = ChrW(value)
+                Return True
+            End If
+        End If
+
+        controlChar = ControlChars.NullChar
+        Return False
+    End Function
+
     Private Sub BuildStatusTab(tab As TabPage)
         Dim root As New TableLayoutPanel With {
             .Dock = DockStyle.Fill,

TrasferimentoProgrammiOkuma.App/Properties/PublishProfiles/GiteaClickOnce.pubxml

@@ -16,9 +16,9 @@
     <ProductName>LMEMoxaTransfer</ProductName>
     <PublisherName>Compomac SPA</PublisherName>
     <SuiteName>Compomac SPA</SuiteName>
-    <ApplicationVersion>1.0.5.0</ApplicationVersion>
+    <ApplicationVersion>1.0.6.0</ApplicationVersion>
     <UpdateRequired>true</UpdateRequired>
-    <MinimumRequiredVersion>1.0.5.0</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.6.0</MinimumRequiredVersion>
     <GenerateManifests>true</GenerateManifests>
     <PublishSingleFile>false</PublishSingleFile>
     <SelfContained>true</SelfContained>

TrasferimentoProgrammiOkuma.App/TrasferimentoProgrammiOkuma.App.vbproj

@@ -9,7 +9,7 @@
     <AssemblyTitle>LMEMoxaTransfer</AssemblyTitle>
     <Company>Compomac SPA</Company>
     <Authors>Livio Merola</Authors>
-    <Version>1.0.5.0</Version>
+    <Version>1.0.6.0</Version>
     <ApplicationIcon>Assets\app-icon.ico</ApplicationIcon>
     <StartupObject>Sub Main</StartupObject>
     <UseWindowsForms>true</UseWindowsForms>

clickonce/LMEMoxaTransfer.application

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="LMEMoxaTransfer.application" version="1.0.5.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="LMEMoxaTransfer.application" version="1.0.6.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <description asmv2:publisher="Compomac SPA" co.v1:suiteName="Compomac SPA" asmv2:product="LMEMoxaTransfer" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <deployment install="true" minimumRequiredVersion="1.0.5.0">
+  <deployment install="true" minimumRequiredVersion="1.0.6.0">
     <subscription>
       <update>
         <beforeApplicationStartup />
@@ -15,13 +15,13 @@
   </compatibleFrameworks>
   <dependency>
     <dependentAssembly dependencyType="install" codebase="LMEMoxaTransfer.dll.manifest" size="108976">
-      <assemblyIdentity name="LMEMoxaTransfer.exe" version="1.0.5.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+      <assemblyIdentity name="LMEMoxaTransfer.exe" version="1.0.6.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>LUY2ptxSFoDL+WjYOi2LPVBg/PGNJN8aZ3otAyFtETI=</dsig:DigestValue>
+        <dsig:DigestValue>mJjUvvN5hw6/tcW5g2EyJiI9EO8sPmyPuPztuzjUPCY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

clickonce/LMEMoxaTransfer.deps.json

@@ -7,7 +7,7 @@
   "targets": {
     ".NETCoreApp,Version=v8.0": {},
     ".NETCoreApp,Version=v8.0/win-x64": {
-      "LMEMoxaTransfer/1.0.5.0": {
+      "LMEMoxaTransfer/1.0.6.0": {
         "dependencies": {
           "runtimepack.Microsoft.NETCore.App.Runtime.win-x64": "8.0.29",
           "runtimepack.Microsoft.WindowsDesktop.App.Runtime.win-x64": "8.0.29"
@@ -964,7 +964,7 @@
     }
   },
   "libraries": {
-    "LMEMoxaTransfer/1.0.5.0": {
+    "LMEMoxaTransfer/1.0.6.0": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

clickonce/LMEMoxaTransfer.dll.manifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="LMEMoxaTransfer.exe" version="1.0.5.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+  <asmv1:assemblyIdentity name="LMEMoxaTransfer.exe" version="1.0.6.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
   <description asmv2:iconFile="Assets\app-icon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
@@ -315,13 +315,13 @@
       <dsig:DigestValue>yJ3y5ECYB7uvuObMawI53X3eO2J8qP27QuUvy6Mqb6Q=</dsig:DigestValue>
     </hash>
   </file>
-  <file name="LMEMoxaTransfer.dll" size="70656">
+  <file name="LMEMoxaTransfer.dll" size="75264">
     <hash>
       <dsig:Transforms>
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
       <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-      <dsig:DigestValue>Nv4qL0FVotwOp0qThwBv1Tr1b8IhUz9qpLou6U+mSrk=</dsig:DigestValue>
+      <dsig:DigestValue>Q4QNVVMnrboRK/nE1I5KSdH9xm9grdRJVviEAibZY2w=</dsig:DigestValue>
     </hash>
   </file>
   <file name="LMEMoxaTransfer.exe" size="161280">
@@ -330,7 +330,7 @@
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
       <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-      <dsig:DigestValue>SicNxJyLSgEXGUJXoUjrisAwN6uPc8rDwLl7ieFjeF4=</dsig:DigestValue>
+      <dsig:DigestValue>dYrmcUD4rU7mO+e5LuUU1AXv/vbrRbxUUcjUqJvJ5XU=</dsig:DigestValue>
     </hash>
   </file>
   <file name="Microsoft.CSharp.dll" size="1005352">