Added message supression support and refined game id sync

2018-03-05 18:58:51 -06:00
parent b23ace4b54
commit 7d874f0079
12 changed files with 264 additions and 29 deletions
@@ -1496,7 +1496,7 @@ Public Class frmGameManager
        sLocation = mgrCommon.OpenFileBrowser("XML_Import", frmGameManager_ChooseImportXML, "xml", frmGameManager_XML, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False)

        If sLocation <> String.Empty Then
-            If mgrMonitorList.DoImport(sLocation, False) Then
+            If mgrMonitorList.DoImport(sLocation, False, Settings) Then
                mgrMonitorList.SyncMonitorLists(Settings.SyncFields)
                LoadData()
                LoadBackupData()
@@ -1526,7 +1526,7 @@ Public Class frmGameManager
        End If

        If mgrCommon.ShowMessage(frmGameManager_ConfirmOfficialImport, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
-            If mgrMonitorList.DoImport(sImportURL, True) Then
+            If mgrMonitorList.DoImport(sImportURL, True, Settings) Then
                mgrMonitorList.SyncMonitorLists(Settings.SyncFields)
                LoadData()
                LoadBackupData()
@@ -42,6 +42,9 @@ Partial Class frmMain
        Me.gMonTrayLogClear = New System.Windows.Forms.ToolStripMenuItem()
        Me.gMonTrayLogSave = New System.Windows.Forms.ToolStripMenuItem()
        Me.gMonTrayToolsSessions = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gMonTrayToolsSyncGameID = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gMonTrayToolsSyncGameIDOfficial = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gMonTrayToolsSyncGameIDFile = New System.Windows.Forms.ToolStripMenuItem()
        Me.gMonTraySep1 = New System.Windows.Forms.ToolStripSeparator()
        Me.gMonTrayExit = New System.Windows.Forms.ToolStripMenuItem()
        Me.bwMonitor = New System.ComponentModel.BackgroundWorker()
@@ -68,6 +71,9 @@ Partial Class frmMain
        Me.gMonLogClear = New System.Windows.Forms.ToolStripMenuItem()
        Me.gMonLogSave = New System.Windows.Forms.ToolStripMenuItem()
        Me.gMonToolsSessions = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gMonToolsSyncGameID = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gMonToolsSyncGameIDOfficial = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gMonToolsSyncGameIDFile = New System.Windows.Forms.ToolStripMenuItem()
        Me.gMonHelp = New System.Windows.Forms.ToolStripMenuItem()
        Me.gMonHelpWebSite = New System.Windows.Forms.ToolStripMenuItem()
        Me.gMonHelpManual = New System.Windows.Forms.ToolStripMenuItem()
@@ -103,7 +109,7 @@ Partial Class frmMain
        '
        Me.gMonTrayMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayNotification, Me.gMonTrayShow, Me.gMonTraySep2, Me.gMonTrayMon, Me.gMonTraySettings, Me.gMonTraySetup, Me.gMonTrayTools, Me.gMonTraySep1, Me.gMonTrayExit})
        Me.gMonTrayMenu.Name = "gMonTrayMenu"
-        Me.gMonTrayMenu.Size = New System.Drawing.Size(162, 192)
+        Me.gMonTrayMenu.Size = New System.Drawing.Size(162, 170)
        '
        'gMonTrayNotification
        '
@@ -168,7 +174,7 @@ Partial Class frmMain
        '
        'gMonTrayTools
        '
-        Me.gMonTrayTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayToolsCompact, Me.gMonTrayToolsLog, Me.gMonTrayToolsSessions})
+        Me.gMonTrayTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayToolsCompact, Me.gMonTrayToolsLog, Me.gMonTrayToolsSessions, Me.gMonTrayToolsSyncGameID})
        Me.gMonTrayTools.Name = "gMonTrayTools"
        Me.gMonTrayTools.Size = New System.Drawing.Size(161, 22)
        Me.gMonTrayTools.Text = "&Tools"
