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

use Logging Module EVERYWHERE, fix some MarvMan bugs

Browse Source
This commit is contained in:
Jonathan Jenne
2020-03-04 12:24:43 +01:00
parent 13b36db5fb
commit c8c650922b
22 changed files with 1279 additions and 1178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
Global_Indexer/frmStart.vb
View File

@@ -30,7 +30,7 @@ Public Class frmStart
' End If
' Catch ex As Exception
' ClassLogger.Add(">> Icon file could not be read: " & ex.Message, False)
' LOGGER.Info(">> Icon file could not be read: " & ex.Message)
' End Try
' 'Me.i()
@@ -42,7 +42,7 @@ Public Class frmStart
Private Const mSnapOffset As Integer = 35
Private Const WM_WINDOWPOSCHANGING As Integer = &H46
<StructLayout(LayoutKind.Sequential)> _
<StructLayout(LayoutKind.Sequential)>
Public Structure WINDOWPOS
Public hwnd As IntPtr
Public hwndInsertAfter As IntPtr
@@ -75,7 +75,7 @@ Public Class frmStart
Try
' Marshal the LPARAM value which is a WINDOWPOS struct
Dim NewPosition As New WINDOWPOS
NewPosition = CType(Runtime.InteropServices.Marshal.PtrToStructure( _
NewPosition = CType(Runtime.InteropServices.Marshal.PtrToStructure(
LParam, GetType(WINDOWPOS)), WINDOWPOS)
If NewPosition.y = 0 OrElse NewPosition.x = 0 Then
@@ -83,36 +83,36 @@ Public Class frmStart
End If
' Adjust the client size for borders and caption bar
Dim ClientRect As Rectangle = _
Dim ClientRect As Rectangle =
clientForm.RectangleToScreen(clientForm.ClientRectangle)
ClientRect.Width += _
ClientRect.Width +=
SystemInformation.FrameBorderSize.Width - widthAdjustment
ClientRect.Height += (SystemInformation.FrameBorderSize.Height + _
ClientRect.Height += (SystemInformation.FrameBorderSize.Height +
SystemInformation.CaptionHeight)
' Now get the screen working area (without taskbar)
Dim WorkingRect As Rectangle = _
Dim WorkingRect As Rectangle =
Screen.GetWorkingArea(clientForm.ClientRectangle)
' Left border
If NewPosition.x >= WorkingRect.X - mSnapOffset AndAlso _
If NewPosition.x >= WorkingRect.X - mSnapOffset AndAlso
NewPosition.x <= WorkingRect.X + mSnapOffset Then
NewPosition.x = WorkingRect.X
End If
' Get screen bounds and taskbar height
' (when taskbar is horizontal)
Dim ScreenRect As Rectangle = _
Dim ScreenRect As Rectangle =
Screen.GetBounds(Screen.PrimaryScreen.Bounds)
Dim TaskbarHeight As Integer = _
Dim TaskbarHeight As Integer =
ScreenRect.Height - WorkingRect.Height
' Top border (check if taskbar is on top
' or bottom via WorkingRect.Y)
If NewPosition.y >= -mSnapOffset AndAlso _
(WorkingRect.Y > 0 AndAlso NewPosition.y <= _
(TaskbarHeight + mSnapOffset)) OrElse _
(WorkingRect.Y <= 0 AndAlso NewPosition.y <= _
If NewPosition.y >= -mSnapOffset AndAlso
(WorkingRect.Y > 0 AndAlso NewPosition.y <=
(TaskbarHeight + mSnapOffset)) OrElse
(WorkingRect.Y <= 0 AndAlso NewPosition.y <=
(mSnapOffset)) Then
If TaskbarHeight > 0 Then
NewPosition.y = WorkingRect.Y ' Horizontal Taskbar
@@ -122,25 +122,25 @@ Public Class frmStart
End If
' Right border
If NewPosition.x + ClientRect.Width <= _
WorkingRect.Right + mSnapOffset AndAlso _
NewPosition.x + ClientRect.Width >= _
If NewPosition.x + ClientRect.Width <=
WorkingRect.Right + mSnapOffset AndAlso
NewPosition.x + ClientRect.Width >=
WorkingRect.Right - mSnapOffset Then
NewPosition.x = WorkingRect.Right - (ClientRect.Width + _
NewPosition.x = WorkingRect.Right - (ClientRect.Width +
SystemInformation.FrameBorderSize.Width)
End If
' Bottom border
If NewPosition.y + ClientRect.Height <= _
WorkingRect.Bottom + mSnapOffset AndAlso _
NewPosition.y + ClientRect.Height >= _
If NewPosition.y + ClientRect.Height <=
WorkingRect.Bottom + mSnapOffset AndAlso
NewPosition.y + ClientRect.Height >=
WorkingRect.Bottom - mSnapOffset Then
NewPosition.y = WorkingRect.Bottom - (ClientRect.Height + _
NewPosition.y = WorkingRect.Bottom - (ClientRect.Height +
SystemInformation.FrameBorderSize.Height)
End If
' Marshal it back
Runtime.InteropServices.Marshal.StructureToPtr(NewPosition, _
Runtime.InteropServices.Marshal.StructureToPtr(NewPosition,
LParam, True)
Catch ex As ArgumentException
End Try
@@ -166,7 +166,7 @@ Public Class frmStart
Dim CapTxt As String = ClassHotkey_Windream.GetCaption()
CURRENT_FOCUSES_WINDOWNAME = CapTxt
If CURRENT_FOCUSES_WINDOWNAME.ToUpper.StartsWith("GLOB") Then Exit Sub
If LogErrorsOnly = False Then ClassLogger.Add(" ...Focused window result: '" & CURRENT_FOCUSES_WINDOWNAME & "'", False)
LOGGER.Info(" ...Focused window result: '" & CURRENT_FOCUSES_WINDOWNAME & "'")
Me.Cursor = Cursors.WaitCursor
Me.NotifyIcon1.Visible = True
@@ -243,7 +243,7 @@ Public Class frmStart
Dim i As Integer
For Each Str As Object In ClassFileDrop.files_dropped
If Not Str Is Nothing Then
If LogErrorsOnly = False Then ClassLogger.Add(">> Check Drop-File: " & Str.ToString, False)
LOGGER.Info(">> Check Drop-File: " & Str.ToString)
Dim handleType As String = Str.Substring(0, Str.LastIndexOf("|") + 1)
Dim filename As String = Str.Substring(Str.LastIndexOf("|") + 1)
If ClassIndexFunctions.FileExistsinDropTable(filename) = False Then
@@ -271,7 +271,7 @@ Public Class frmStart
CURRENT_FILENAME = Filerow.Item("FILENAME2WORK")
CURRENT_WORKFILE_GUID = Filerow.Item(0)
CURRENT_WORKFILE = Filerow.Item("FILENAME2WORK")
If LogErrorsOnly = False Then ClassLogger.Add(">> CURRENT_WORKFILE: " & CURRENT_WORKFILE, False)
LOGGER.Info(">> CURRENT_WORKFILE: " & CURRENT_WORKFILE)
If File.Exists(CURRENT_WORKFILE) = True And DTACTUAL_FILES.Rows.Count > 0 Then
Open_IndexDialog()
End If
@@ -303,7 +303,7 @@ Public Class frmStart
If My.Settings.AppTerminate = False Then
Try
ClassLogger.Add("", False)
LOGGER.Info("")
If START_INCOMPLETE = False Then
Dim Sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')"
ClassDatabase.Execute_non_Query(Sql, True)
@@ -359,7 +359,7 @@ Public Class frmStart
'Lizenz abgellaufen, überprüfen ob User Admin ist
If LICENSE_COUNT < UserLoggedin Then
If USER_IS_ADMIN = True Then
ClassLogger.Add(">> User is Admin - Timer will be started", False)
LOGGER.Info(">> User is Admin - Timer will be started")
If USER_LANGUAGE = "de-DE" Then
MsgBox("Sie haben nun 3 Minuten Zeit eine neue Lizenz zu vergeben!", MsgBoxStyle.Information)
Else
@@ -374,7 +374,7 @@ Public Class frmStart
End If
If DOCTYPE_COUNT_ACTUAL > LICENSE_DOCTYPE_COUNT Then
If USER_IS_ADMIN = True Then
ClassLogger.Add(">> User is Admin - Timer will be started", False)
LOGGER.Info(">> User is Admin - Timer will be started")
If USER_LANGUAGE = "de-DE" Then
MsgBox("Sie haben nun 3 Minuten Zeit eine neue Lizenz zu vergeben!", MsgBoxStyle.Information)
Else
@@ -424,12 +424,12 @@ Public Class frmStart
Try
If CONFIG.Config.FolderWatchScanStarted = True Then
If LogErrorsOnly = False Then ClassLogger.Add(">> FWSCAN started - Checking file:" & CURRENT_SCAN_FOLDERWATCH, False)
LOGGER.Info(">> FWSCAN started - Checking file:" & CURRENT_SCAN_FOLDERWATCH)
Dim fileEntries As String() = Directory.GetFiles(CURRENT_SCAN_FOLDERWATCH)
' Process the list of files found in the directory.
Dim fileName As String
For Each fileName In fileEntries
If LogErrorsOnly = False Then ClassLogger.Add(">> Scanfolder after startup: Checking file:" & fileName, False)
LOGGER.Info(">> Scanfolder after startup: Checking file:" & fileName)
For Each row As DataRow In DTEXCLUDE_FILES.Rows
Dim content As String = row.Item(0).ToString.ToLower
If fileName.ToLower.Contains(content) Then
@@ -443,29 +443,30 @@ Public Class frmStart
handleType = "|FW_SIMPLEINDEXER|"
End If
'Die Datei übergeben
If LogErrorsOnly = False Then ClassLogger.Add(">> Adding file from Scanfolder after startup:" & fileName, False)
LOGGER.Info(">> Adding file from Scanfolder after startup:" & fileName)
If ClassIndexFunctions.FileExistsinDropTable(fileName) = False Then
ClassFilehandle.Decide_FileHandle(fileName, handleType)
Else
ClassLogger.Add(">> Scanfolder Startup: File already exists:" & fileName, False)
LOGGER.Info(">> Scanfolder Startup: File already exists:" & fileName)
End If
Next fileName
Else
If LogErrorsOnly = False Then ClassLogger.Add(">> FWSCAN not started", False)
LOGGER.Info(">> FWSCAN not started")
End If
Catch ex As Exception
ClassLogger.Add(">> Error while starting folderwatch scan: " & ex.Message, False)
LOGGER.Info(">> Error while starting folderwatch scan: " & ex.Message)
LOGGER.Error(ex.Message)
End Try
Try
If FW_started = True Then
If LogErrorsOnly = False Then ClassLogger.Add(">> FW_started started - Checking file:" & CURRENT_FOLDERWATCH, False)
LOGGER.Info(">> FW_started started - Checking file:" & CURRENT_FOLDERWATCH)
Dim fileEntries As String() = Directory.GetFiles(CURRENT_FOLDERWATCH)
' Process the list of files found in the directory.
Dim fileName As String
For Each fileName In fileEntries
If LogErrorsOnly = False Then ClassLogger.Add(">> Folderwach after startup: Checking file:" & fileName, False)
LOGGER.Info(">> Folderwach after startup: Checking file:" & fileName)
For Each row As DataRow In DTEXCLUDE_FILES.Rows
Dim content As String = row.Item(0).ToString.ToLower
If fileName.ToLower.Contains(content) Then
@@ -479,19 +480,20 @@ Public Class frmStart
handleType = "|FW_SIMPLEINDEXER|"
End If
'Die Datei übergeben
If LogErrorsOnly = False Then ClassLogger.Add(">> Adding file from Folderwatch after startup:" & fileName, False)
LOGGER.Info(">> Adding file from Folderwatch after startup:" & fileName)
If ClassIndexFunctions.FileExistsinDropTable(fileName) = False Then
ClassFilehandle.Decide_FileHandle(fileName, handleType)
Else
ClassLogger.Add(">> Folderwatch Startup: File already exists:" & fileName, False)
LOGGER.Info(">> Folderwatch Startup: File already exists:" & fileName)
End If
Next fileName
Else
If LogErrorsOnly = False Then ClassLogger.Add(">> FW_started not started", False)
LOGGER.Info(">> FW_started not started")
End If
Catch ex As Exception
ClassLogger.Add(">> Error while starting folderwatch: " & ex.Message, False)
LOGGER.Info(">> Error while starting folderwatch: " & ex.Message)
LOGGER.Error(ex.Message)
End Try
If TimerFolderWatch.Enabled = False Then
@@ -520,7 +522,7 @@ Public Class frmStart
Try
Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT HOTKEY1, HOTKEY2, ABS(CONVERT(INT, CONVERT(binary(4), NEWID()))) AS HOTKEY_ID FROM TBHOTKEY_USER_PROFILE WHERE USER_ID = " & USER_ID & " GROUP BY HOTKEY1, HOTKEY2", True)
If DT.Rows.Count > 0 Then
If LogErrorsOnly = False Then ClassLogger.Add(" >> " & DT.Rows.Count & " Hotkey-Profile", False)
LOGGER.Info(" >> " & DT.Rows.Count & " Hotkey-Profile")
Dim i As Integer = 0
For Each row As DataRow In DT.Rows
i += 1
@@ -539,21 +541,21 @@ Public Class frmStart
Select Case row.Item("HOTKEY1")
Case "Strg"
If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Strg " & row.Item("HOTKEY2").ToString.ToUpper, False)
LOGGER.Info(" >>" & i.ToString + "|Strg " & row.Item("HOTKEY2").ToString.ToUpper)
HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_CONTROL, row.Item("HOTKEY_ID"))
Case "Shift"
If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Shift " & row.Item("HOTKEY2").ToString.ToUpper, False)
LOGGER.Info(" >>" & i.ToString + "|Shift " & row.Item("HOTKEY2").ToString.ToUpper)
HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_SHIFT, row.Item("HOTKEY_ID"))
Case "Alt"
If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Alt " & row.Item("HOTKEY2").ToString.ToUpper, False)
LOGGER.Info(" >>" & i.ToString + "|Alt " & row.Item("HOTKEY2").ToString.ToUpper)
HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_ALT, row.Item("HOTKEY_ID"))
Case "win"
If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Win " & row.Item("HOTKEY2").ToString.ToUpper, False)
LOGGER.Info(" >>" & i.ToString + "|Win " & row.Item("HOTKEY2").ToString.ToUpper)
HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_WIN, row.Item("HOTKEY_ID"))
End Select
Next
Else
If LogErrorsOnly = False Then ClassLogger.Add(" >> Keine Hotkeys!", False)
LOGGER.Info(" >> Keine Hotkeys!")
End If
Catch ex As Exception
MsgBox("Error in Load_Hotkeys:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -656,7 +658,7 @@ Public Class frmStart
Exit For
End If
Dim FileForWork As String = row.Item(1)
If LogErrorsOnly = False Then ClassLogger.Add(">> In Timer Folderwatch - File: " & FileForWork, False)
LOGGER.Info(">> In Timer Folderwatch - File: " & FileForWork)
Dim fileInUse As Boolean = ClassFilehandle.IsFileInUse(FileForWork)
Dim fileexists As Boolean = System.IO.File.Exists(FileForWork)
If fileInUse = False Then
@@ -666,12 +668,12 @@ Public Class frmStart
CURRENT_WORKFILE_GUID = row.Item("GUID")
Open_IndexDialog()
Else
ClassLogger.Add(">> File not existing - Row will be deleted!", False)
LOGGER.Info(">> File not existing - Row will be deleted!")
Dim del = String.Format("DELETE FROM TBGI_FILES_USER WHERE GUID = {0}", FILEGUID)
ClassDatabase.Execute_non_Query(del)
End If
Else
ClassLogger.Add(">> file '" & row.Item(1) & "' could not be opened exclusively - fileInUse!", False)
LOGGER.Info(">> file '" & row.Item(1) & "' could not be opened exclusively - fileInUse!")
End If
Next
@@ -777,7 +779,7 @@ Public Class frmStart
ClassFileDrop.files_dropped = Nothing
For Each fName In openFileDialog1.FileNames
ReDim Preserve ClassFileDrop.files_dropped(i)
ClassLogger.Add(">> Chosen File: " & fName, False)
LOGGER.Info(">> Chosen File: " & fName)
ClassFileDrop.files_dropped(i) = "|DROPFROMFSYSTEM|" & fName
i += 1
Next