AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update deps, deprecate Language

Browse Source
This commit is contained in:
Jonathan Jenne
2023-10-13 09:44:59 +02:00
parent 5df933c5f5
commit 76ab452b3f
12 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GUIs.ClipboardWatcher/ClipboardWatcher.vbproj
View File

@@ -73,10 +73,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Modules.EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Language, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>

32
GUIs.ClipboardWatcher/ProfileFilter.vb
View File

@@ -405,8 +405,8 @@ Public Class ProfileFilter
Dim oCountConnectionId = String.Empty
Try
oCountCommand = NotNull(oRow.Item("COUNT_COMMAND"), String.Empty)
oCountConnectionId = NotNull(oRow.Item("CONN_ID"), 0)
oCountCommand = oRow.ItemEx("COUNT_COMMAND", String.Empty)
oCountConnectionId = oRow.ItemEx("CONN_ID", 0)
If oCountCommand = String.Empty Then
Logger.Debug("Data SQL Query is empty. Skipping.")
@@ -421,7 +421,7 @@ Public Class ProfileFilter
Logger.Debug("Count-Command DATA before execute: [{0}]", oCountCommand)
Dim oConnectionString = ProfileUtils.GetConnectionString(Database, oCountConnectionId)
oResultData += NotNull(Of Integer)(Database.GetScalarValueWithConnection(oCountCommand, oConnectionString), 0)
oResultData += ObjectEx.NotNull(Of Integer)(Database.GetScalarValueWithConnection(oCountCommand, oConnectionString), 0)
Logger.Debug("Datarows returned from search: [{0}]", oResultData)
Catch ex As Exception
@@ -436,8 +436,8 @@ Public Class ProfileFilter
Dim oCountConnectionId = String.Empty
Try
oCountCommand = NotNull(oRow.Item("COUNT_COMMAND"), String.Empty)
oCountConnectionId = NotNull(oRow.Item("CONN_ID"), 0)
oCountCommand = oRow.ItemEx("COUNT_COMMAND", String.Empty)
oCountConnectionId = oRow.ItemEx("CONN_ID", 0)
If oCountCommand = String.Empty Then
Logger.Debug("Document SQL Query is empty. Skipping.")
@@ -452,7 +452,7 @@ Public Class ProfileFilter
Logger.Debug("Count-Command for Documents BEFORE execute: [{0}]", oCountCommand)
Dim oConnectionString = ProfileUtils.GetConnectionString(Database, oCountConnectionId)
oResultDocs += NotNull(Of Integer)(Database.GetScalarValueWithConnection(oCountCommand, oConnectionString), 0)
oResultDocs += ObjectEx.NotNull(Of Integer)(Database.GetScalarValueWithConnection(oCountCommand, oConnectionString), 0)
Logger.Debug("Documents returned from search: [{0}]", oResultDocs)
Catch ex As Exception
@@ -577,9 +577,9 @@ Public Class ProfileFilter
oList.Add(New ProfileData() With {
.Guid = oRow.Item("GUID"),
.Regex = oRow.Item("REGEX_EXPRESSION"),
.Name = NotNull(oRow.Item("NAME"), String.Empty),
.Comment = NotNull(oRow.Item("COMMENT"), String.Empty),
.ProfileType = NotNull(oRow.Item("PROFILE_TYPE"), String.Empty),
.Name = oRow.ItemEx("NAME", String.Empty),
.Comment = oRow.ItemEx("COMMENT", String.Empty),
.ProfileType = oRow.ItemEx("PROFILE_TYPE", String.Empty),
.Processes = oProcessList,
.Windows = oWindowList,
.Controls = oControlList
@@ -605,9 +605,9 @@ Public Class ProfileFilter
If oRow.Item("PROFILE_ID") = ProfileId Then
oControlList.Add(New ControlData() With {
.Guid = oRow.Item("GUID"),
.ProcessName = NotNull(oRow.Item("PROCESS_NAME"), String.Empty),
.ControlName = NotNull(oRow.Item("CONTROL_NAME"), String.Empty),
.Description = NotNull(oRow.Item("DESCRIPTION"), String.Empty),
.ProcessName = oRow.ItemEx("PROCESS_NAME", String.Empty),
.ControlName = oRow.ItemEx("CONTROL_NAME", String.Empty),
.Description = oRow.ItemEx("DESCRIPTION", String.Empty),
.WindowId = oRow.Item("WINDOW_ID"),
.TopLeft = New ControlBounds() With {
.Left = oRow.Item("TOPLEFT_LEFT"),
@@ -652,7 +652,7 @@ Public Class ProfileFilter
oProcessList.Add(New ProcessData() With {
.Guid = oRow.Item("GUID"),
.PROFILE_ID = oRow.Item("PROFILE_ID"),
.ProcessName = NotNull(oRow.Item("PROC_NAME"), String.Empty)
.ProcessName = oRow.ItemEx("PROC_NAME", String.Empty)
})
End If
Next
@@ -676,9 +676,9 @@ Public Class ProfileFilter
oWindowList.Add(New WindowData() With {
.Guid = oRow.Item("GUID"),
.WindowProcessID = oRow.Item("PROCESS_ID"),
.Title = NotNull(oRow.Item("DESCRIPTION"), String.Empty),
.Regex = NotNull(oRow.Item("REGEX"), String.Empty),
.Sequence = NotNull(oRow.Item("SEQUENCE"), 0)
.Title = oRow.ItemEx("DESCRIPTION", String.Empty),
.Regex = oRow.ItemEx("REGEX", String.Empty),
.Sequence = oRow.ItemEx("SEQUENCE", 0)
})
End If
Next

2
GUIs.ClipboardWatcher/ProfileSearches.vb
View File

@@ -64,7 +64,7 @@ Public Class ProfileSearches
' For now we assume these are document results instead of data results
Dim oSearches = Await LoadDocumentSearchesAsync(pProfile.Guid)
Dim oNameSlug = ConvertTextToSlug(pProfile.Name)
Dim oNameSlug = StringEx.ConvertTextToSlug(pProfile.Name)
Dim oSearchGuids = oSearches.Select(Function(s) s.Guid).ToArray
Dim oWindowGuid = $"{pProfile.Guid}-{oNameSlug}-{String.Join("-", oSearchGuids)}"
Dim oParams = New DocumentResultList.Params() With {

7
GUIs.ClipboardWatcher/frmMatch.vb
View File

@@ -9,6 +9,7 @@ Imports DigitalData.Modules.Language
Imports DigitalData.Modules.ZooFlow
Imports DigitalData.Modules.ZooFlow.Params
Imports DigitalData.Modules.ZooFlow.Constants
Imports DigitalData.Modules.Base
''' <summary>
'''
@@ -67,12 +68,12 @@ Public Class frmMatch
_Logger.Debug("ClipboardContents: [{0}]", Params.ClipboardContents)
_Logger.Debug("OperationModeOverride: [{0}]", Params.OperationModeOverride.ToString)
_Language = Utils.NotNull(_Environment.User.Language, State.UserState.LANG_EN_US)
_Language = ObjectEx.NotNull(_Environment.User.Language, State.UserState.LANG_EN_US)
Thread.CurrentThread.CurrentUICulture = New CultureInfo(_Language)
End Sub
Private Function GetResultString(CreatedTiles, MatchedProfiles, ClipboardContents) As String
Dim oLanguage = Utils.NotNull(_Environment.User.Language, State.UserState.LANG_EN_US)
Dim oLanguage = ObjectEx.NotNull(_Environment.User.Language, State.UserState.LANG_EN_US)
Select Case _Language
Case State.UserState.LANG_DE_DE
@@ -357,7 +358,7 @@ Public Class frmMatch
End Function
Private Sub OpenDataResults(Profile As ProfileData, Searches As List(Of ProfileSearches.Search))
Dim oNameSlug = Utils.ConvertTextToSlug(Profile.Name)
Dim oNameSlug = StringEx.ConvertTextToSlug(Profile.Name)
Dim oSearchGuids = Searches.Select(Function(s) s.Guid).ToArray
Dim oWindowGuid = $"{Profile.Guid}-{oNameSlug}-{String.Join("-", oSearchGuids)}"
Dim oParams = New DataResultParams() With {