@@ -204,6 +210,25 @@ Partial Class frmMain
        Me.gMonTrayToolsSessions.Size = New System.Drawing.Size(179, 22)
        Me.gMonTrayToolsSessions.Text = "&Session Viewer..."
        '
+        'gMonTrayToolsSyncGameID
+        '
+        Me.gMonTrayToolsSyncGameID.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayToolsSyncGameIDOfficial, Me.gMonTrayToolsSyncGameIDFile})
+        Me.gMonTrayToolsSyncGameID.Name = "gMonTrayToolsSyncGameID"
+        Me.gMonTrayToolsSyncGameID.Size = New System.Drawing.Size(179, 22)
+        Me.gMonTrayToolsSyncGameID.Text = "S&ync Game IDs"
+        '
+        'gMonTrayToolsSyncGameIDOfficial
+        '
+        Me.gMonTrayToolsSyncGameIDOfficial.Name = "gMonTrayToolsSyncGameIDOfficial"
+        Me.gMonTrayToolsSyncGameIDOfficial.Size = New System.Drawing.Size(142, 22)
+        Me.gMonTrayToolsSyncGameIDOfficial.Text = "&Official List..."
+        '
+        'gMonTrayToolsSyncGameIDFile
+        '
+        Me.gMonTrayToolsSyncGameIDFile.Name = "gMonTrayToolsSyncGameIDFile"
+        Me.gMonTrayToolsSyncGameIDFile.Size = New System.Drawing.Size(142, 22)
+        Me.gMonTrayToolsSyncGameIDFile.Text = "&File..."
+        '
        'gMonTraySep1
        '
        Me.gMonTraySep1.Name = "gMonTraySep1"
@@ -348,7 +373,7 @@ Partial Class frmMain
        '
        'gMonTools
        '
-        Me.gMonTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonToolsCompact, Me.gMonToolsLog, Me.gMonToolsSessions})
+        Me.gMonTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonToolsCompact, Me.gMonToolsLog, Me.gMonToolsSessions, Me.gMonToolsSyncGameID})
        Me.gMonTools.Name = "gMonTools"
        Me.gMonTools.Size = New System.Drawing.Size(47, 20)
        Me.gMonTools.Text = "&Tools"
@@ -384,6 +409,25 @@ Partial Class frmMain
        Me.gMonToolsSessions.Size = New System.Drawing.Size(179, 22)
        Me.gMonToolsSessions.Text = "&Session Viewer..."
        '
+        'gMonToolsSyncGameID
+        '
+        Me.gMonToolsSyncGameID.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonToolsSyncGameIDOfficial, Me.gMonToolsSyncGameIDFile})
+        Me.gMonToolsSyncGameID.Name = "gMonToolsSyncGameID"
+        Me.gMonToolsSyncGameID.Size = New System.Drawing.Size(179, 22)
+        Me.gMonToolsSyncGameID.Text = "S&ync Game IDs"
+        '
+        'gMonToolsSyncGameIDOfficial
+        '
+        Me.gMonToolsSyncGameIDOfficial.Name = "gMonToolsSyncGameIDOfficial"
+        Me.gMonToolsSyncGameIDOfficial.Size = New System.Drawing.Size(152, 22)
+        Me.gMonToolsSyncGameIDOfficial.Text = "&Official List..."
+        '
+        'gMonToolsSyncGameIDFile
+        '
+        Me.gMonToolsSyncGameIDFile.Name = "gMonToolsSyncGameIDFile"
+        Me.gMonToolsSyncGameIDFile.Size = New System.Drawing.Size(152, 22)
+        Me.gMonToolsSyncGameIDFile.Text = "&File..."
+        '
        'gMonHelp
        '
        Me.gMonHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonHelpWebSite, Me.gMonHelpManual, Me.gMonHelpCheckforUpdates, Me.gMonHelpAbout})
@@ -621,4 +665,10 @@ Partial Class frmMain
    Friend WithEvents gMonStripStatusButton As System.Windows.Forms.ToolStripStatusLabel
    Friend WithEvents gMonToolsSessions As ToolStripMenuItem
    Friend WithEvents gMonTrayToolsSessions As ToolStripMenuItem
