Einarbeitung UTA und Bugfix RMC

This commit is contained in:
2024-06-05 11:51:10 +02:00
parent 7abf08e215
commit 59455f4110
10 changed files with 2054 additions and 496 deletions

View File

@@ -231,6 +231,9 @@
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="Renci.SshNet, Version=2024.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
<HintPath>..\packages\SSH.NET.2024.0.0\lib\net462\Renci.SshNet.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>

View File

@@ -140,7 +140,7 @@
<assemblyIdentity name="Renci.SshNet" publicKeyToken="1cee9f8bde3db106" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2014.4.6.0" newVersion="2014.4.6.0" />
<bindingRedirect oldVersion="0.0.0.0-2024.0.0.0" newVersion="2024.0.0.0" />
</dependentAssembly>
@@ -152,6 +152,22 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>

View File

@@ -75,19 +75,19 @@ Public Class frmAPIEinstellungen
End If
For Each r As DataGridViewRow In .Rows
If r.Cells("api_url").Value Is DBNull.Value Then
r.DefaultCellStyle.ForeColor = Color.Gray
ElseIf CBool(r.Cells("api_active").Value) = False Then
r.DefaultCellStyle.ForeColor = Color.Gray
End If
If r.Cells("api_url").Value Is DBNull.Value Then
r.DefaultCellStyle.ForeColor = Color.Gray
ElseIf CBool(r.Cells("api_active").Value) = False Then
r.DefaultCellStyle.ForeColor = Color.Gray
End If
If r.Cells("api_url").Value IsNot DBNull.Value AndAlso CheckAddress(r.Cells("api_url").Value) Then
DirectCast(r.Cells("isRunning"), DataGridViewImageCell).Value = My.Resources.ok
Else
DirectCast(r.Cells("isRunning"), DataGridViewImageCell).Value = My.Resources.del
End If
Next
End If
If r.Cells("api_url").Value IsNot DBNull.Value AndAlso CheckAddress(r.Cells("api_url").Value, r.Cells("api_user").Value, r.Cells("api_password").Value) Then
DirectCast(r.Cells("isRunning"), DataGridViewImageCell).Value = My.Resources.ok
Else
DirectCast(r.Cells("isRunning"), DataGridViewImageCell).Value = My.Resources.del
End If
Next
End If
End With
@@ -144,15 +144,42 @@ Public Class frmAPIEinstellungen
If DataGridView.SelectedRows.Count = 0 Then Exit Sub
End Sub
Private Function CheckAddress(url As String) As Boolean
Try
If url = "" Then Return False
Dim request As WebRequest = WebRequest.Create(url)
Dim response As WebResponse = request.GetResponse()
Catch ex As Exception
Return False
End Try
Return True
Private Function CheckAddress(url As String, user As String, pw As String) As Boolean
If url = "" Then Return False
If Not url.Contains("ftp") Then
Try
Dim request As WebRequest
request = WebRequest.Create(url)
Dim response As WebResponse = request.GetResponse()
Catch ex As Exception
Return False
End Try
Return True
Else
If url.StartsWith("ftp") Then
Dim request As FtpWebRequest
request = WebRequest.Create(url)
request.Credentials = New NetworkCredential(user, pw)
request.Method = WebRequestMethods.Ftp.GetFileSize
Try
Dim response As FtpWebResponse = request.GetResponse()
Catch ex As WebException
Dim response As FtpWebResponse = ex.Response
If FtpStatusCode.ActionNotTakenFileUnavailable = response.StatusCode Then
Return False
End If
End Try
End If
Return True
End If
End Function
Private Sub txtSuche_KeyDown(sender As Object, e As KeyEventArgs) Handles txtSuche.KeyDown

View File

@@ -27,6 +27,7 @@
<package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net40-Client" requireReinstallation="True" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net47" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net47" />
<package id="SSH.NET" version="2024.0.0" targetFramework="net47" />
<package id="System.Buffers" version="4.5.1" targetFramework="net47" />
<package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net47" />
<package id="System.IO.Packaging" version="4.0.0" targetFramework="net47" />