+    Friend WithEvents gMonToolsSyncGameID As ToolStripMenuItem
+    Friend WithEvents gMonToolsSyncGameIDOfficial As ToolStripMenuItem
+    Friend WithEvents gMonToolsSyncGameIDFile As ToolStripMenuItem
+    Friend WithEvents gMonTrayToolsSyncGameID As ToolStripMenuItem
+    Friend WithEvents gMonTrayToolsSyncGameIDOfficial As ToolStripMenuItem
+    Friend WithEvents gMonTrayToolsSyncGameIDFile As ToolStripMenuItem
 End Class
@@ -988,6 +988,26 @@ Public Class frmMain
        mgrMonitorList.SyncMonitorLists(oSettings.SyncFields, False)
    End Sub

+    Private Sub SyncGameIDs(ByVal bOfficial As Boolean)
+        Dim sLocation As String
+
+        If mgrCommon.IsUnix Then
+            sLocation = App_URLImportLinux
+        Else
+            sLocation = App_URLImport
+        End If
+
+        If bOfficial Then
+            mgrMonitorList.SyncGameIDs(sLocation, oSettings, True)
+        Else
+            sLocation = mgrCommon.OpenFileBrowser("XML_Import", frmGameManager_ChooseImportXML, "xml", frmGameManager_XML, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False)
+
+            If sLocation <> String.Empty Then
+                mgrMonitorList.SyncGameIDs(sLocation, oSettings, False)
+            End If
+        End If
+    End Sub
+
    Private Sub LocalDatabaseCheck()
        Dim oLocalDatabase As New mgrSQLite(mgrSQLite.Database.Local)
        oLocalDatabase.DatabaseUpgrade()
@@ -1349,6 +1369,9 @@ Public Class frmMain
        gMonToolsCompact.Text = frmMain_gMonToolsCompact
        gMonToolsLog.Text = frmMain_gMonToolsLog
        gMonToolsSessions.Text = frmMain_gMonToolsSessions
+        gMonToolsSyncGameID.Text = frmMain_gMonToolsSyncGameID
+        gMonToolsSyncGameIDOfficial.Text = frmMain_gMonToolsSyncGameIDOfficial
+        gMonToolsSyncGameIDFile.Text = frmMain_gMonToolsSyncGameIDFile
        gMonLogClear.Text = frmMain_gMonLogClear
        gMonLogSave.Text = frmMain_gMonLogSave
        gMonHelp.Text = frmMain_gMonHelp
@@ -1370,6 +1393,9 @@ Public Class frmMain
        gMonTrayToolsCompact.Text = frmMain_gMonToolsCompact
        gMonTrayToolsLog.Text = frmMain_gMonToolsLog
        gMonTrayToolsSessions.Text = frmMain_gMonToolsSessions
+        gMonTrayToolsSyncGameID.Text = frmMain_gMonToolsSyncGameID
+        gMonTrayToolsSyncGameIDOfficial.Text = frmMain_gMonToolsSyncGameIDOfficial
+        gMonTrayToolsSyncGameIDFile.Text = frmMain_gMonToolsSyncGameIDFile
        gMonTrayLogClear.Text = frmMain_gMonLogClear
        gMonTrayLogSave.Text = frmMain_gMonLogSave
        gMonTrayExit.Text = frmMain_gMonFileExit
@@ -1907,4 +1933,11 @@ Public Class frmMain
        lblGameTitle.Focus()
    End Sub

+    Private Sub gMonToolsSyncGameIDOfficial_Click(sender As Object, e As EventArgs) Handles gMonToolsSyncGameIDOfficial.Click, gMonTrayToolsSyncGameIDOfficial.Click
+        SyncGameIDs(True)
+    End Sub
+
+    Private Sub gMonToolsSyncGameIDFile_Click(sender As Object, e As EventArgs) Handles gMonToolsSyncGameIDFile.Click, gMonTrayToolsSyncGameIDFile.Click
+        SyncGameIDs(False)
+    End Sub
 End Class
@@ -65,6 +65,7 @@ Partial Class frmSettings
        Me.grpGameData = New System.Windows.Forms.GroupBox()
        Me.chkSessionTracking = New System.Windows.Forms.CheckBox()
        Me.lstSettings = New System.Windows.Forms.ListBox()
+        Me.btnResetMessages = New System.Windows.Forms.Button()
        Me.grpStartup.SuspendLayout()
        Me.grpFolderOptions.SuspendLayout()
        Me.grp7zGeneral.SuspendLayout()
@@ -507,11 +508,21 @@ Partial Class frmSettings
        Me.lstSettings.Size = New System.Drawing.Size(162, 303)
        Me.lstSettings.TabIndex = 0
        '
+        'btnResetMessages
+        '
+        Me.btnResetMessages.Location = New System.Drawing.Point(128, 321)
+        Me.btnResetMessages.Name = "btnResetMessages"
+        Me.btnResetMessages.Size = New System.Drawing.Size(110, 23)
+        Me.btnResetMessages.TabIndex = 7
+        Me.btnResetMessages.Text = "&Reset Warnings"
+        Me.btnResetMessages.UseVisualStyleBackColor = True
+        '
        'frmSettings
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(554, 361)
+        Me.Controls.Add(Me.btnResetMessages)
        Me.Controls.Add(Me.pnlGeneral)
        Me.Controls.Add(Me.pnlBackup)
        Me.Controls.Add(Me.pnl7z)
@@ -592,4 +603,5 @@ Partial Class frmSettings
    Friend WithEvents lblMinutes As Label
    Friend WithEvents nudSupressBackupThreshold As NumericUpDown
    Friend WithEvents chkSupressBackup As CheckBox
+    Friend WithEvents btnResetMessages As Button
 End Class
@@ -162,6 +162,12 @@ Public Class frmSettings
        End If
    End Sub

+    Private Sub ResetMessages()
+        If mgrCommon.ShowMessage(frmSettings_ConfirmMessageReset, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+            oSettings.SupressMessages = mgrSettings.eSupressMessages.None
+        End If
+    End Sub
+
    Private Sub LoadSettings()
        chkStartWindows.Checked = oSettings.StartWithWindows
        chkMonitorOnStartup.Checked = oSettings.MonitorOnStartup
@@ -293,6 +299,7 @@ Public Class frmSettings
        lblArguments.Text = frmSettings_lblArguments
        lblLocation.Text = frmSettings_lblLocation
        btnOptionalFields.Text = frmSettings_btnOptionalFields
+        btnResetMessages.Text = frmSettings_btnResetMessages

        'Unix Handler
        If mgrCommon.IsUnix Then
@@ -351,6 +358,10 @@ Public Class frmSettings
        SetDefaults()
    End Sub

+    Private Sub btnResetMessages_Click(sender As Object, e As EventArgs) Handles btnResetMessages.Click
+        ResetMessages()
+    End Sub
+
    Private Sub btnOptionalFields_Click(sender As Object, e As EventArgs) Handles btnOptionalFields.Click
        OpenOptionalFields()
    End Sub
@@ -358,5 +369,4 @@ Public Class frmSettings
    Private Sub lstSettings_SelectedValueChanged(sender As Object, e As EventArgs) Handles lstSettings.SelectedValueChanged
        ChangePanel()
    End Sub
-
 End Class
@@ -105,7 +105,7 @@ Public Class frmStartUpWizard
        End If

        If mgrCommon.ShowMessage(frmStartUpWizard_ConfirmOfficialImport, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
-            If mgrMonitorList.DoImport(sImportURL, True) Then
+            If mgrMonitorList.DoImport(sImportURL, True, Settings, True) Then
                oGameData = mgrMonitorList.ReadList(mgrMonitorList.eListTypes.FullList)
                mgrMonitorList.SyncMonitorLists(oSettings.SyncFields)
            End If