Changes for issue #62

Changes for Issue #56 and #58

GBM/Classes/clsGame.vb

@@ -7,6 +7,7 @@
     Private bFolderSave As Boolean = False
     Private sFileType As String = String.Empty
     Private bAppendTimeStamp As Boolean = False
+    Private iBackupLimit As Integer = 2
     Private sExcludeList As String = String.Empty
     Private sProcessPath As String = String.Empty
     Private sIcon As String = String.Empty
@@ -117,6 +118,15 @@
         End Set
     End Property
 
+    Property BackupLimit As Integer
+        Get
+            Return iBackupLimit
+        End Get
+        Set(value As Integer)
+            iBackupLimit = value
+        End Set
+    End Property
+
     Property ExcludeList As String
         Set(value As String)
             sExcludeList = value
@@ -293,6 +303,9 @@
                 If AppendTimeStamp <> oGame.AppendTimeStamp Then
                     Return False
                 End If
+                If BackupLimit <> oGame.BackupLimit Then
+                    Return False
+                End If
             End If
             If (eSyncFields And eOptionalSyncFields.Version) = eOptionalSyncFields.Version Then
                 If Version <> oGame.Version Then

GBM/Forms/frmAddWizard.Designer.vb

@@ -36,6 +36,8 @@ Partial Class frmAddWizard
         Me.txtProcessPath = New System.Windows.Forms.TextBox()
         Me.lblStep2Intro = New System.Windows.Forms.Label()
         Me.tbPage3 = New System.Windows.Forms.TabPage()
+        Me.lblLimit = New System.Windows.Forms.Label()
+        Me.nudLimit = New System.Windows.Forms.NumericUpDown()
         Me.lblStep3Title = New System.Windows.Forms.Label()
         Me.lblStep3Instructions = New System.Windows.Forms.Label()
         Me.chkTimeStamp = New System.Windows.Forms.CheckBox()
@@ -70,6 +72,7 @@ Partial Class frmAddWizard
         Me.tbPage1.SuspendLayout()
         Me.tbPage2.SuspendLayout()
         Me.tbPage3.SuspendLayout()
+        CType(Me.nudLimit, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.tbPage3a.SuspendLayout()
         Me.tbPage4.SuspendLayout()
         Me.tbPage5.SuspendLayout()
@@ -121,8 +124,8 @@ Partial Class frmAddWizard
         Me.lblStep1Instructions.Name = "lblStep1Instructions"
         Me.lblStep1Instructions.Size = New System.Drawing.Size(303, 85)
         Me.lblStep1Instructions.TabIndex = 6
-        Me.lblStep1Instructions.Text = "The name will be automatically filtered for length and invalid characters.  You m" & _
+        Me.lblStep1Instructions.Text = "The name will be automatically filtered for length and invalid characters.  You m" &
-    "ay drag and drop a shortcut here to complete this step, only Windows shortcuts a" & _
+    "ay drag and drop a shortcut here to complete this step, only Windows shortcuts a" &
     "re currently supported."
         '
         'txtName
@@ -205,6 +208,8 @@ Partial Class frmAddWizard
         'tbPage3
         '
         Me.tbPage3.BackColor = System.Drawing.SystemColors.Control
+        Me.tbPage3.Controls.Add(Me.lblLimit)
+        Me.tbPage3.Controls.Add(Me.nudLimit)
         Me.tbPage3.Controls.Add(Me.lblStep3Title)
         Me.tbPage3.Controls.Add(Me.lblStep3Instructions)
         Me.tbPage3.Controls.Add(Me.chkTimeStamp)
@@ -218,6 +223,26 @@ Partial Class frmAddWizard
         Me.tbPage3.TabIndex = 2
         Me.tbPage3.Text = "TabPage3"
         '
+        'lblLimit
+        '
+        Me.lblLimit.AutoSize = True
+        Me.lblLimit.Location = New System.Drawing.Point(203, 109)
+        Me.lblLimit.Name = "lblLimit"
+        Me.lblLimit.Size = New System.Drawing.Size(68, 13)
+        Me.lblLimit.TabIndex = 15
+        Me.lblLimit.Text = "Backup Limit"
+        Me.lblLimit.Visible = False
+        '
+        'nudLimit
+        '
+        Me.nudLimit.Location = New System.Drawing.Point(157, 107)
+        Me.nudLimit.Minimum = New Decimal(New Integer() {2, 0, 0, 0})
+        Me.nudLimit.Name = "nudLimit"
+        Me.nudLimit.Size = New System.Drawing.Size(40, 20)
+        Me.nudLimit.TabIndex = 14
+        Me.nudLimit.Value = New Decimal(New Integer() {2, 0, 0, 0})
+        Me.nudLimit.Visible = False
+        '
         'lblStep3Title
         '
         Me.lblStep3Title.AutoSize = True
@@ -230,32 +255,32 @@ Partial Class frmAddWizard
         '
         'lblStep3Instructions
         '
-        Me.lblStep3Instructions.Location = New System.Drawing.Point(14, 116)
+        Me.lblStep3Instructions.Location = New System.Drawing.Point(14, 139)
         Me.lblStep3Instructions.Name = "lblStep3Instructions"
         Me.lblStep3Instructions.Size = New System.Drawing.Size(303, 42)
         Me.lblStep3Instructions.TabIndex = 9
-        Me.lblStep3Instructions.Text = "If you're unsure of exactly which files to backup,  make sure Save Entire Folder " & _
+        Me.lblStep3Instructions.Text = "If you're unsure of exactly which files to backup,  make sure Save entire folder " &
-    "is checked.  You can also time stamp your backup files to make incremental backu" & _
+    "is checked.  You can also choose to save multiple backups and set a limit on how" &
-    "ps."
+    " many to keep."
         '
         'chkTimeStamp
         '
         Me.chkTimeStamp.AutoSize = True
-        Me.chkTimeStamp.Location = New System.Drawing.Point(139, 87)
+        Me.chkTimeStamp.Location = New System.Drawing.Point(18, 108)
         Me.chkTimeStamp.Name = "chkTimeStamp"
-        Me.chkTimeStamp.Size = New System.Drawing.Size(122, 17)
+        Me.chkTimeStamp.Size = New System.Drawing.Size(133, 17)
         Me.chkTimeStamp.TabIndex = 8
-        Me.chkTimeStamp.Text = "Time Stamp Backup"
+        Me.chkTimeStamp.Text = "Save multiple backups"
         Me.chkTimeStamp.UseVisualStyleBackColor = True
         '
         'chkFolderSave
         '
         Me.chkFolderSave.AutoSize = True
-        Me.chkFolderSave.Location = New System.Drawing.Point(17, 87)
+        Me.chkFolderSave.Location = New System.Drawing.Point(18, 87)
         Me.chkFolderSave.Name = "chkFolderSave"
-        Me.chkFolderSave.Size = New System.Drawing.Size(113, 17)
+        Me.chkFolderSave.Size = New System.Drawing.Size(109, 17)
         Me.chkFolderSave.TabIndex = 7
-        Me.chkFolderSave.Text = "Save Entire Folder"
+        Me.chkFolderSave.Text = "Save entire folder"
         Me.chkFolderSave.UseVisualStyleBackColor = True
         '
         'btnSaveBrowse
@@ -352,7 +377,7 @@ Partial Class frmAddWizard
         Me.lblStep3aInstructions.Name = "lblStep3aInstructions"
         Me.lblStep3aInstructions.Size = New System.Drawing.Size(303, 56)
         Me.lblStep3aInstructions.TabIndex = 5
-        Me.lblStep3aInstructions.Text = "Choose any file types, specific files  or folders you wish to include in the back" & _
+        Me.lblStep3aInstructions.Text = "Choose any file types, specific files  or folders you wish to include in the back" &
     "up.  If you're unsure, go back a step and choose to save the entire folder. "
         '
         'txtFileTypes
@@ -434,7 +459,7 @@ Partial Class frmAddWizard
         Me.lblStep4Instructions.Name = "lblStep4Instructions"
         Me.lblStep4Instructions.Size = New System.Drawing.Size(303, 59)
         Me.lblStep4Instructions.TabIndex = 5
-        Me.lblStep4Instructions.Text = "Choose any file types, specific files  or folders you wish to exclude from the ba" & _
+        Me.lblStep4Instructions.Text = "Choose any file types, specific files  or folders you wish to exclude from the ba" &
     "ckup.  You may choose multiple items to exclude.  This step can be skipped."
         '
         'txtExcludeList
@@ -539,6 +564,7 @@ Partial Class frmAddWizard
         Me.tbPage2.PerformLayout()
         Me.tbPage3.ResumeLayout(False)
         Me.tbPage3.PerformLayout()
+        CType(Me.nudLimit, System.ComponentModel.ISupportInitialize).EndInit()
         Me.tbPage3a.ResumeLayout(False)
         Me.tbPage3a.PerformLayout()
         Me.tbPage4.ResumeLayout(False)
@@ -591,4 +617,6 @@ Partial Class frmAddWizard
     Friend WithEvents lblExcludePath As Label
     Friend WithEvents lblIncludePathTitle As Label
     Friend WithEvents lblExcludePathTitle As Label
+    Friend WithEvents lblLimit As Label
+    Friend WithEvents nudLimit As NumericUpDown
 End Class

GBM/Forms/frmAddWizard.vb

@@ -46,6 +46,7 @@ Public Class frmAddWizard
         lblStep3Instructions.Text = frmAddWizard_lblStep3Instructions
         chkTimeStamp.Text = frmAddWizard_chkTimeStamp
         chkFolderSave.Text = frmAddWizard_chkFolderSave
+        lblLimit.Text = frmAddWizard_lblLimit
         btnSaveBrowse.Text = frmAddWizard_btnSaveBrowse
         lblStep3Intro.Text = frmAddWizard_lblStep3Intro
         lblIncludePathTitle.Text = frmAddWizard_lblIncludePathTitle
@@ -68,6 +69,28 @@ Public Class frmAddWizard
         StepHandler()
     End Sub
 
+    Private Sub ShowHideLimit()
+        If chkTimeStamp.Checked Then
+            nudLimit.Visible = True
+            lblLimit.Visible = True
+            nudLimit.Value = 5
+        Else
+            nudLimit.Visible = False
+            nudLimit.Value = nudLimit.Minimum
+            lblLimit.Visible = False
+        End If
+    End Sub
+
+    Private Function ShowSummaryLimit(ByVal bTimeStamp As Boolean, ByVal iLimit As Integer) As String
+        Dim sLimit As String = String.Empty
+
+        If bTimeStamp Then
+            Return mgrCommon.BooleanYesNo(bTimeStamp) & " (" & iLimit & ")"
+        Else
+            Return mgrCommon.BooleanYesNo(bTimeStamp)
+        End If
+    End Function
+
     Private Function StringEmptyText(ByVal sString As String) As String
         If sString = String.Empty Then
             Return frmAddWizard_None
@@ -81,19 +104,31 @@ Public Class frmAddWizard
         Dim sName As String = txtName.Text
         Dim sProcessFullPath As String = txtProcessPath.Text
         Dim sProcessPath As String = Path.GetDirectoryName(sProcessFullPath)
-        Dim sProcess As String = Path.GetFileNameWithoutExtension(sProcessFullPath)
         Dim sProcessSummaryText As String = Path.GetFileName(sProcessFullPath) & " (" & sProcessPath & ")"
         Dim sSavePath As String = txtSavePath.Text
         Dim bIsAbsolute As Boolean = mgrPath.IsAbsolute(sSavePath)
         Dim bFolderBackup As Boolean = chkFolderSave.Checked
         Dim bTimeStamp As Boolean = chkTimeStamp.Checked
+        Dim iLimit As Integer = nudLimit.Value
         Dim sFileType As String = txtFileTypes.Text
         Dim sExcludeList As String = txtExcludeList.Text
+        Dim sProcess As String
         Dim sItem As String()
         Dim sItems As String()
         Dim sValues As String()
         Dim lstItem As ListViewItem
 
+        'Handle Process
+        If Path.HasExtension(sProcessFullPath) Then
+            If sProcessFullPath.ToLower.EndsWith(".exe") Then
+                sProcess = Path.GetFileNameWithoutExtension(sProcessFullPath)
+            Else
+                sProcess = Path.GetFileName(sProcessFullPath)
+            End If
+        Else
+            sProcess = Path.GetFileName(sProcessFullPath)
+        End If
+
         If Not bIsAbsolute Then
             sSavePath = mgrPath.DetermineRelativePath(sProcessPath, sSavePath)
         End If
@@ -106,7 +141,7 @@ Public Class frmAddWizard
         lstSummary.Columns(1).Width = 210
 
         sItems = {frmAddWizard_Summary_Name, frmAddWizard_Summary_Process, frmAddWizard_Summary_AbsolutePath, frmAddWizard_Summary_SavePath, frmAddWizard_Summary_FolderSave, frmAddWizard_Summary_Timestamp, frmAddWizard_Summary_Include, frmAddWizard_Summary_Exclude}
-        sValues = {sName, sProcessSummaryText, mgrCommon.BooleanYesNo(bIsAbsolute), sSavePath, mgrCommon.BooleanYesNo(bFolderBackup), mgrCommon.BooleanYesNo(bTimeStamp), StringEmptyText(sFileType), StringEmptyText(sExcludeList)}
+        sValues = {sName, sProcessSummaryText, mgrCommon.BooleanYesNo(bIsAbsolute), sSavePath, mgrCommon.BooleanYesNo(bFolderBackup), ShowSummaryLimit(bTimeStamp, iLimit), StringEmptyText(sFileType), StringEmptyText(sExcludeList)}
 
         For i = 0 To sItems.Length - 1
             sItem = {sItems(i), sValues(i)}
@@ -122,7 +157,9 @@ Public Class frmAddWizard
         oGame.FolderSave = bFolderBackup
         oGame.FileType = sFileType
         oGame.AppendTimeStamp = bTimeStamp
+        oGame.BackupLimit = iLimit
         oGame.ExcludeList = sExcludeList
+        oGame.ProcessPath = sProcessPath
 
         Return oGame
     End Function
@@ -490,6 +527,10 @@ Public Class frmAddWizard
         txtFileTypes.Clear()
     End Sub
 
+    Private Sub chkTimeStamp_CheckedChanged(sender As Object, e As EventArgs) Handles chkTimeStamp.CheckedChanged
+        ShowHideLimit()
+    End Sub
+
     Private Sub btnInclude_Click(sender As Object, e As EventArgs) Handles btnInclude.Click
         OpenBuilder(frmAddWizard_Include, txtFileTypes)
         UpdateBuilderLabel(txtFileTypes.Text, lblFileTypes)
@@ -499,4 +540,6 @@ Public Class frmAddWizard
         OpenBuilder(frmAddWizard_Exclude, txtExcludeList)
         UpdateBuilderLabel(txtExcludeList.Text, lblExclude)
     End Sub
+
+
 End Class

GBM/Forms/frmGameManager.Designer.vb

@@ -28,6 +28,8 @@ Partial Class frmGameManager
         Me.btnBackup = New System.Windows.Forms.Button()
         Me.btnClose = New System.Windows.Forms.Button()
         Me.grpConfig = New System.Windows.Forms.GroupBox()
+        Me.lblLimit = New System.Windows.Forms.Label()
+        Me.nudLimit = New System.Windows.Forms.NumericUpDown()
         Me.btnExclude = New System.Windows.Forms.Button()
         Me.btnInclude = New System.Windows.Forms.Button()
         Me.txtID = New System.Windows.Forms.TextBox()
@@ -61,18 +63,17 @@ Partial Class frmGameManager
         Me.lblHours = New System.Windows.Forms.Label()
         Me.btnTags = New System.Windows.Forms.Button()
         Me.grpStats = New System.Windows.Forms.GroupBox()
+        Me.cboRemoteBackup = New System.Windows.Forms.ComboBox()
+        Me.lblRestorePathData = New System.Windows.Forms.Label()
+        Me.lblBackupFileData = New System.Windows.Forms.Label()
+        Me.lblLocalBackupData = New System.Windows.Forms.Label()
         Me.lblRestorePath = New System.Windows.Forms.Label()
-        Me.txtRestorePath = New System.Windows.Forms.TextBox()
         Me.btnOpenRestorePath = New System.Windows.Forms.Button()
         Me.btnOpenBackupFile = New System.Windows.Forms.Button()
-        Me.txtFileSize = New System.Windows.Forms.TextBox()
         Me.btnDeleteBackup = New System.Windows.Forms.Button()
-        Me.lblFileSize = New System.Windows.Forms.Label()
+        Me.lblBackupFile = New System.Windows.Forms.Label()
-        Me.lblSync = New System.Windows.Forms.Label()
+        Me.lblRemote = New System.Windows.Forms.Label()
-        Me.txtCurrentBackup = New System.Windows.Forms.TextBox()
+        Me.lblLocalData = New System.Windows.Forms.Label()
-        Me.lblCurrentBackup = New System.Windows.Forms.Label()
-        Me.txtLocalBackup = New System.Windows.Forms.TextBox()
-        Me.lblLastBackup = New System.Windows.Forms.Label()
         Me.btnMarkAsRestored = New System.Windows.Forms.Button()
         Me.btnRestore = New System.Windows.Forms.Button()
         Me.btnSave = New System.Windows.Forms.Button()
@@ -91,13 +92,18 @@ Partial Class frmGameManager
         Me.cmsFile = New System.Windows.Forms.ToolStripMenuItem()
         Me.txtQuickFilter = New System.Windows.Forms.TextBox()
         Me.lblQuickFilter = New System.Windows.Forms.Label()
+        Me.cmsDeleteBackup = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.cmsDeleteOne = New System.Windows.Forms.ToolStripMenuItem()
+        Me.cmsDeleteAll = New System.Windows.Forms.ToolStripMenuItem()
         Me.grpConfig.SuspendLayout()
+        CType(Me.nudLimit, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.grpExtra.SuspendLayout()
         CType(Me.pbIcon, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.nudHours, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.grpStats.SuspendLayout()
         Me.grpFilter.SuspendLayout()
         Me.cmsImport.SuspendLayout()
+        Me.cmsDeleteBackup.SuspendLayout()
         Me.SuspendLayout()
         '
         'btnAdd
@@ -125,26 +131,28 @@ Partial Class frmGameManager
         'btnBackup
         '
         Me.btnBackup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnBackup.Location = New System.Drawing.Point(616, 525)
+        Me.btnBackup.Location = New System.Drawing.Point(616, 526)
         Me.btnBackup.Name = "btnBackup"
         Me.btnBackup.Size = New System.Drawing.Size(75, 23)
-        Me.btnBackup.TabIndex = 18
+        Me.btnBackup.TabIndex = 19
         Me.btnBackup.Text = "&Backup"
         Me.btnBackup.UseVisualStyleBackColor = True
         '
         'btnClose
         '
         Me.btnClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnClose.Location = New System.Drawing.Point(697, 525)
+        Me.btnClose.Location = New System.Drawing.Point(697, 526)
         Me.btnClose.Name = "btnClose"
         Me.btnClose.Size = New System.Drawing.Size(75, 23)
-        Me.btnClose.TabIndex = 19
+        Me.btnClose.TabIndex = 20
         Me.btnClose.Text = "C&lose"
         Me.btnClose.UseVisualStyleBackColor = True
         '
         'grpConfig
         '
         Me.grpConfig.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.grpConfig.Controls.Add(Me.lblLimit)
+        Me.grpConfig.Controls.Add(Me.nudLimit)
         Me.grpConfig.Controls.Add(Me.btnExclude)
         Me.grpConfig.Controls.Add(Me.btnInclude)
         Me.grpConfig.Controls.Add(Me.txtID)
@@ -168,12 +176,32 @@ Partial Class frmGameManager
         Me.grpConfig.TabStop = False
         Me.grpConfig.Text = "Configuration"
         '
+        'lblLimit
+        '
+        Me.lblLimit.AutoSize = True
+        Me.lblLimit.Location = New System.Drawing.Point(375, 130)
+        Me.lblLimit.Name = "lblLimit"
+        Me.lblLimit.Size = New System.Drawing.Size(68, 13)
+        Me.lblLimit.TabIndex = 13
+        Me.lblLimit.Text = "Backup Limit"
+        Me.lblLimit.Visible = False
+        '
+        'nudLimit
+        '
+        Me.nudLimit.Location = New System.Drawing.Point(329, 128)
+        Me.nudLimit.Minimum = New Decimal(New Integer() {2, 0, 0, 0})
+        Me.nudLimit.Name = "nudLimit"
+        Me.nudLimit.Size = New System.Drawing.Size(40, 20)
+        Me.nudLimit.TabIndex = 12
+        Me.nudLimit.Value = New Decimal(New Integer() {2, 0, 0, 0})
+        Me.nudLimit.Visible = False
+        '
         'btnExclude
         '
         Me.btnExclude.Location = New System.Drawing.Point(9, 125)
         Me.btnExclude.Name = "btnExclude"
         Me.btnExclude.Size = New System.Drawing.Size(175, 23)
-        Me.btnExclude.TabIndex = 13
+        Me.btnExclude.TabIndex = 9
         Me.btnExclude.Text = "E&xclude Items..."
         Me.btnExclude.UseVisualStyleBackColor = True
         '
@@ -182,7 +210,7 @@ Partial Class frmGameManager
         Me.btnInclude.Location = New System.Drawing.Point(9, 97)
         Me.btnInclude.Name = "btnInclude"
         Me.btnInclude.Size = New System.Drawing.Size(175, 23)
-        Me.btnInclude.TabIndex = 10
+        Me.btnInclude.TabIndex = 8
         Me.btnInclude.Text = "In&clude Items..."
         Me.btnInclude.UseVisualStyleBackColor = True
         '
@@ -192,7 +220,7 @@ Partial Class frmGameManager
         Me.txtID.Location = New System.Drawing.Point(489, 19)
         Me.txtID.Name = "txtID"
         Me.txtID.Size = New System.Drawing.Size(30, 20)
-        Me.txtID.TabIndex = 16
+        Me.txtID.TabIndex = 0
         Me.txtID.TabStop = False
         Me.txtID.Visible = False
         '
@@ -201,7 +229,7 @@ Partial Class frmGameManager
         Me.btnSavePathBrowse.Location = New System.Drawing.Point(489, 71)
         Me.btnSavePathBrowse.Name = "btnSavePathBrowse"
         Me.btnSavePathBrowse.Size = New System.Drawing.Size(30, 20)
-        Me.btnSavePathBrowse.TabIndex = 9
+        Me.btnSavePathBrowse.TabIndex = 7
         Me.btnSavePathBrowse.Text = "..."
         Me.btnSavePathBrowse.UseVisualStyleBackColor = True
         '
@@ -210,7 +238,7 @@ Partial Class frmGameManager
         Me.btnProcessBrowse.Location = New System.Drawing.Point(489, 45)
         Me.btnProcessBrowse.Name = "btnProcessBrowse"
         Me.btnProcessBrowse.Size = New System.Drawing.Size(30, 20)
-        Me.btnProcessBrowse.TabIndex = 7
+        Me.btnProcessBrowse.TabIndex = 5
         Me.btnProcessBrowse.Text = "..."
         Me.btnProcessBrowse.UseVisualStyleBackColor = True
         '
@@ -243,18 +271,18 @@ Partial Class frmGameManager
         '
         'txtExclude
         '
-        Me.txtExclude.Location = New System.Drawing.Point(363, 128)
+        Me.txtExclude.Location = New System.Drawing.Point(489, 122)
         Me.txtExclude.Name = "txtExclude"
-        Me.txtExclude.Size = New System.Drawing.Size(156, 20)
+        Me.txtExclude.Size = New System.Drawing.Size(30, 20)
         Me.txtExclude.TabIndex = 0
         Me.txtExclude.TabStop = False
         Me.txtExclude.Visible = False
         '
         'txtFileType
         '
-        Me.txtFileType.Location = New System.Drawing.Point(363, 99)
+        Me.txtFileType.Location = New System.Drawing.Point(489, 99)
         Me.txtFileType.Name = "txtFileType"
-        Me.txtFileType.Size = New System.Drawing.Size(156, 20)
+        Me.txtFileType.Size = New System.Drawing.Size(30, 20)
         Me.txtFileType.TabIndex = 0
         Me.txtFileType.TabStop = False
         Me.txtFileType.Visible = False
@@ -264,9 +292,9 @@ Partial Class frmGameManager
         Me.chkTimeStamp.AutoSize = True
         Me.chkTimeStamp.Location = New System.Drawing.Point(190, 129)
         Me.chkTimeStamp.Name = "chkTimeStamp"
-        Me.chkTimeStamp.Size = New System.Drawing.Size(146, 17)
+        Me.chkTimeStamp.Size = New System.Drawing.Size(133, 17)
-        Me.chkTimeStamp.TabIndex = 14
+        Me.chkTimeStamp.TabIndex = 11
-        Me.chkTimeStamp.Text = "Time stamp each backup"
+        Me.chkTimeStamp.Text = "Save multiple backups"
         Me.chkTimeStamp.UseVisualStyleBackColor = True
         '
         'chkFolderSave
@@ -275,7 +303,7 @@ Partial Class frmGameManager
         Me.chkFolderSave.Location = New System.Drawing.Point(190, 101)
         Me.chkFolderSave.Name = "chkFolderSave"
         Me.chkFolderSave.Size = New System.Drawing.Size(109, 17)
-        Me.chkFolderSave.TabIndex = 11
+        Me.chkFolderSave.TabIndex = 10
         Me.chkFolderSave.Text = "Save entire folder"
         Me.chkFolderSave.UseVisualStyleBackColor = True
         '
@@ -284,30 +312,30 @@ Partial Class frmGameManager
         Me.txtSavePath.Location = New System.Drawing.Point(69, 71)
         Me.txtSavePath.Name = "txtSavePath"
         Me.txtSavePath.Size = New System.Drawing.Size(414, 20)
-        Me.txtSavePath.TabIndex = 8
+        Me.txtSavePath.TabIndex = 6
         '
         'txtProcess
         '
         Me.txtProcess.Location = New System.Drawing.Point(69, 45)
         Me.txtProcess.Name = "txtProcess"
         Me.txtProcess.Size = New System.Drawing.Size(414, 20)
-        Me.txtProcess.TabIndex = 6
+        Me.txtProcess.TabIndex = 4
         '
         'txtName
         '
         Me.txtName.Location = New System.Drawing.Point(69, 19)
         Me.txtName.Name = "txtName"
         Me.txtName.Size = New System.Drawing.Size(414, 20)
-        Me.txtName.TabIndex = 5
+        Me.txtName.TabIndex = 3
         '
         'chkMonitorOnly
         '
         Me.chkMonitorOnly.AutoSize = True
         Me.chkMonitorOnly.Location = New System.Drawing.Point(362, 340)
         Me.chkMonitorOnly.Name = "chkMonitorOnly"
-        Me.chkMonitorOnly.Size = New System.Drawing.Size(145, 17)
+        Me.chkMonitorOnly.Size = New System.Drawing.Size(83, 17)
         Me.chkMonitorOnly.TabIndex = 11
-        Me.chkMonitorOnly.Text = "Monitor only (No backup)"
+        Me.chkMonitorOnly.Text = "Monitor only"
         Me.chkMonitorOnly.UseVisualStyleBackColor = True
         '
         'grpExtra
@@ -468,18 +496,17 @@ Partial Class frmGameManager
         'grpStats
         '
         Me.grpStats.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.grpStats.Controls.Add(Me.cboRemoteBackup)
+        Me.grpStats.Controls.Add(Me.lblRestorePathData)
+        Me.grpStats.Controls.Add(Me.lblBackupFileData)
+        Me.grpStats.Controls.Add(Me.lblLocalBackupData)
         Me.grpStats.Controls.Add(Me.lblRestorePath)
-        Me.grpStats.Controls.Add(Me.txtRestorePath)
         Me.grpStats.Controls.Add(Me.btnOpenRestorePath)
         Me.grpStats.Controls.Add(Me.btnOpenBackupFile)
-        Me.grpStats.Controls.Add(Me.txtFileSize)
         Me.grpStats.Controls.Add(Me.btnDeleteBackup)
-        Me.grpStats.Controls.Add(Me.lblFileSize)
+        Me.grpStats.Controls.Add(Me.lblBackupFile)
-        Me.grpStats.Controls.Add(Me.lblSync)
+        Me.grpStats.Controls.Add(Me.lblRemote)
-        Me.grpStats.Controls.Add(Me.txtCurrentBackup)
+        Me.grpStats.Controls.Add(Me.lblLocalData)
-        Me.grpStats.Controls.Add(Me.lblCurrentBackup)
-        Me.grpStats.Controls.Add(Me.txtLocalBackup)
-        Me.grpStats.Controls.Add(Me.lblLastBackup)
         Me.grpStats.Location = New System.Drawing.Point(247, 365)
         Me.grpStats.Name = "grpStats"
         Me.grpStats.Size = New System.Drawing.Size(525, 154)
@@ -487,6 +514,48 @@ Partial Class frmGameManager
         Me.grpStats.TabStop = False
         Me.grpStats.Text = "Backup Information"
         '
+        'cboRemoteBackup
+        '
+        Me.cboRemoteBackup.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboRemoteBackup.FormattingEnabled = True
+        Me.cboRemoteBackup.Location = New System.Drawing.Point(96, 24)
+        Me.cboRemoteBackup.Name = "cboRemoteBackup"
+        Me.cboRemoteBackup.Size = New System.Drawing.Size(387, 21)
+        Me.cboRemoteBackup.TabIndex = 12
+        '
+        'lblRestorePathData
+        '
+        Me.lblRestorePathData.AutoEllipsis = True
+        Me.lblRestorePathData.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.lblRestorePathData.Location = New System.Drawing.Point(96, 98)
+        Me.lblRestorePathData.Name = "lblRestorePathData"
+        Me.lblRestorePathData.Size = New System.Drawing.Size(387, 20)
+        Me.lblRestorePathData.TabIndex = 7
+        Me.lblRestorePathData.Tag = "wipe"
+        Me.lblRestorePathData.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
+        'lblBackupFileData
+        '
+        Me.lblBackupFileData.AutoEllipsis = True
+        Me.lblBackupFileData.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.lblBackupFileData.Location = New System.Drawing.Point(96, 73)
+        Me.lblBackupFileData.Name = "lblBackupFileData"
+        Me.lblBackupFileData.Size = New System.Drawing.Size(387, 20)
+        Me.lblBackupFileData.TabIndex = 6
+        Me.lblBackupFileData.Tag = "wipe"
+        Me.lblBackupFileData.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
+        'lblLocalBackupData
+        '
+        Me.lblLocalBackupData.AutoEllipsis = True
+        Me.lblLocalBackupData.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.lblLocalBackupData.Location = New System.Drawing.Point(96, 49)
+        Me.lblLocalBackupData.Name = "lblLocalBackupData"
+        Me.lblLocalBackupData.Size = New System.Drawing.Size(387, 20)
+        Me.lblLocalBackupData.TabIndex = 5
+        Me.lblLocalBackupData.Tag = "wipe"
+        Me.lblLocalBackupData.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
         'lblRestorePath
         '
         Me.lblRestorePath.AutoSize = True
@@ -496,122 +565,77 @@ Partial Class frmGameManager
         Me.lblRestorePath.TabIndex = 3
         Me.lblRestorePath.Text = "Restore Path:"
         '
-        'txtRestorePath
-        '
-        Me.txtRestorePath.Location = New System.Drawing.Point(96, 99)
-        Me.txtRestorePath.Name = "txtRestorePath"
-        Me.txtRestorePath.ReadOnly = True
-        Me.txtRestorePath.Size = New System.Drawing.Size(387, 20)
-        Me.txtRestorePath.TabIndex = 8
-        '
         'btnOpenRestorePath
         '
-        Me.btnOpenRestorePath.Location = New System.Drawing.Point(339, 125)
+        Me.btnOpenRestorePath.Location = New System.Drawing.Point(369, 125)
         Me.btnOpenRestorePath.Name = "btnOpenRestorePath"
         Me.btnOpenRestorePath.Size = New System.Drawing.Size(114, 23)
-        Me.btnOpenRestorePath.TabIndex = 12
+        Me.btnOpenRestorePath.TabIndex = 11
         Me.btnOpenRestorePath.Text = "O&pen Restore Path"
         Me.btnOpenRestorePath.UseVisualStyleBackColor = True
         '
         'btnOpenBackupFile
         '
-        Me.btnOpenBackupFile.Location = New System.Drawing.Point(216, 125)
+        Me.btnOpenBackupFile.Location = New System.Drawing.Point(249, 125)
         Me.btnOpenBackupFile.Name = "btnOpenBackupFile"
         Me.btnOpenBackupFile.Size = New System.Drawing.Size(114, 23)
-        Me.btnOpenBackupFile.TabIndex = 11
+        Me.btnOpenBackupFile.TabIndex = 10
         Me.btnOpenBackupFile.Text = "&Open Backup File"
         Me.btnOpenBackupFile.UseVisualStyleBackColor = True
         '
-        'txtFileSize
-        '
-        Me.txtFileSize.Location = New System.Drawing.Point(96, 74)
-        Me.txtFileSize.Name = "txtFileSize"
-        Me.txtFileSize.ReadOnly = True
-        Me.txtFileSize.Size = New System.Drawing.Size(387, 20)
-        Me.txtFileSize.TabIndex = 7
-        Me.txtFileSize.TabStop = False
-        '
         'btnDeleteBackup
         '
-        Me.btnDeleteBackup.Location = New System.Drawing.Point(96, 125)
+        Me.btnDeleteBackup.Location = New System.Drawing.Point(129, 125)
         Me.btnDeleteBackup.Name = "btnDeleteBackup"
         Me.btnDeleteBackup.Size = New System.Drawing.Size(114, 23)
-        Me.btnDeleteBackup.TabIndex = 10
+        Me.btnDeleteBackup.TabIndex = 8
         Me.btnDeleteBackup.Text = "&Delete Backup"
         Me.btnDeleteBackup.UseVisualStyleBackColor = True
         '
-        'lblFileSize
+        'lblBackupFile
         '
-        Me.lblFileSize.AutoSize = True
+        Me.lblBackupFile.AutoSize = True
-        Me.lblFileSize.Location = New System.Drawing.Point(6, 77)
+        Me.lblBackupFile.Location = New System.Drawing.Point(6, 77)
-        Me.lblFileSize.Name = "lblFileSize"
+        Me.lblBackupFile.Name = "lblBackupFile"
-        Me.lblFileSize.Size = New System.Drawing.Size(70, 13)
+        Me.lblBackupFile.Size = New System.Drawing.Size(66, 13)
-        Me.lblFileSize.TabIndex = 2
+        Me.lblBackupFile.TabIndex = 2
-        Me.lblFileSize.Text = "Backup Size:"
+        Me.lblBackupFile.Text = "Backup File:"
         '
-        'lblSync
+        'lblRemote
         '
-        Me.lblSync.AutoSize = True
+        Me.lblRemote.AutoSize = True
-        Me.lblSync.Location = New System.Drawing.Point(6, 130)
+        Me.lblRemote.Location = New System.Drawing.Point(6, 27)
-        Me.lblSync.Name = "lblSync"
+        Me.lblRemote.Name = "lblRemote"
-        Me.lblSync.Size = New System.Drawing.Size(62, 13)
+        Me.lblRemote.Size = New System.Drawing.Size(73, 13)
-        Me.lblSync.TabIndex = 4
+        Me.lblRemote.TabIndex = 0
-        Me.lblSync.Text = "Up to Date!"
+        Me.lblRemote.Text = "Backup Data:"
-        Me.lblSync.Visible = False
         '
-        'txtCurrentBackup
+        'lblLocalData
         '
-        Me.txtCurrentBackup.Location = New System.Drawing.Point(96, 24)
+        Me.lblLocalData.AutoSize = True
-        Me.txtCurrentBackup.Name = "txtCurrentBackup"
+        Me.lblLocalData.Location = New System.Drawing.Point(6, 53)
-        Me.txtCurrentBackup.ReadOnly = True
+        Me.lblLocalData.Name = "lblLocalData"
-        Me.txtCurrentBackup.Size = New System.Drawing.Size(387, 20)
+        Me.lblLocalData.Size = New System.Drawing.Size(62, 13)
-        Me.txtCurrentBackup.TabIndex = 5
+        Me.lblLocalData.TabIndex = 1
-        Me.txtCurrentBackup.TabStop = False
+        Me.lblLocalData.Text = "Local Data:"
-        '
-        'lblCurrentBackup
-        '
-        Me.lblCurrentBackup.AutoSize = True
-        Me.lblCurrentBackup.Location = New System.Drawing.Point(6, 27)
-        Me.lblCurrentBackup.Name = "lblCurrentBackup"
-        Me.lblCurrentBackup.Size = New System.Drawing.Size(84, 13)
-        Me.lblCurrentBackup.TabIndex = 0
-        Me.lblCurrentBackup.Text = "Current Backup:"
-        '
-        'txtLocalBackup
-        '
-        Me.txtLocalBackup.Location = New System.Drawing.Point(96, 50)
-        Me.txtLocalBackup.Name = "txtLocalBackup"
-        Me.txtLocalBackup.ReadOnly = True
-        Me.txtLocalBackup.Size = New System.Drawing.Size(387, 20)
-        Me.txtLocalBackup.TabIndex = 6
-        Me.txtLocalBackup.TabStop = False
-        '
-        'lblLastBackup
-        '
-        Me.lblLastBackup.AutoSize = True
-        Me.lblLastBackup.Location = New System.Drawing.Point(6, 53)
-        Me.lblLastBackup.Name = "lblLastBackup"
-        Me.lblLastBackup.Size = New System.Drawing.Size(76, 13)
-        Me.lblLastBackup.TabIndex = 1
-        Me.lblLastBackup.Text = "Local Backup:"
         '
         'btnMarkAsRestored
         '
         Me.btnMarkAsRestored.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnMarkAsRestored.Location = New System.Drawing.Point(429, 525)
+        Me.btnMarkAsRestored.Location = New System.Drawing.Point(429, 526)
         Me.btnMarkAsRestored.Name = "btnMarkAsRestored"
         Me.btnMarkAsRestored.Size = New System.Drawing.Size(100, 23)
-        Me.btnMarkAsRestored.TabIndex = 16
+        Me.btnMarkAsRestored.TabIndex = 17
         Me.btnMarkAsRestored.Text = "&Mark as Restored"
         Me.btnMarkAsRestored.UseVisualStyleBackColor = True
         '
         'btnRestore
         '
         Me.btnRestore.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnRestore.Location = New System.Drawing.Point(535, 525)
+        Me.btnRestore.Location = New System.Drawing.Point(535, 526)
         Me.btnRestore.Name = "btnRestore"
         Me.btnRestore.Size = New System.Drawing.Size(75, 23)
-        Me.btnRestore.TabIndex = 17
+        Me.btnRestore.TabIndex = 18
         Me.btnRestore.Text = "&Restore"
         Me.btnRestore.UseVisualStyleBackColor = True
         '
@@ -764,6 +788,25 @@ Partial Class frmGameManager
         Me.lblQuickFilter.TabIndex = 1
         Me.lblQuickFilter.Text = "Quick Filter:"
         '
+        'cmsDeleteBackup
+        '
+        Me.cmsDeleteBackup.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cmsDeleteOne, Me.cmsDeleteAll})
+        Me.cmsDeleteBackup.Name = "cmsDeleteBackup"
+        Me.cmsDeleteBackup.ShowImageMargin = False
+        Me.cmsDeleteBackup.Size = New System.Drawing.Size(115, 48)
+        '
+        'cmsDeleteOne
+        '
+        Me.cmsDeleteOne.Name = "cmsDeleteOne"
+        Me.cmsDeleteOne.Size = New System.Drawing.Size(114, 22)
+        Me.cmsDeleteOne.Text = "&Selected File"
+        '
+        'cmsDeleteAll
+        '
+        Me.cmsDeleteAll.Name = "cmsDeleteAll"
+        Me.cmsDeleteAll.Size = New System.Drawing.Size(114, 22)
+        Me.cmsDeleteAll.Text = "&All Files"
+        '
         'frmGameManager
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -798,6 +841,7 @@ Partial Class frmGameManager
         Me.Text = "Game Manager"
         Me.grpConfig.ResumeLayout(False)
         Me.grpConfig.PerformLayout()
+        CType(Me.nudLimit, System.ComponentModel.ISupportInitialize).EndInit()
         Me.grpExtra.ResumeLayout(False)
         Me.grpExtra.PerformLayout()
         CType(Me.pbIcon, System.ComponentModel.ISupportInitialize).EndInit()
@@ -807,6 +851,7 @@ Partial Class frmGameManager
         Me.grpFilter.ResumeLayout(False)
         Me.grpFilter.PerformLayout()
         Me.cmsImport.ResumeLayout(False)
+        Me.cmsDeleteBackup.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -848,14 +893,10 @@ Partial Class frmGameManager
     Friend WithEvents btnIconBrowse As System.Windows.Forms.Button
     Friend WithEvents txtIcon As System.Windows.Forms.TextBox
     Friend WithEvents txtID As System.Windows.Forms.TextBox
-    Friend WithEvents txtCurrentBackup As System.Windows.Forms.TextBox
+    Friend WithEvents lblRemote As System.Windows.Forms.Label
-    Friend WithEvents lblCurrentBackup As System.Windows.Forms.Label
+    Friend WithEvents lblLocalData As System.Windows.Forms.Label
-    Friend WithEvents txtLocalBackup As System.Windows.Forms.TextBox
-    Friend WithEvents lblLastBackup As System.Windows.Forms.Label
-    Friend WithEvents lblSync As System.Windows.Forms.Label
     Friend WithEvents chkEnabled As System.Windows.Forms.CheckBox
-    Friend WithEvents txtFileSize As System.Windows.Forms.TextBox
+    Friend WithEvents lblBackupFile As System.Windows.Forms.Label
-    Friend WithEvents lblFileSize As System.Windows.Forms.Label
     Friend WithEvents btnMarkAsRestored As System.Windows.Forms.Button
     Friend WithEvents btnRestore As System.Windows.Forms.Button
     Friend WithEvents btnDeleteBackup As System.Windows.Forms.Button
@@ -871,7 +912,6 @@ Partial Class frmGameManager
     Friend WithEvents btnInclude As System.Windows.Forms.Button
     Friend WithEvents btnExclude As System.Windows.Forms.Button
     Friend WithEvents lblRestorePath As Label
-    Friend WithEvents txtRestorePath As TextBox
     Friend WithEvents btnImport As System.Windows.Forms.Button
     Friend WithEvents btnExport As System.Windows.Forms.Button
     Friend WithEvents cmsImport As System.Windows.Forms.ContextMenuStrip
@@ -879,4 +919,13 @@ Partial Class frmGameManager
     Friend WithEvents cmsFile As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents txtQuickFilter As TextBox
     Friend WithEvents lblQuickFilter As Label
+    Friend WithEvents lblLocalBackupData As Label
+    Friend WithEvents lblRestorePathData As Label
+    Friend WithEvents lblBackupFileData As Label
+    Friend WithEvents lblLimit As Label
+    Friend WithEvents nudLimit As NumericUpDown
+    Friend WithEvents cboRemoteBackup As ComboBox
+    Friend WithEvents cmsDeleteBackup As ContextMenuStrip
+    Friend WithEvents cmsDeleteOne As ToolStripMenuItem
+    Friend WithEvents cmsDeleteAll As ToolStripMenuItem
 End Class

GBM/Forms/frmGameManager.resx

@@ -120,4 +120,7 @@
   <metadata name="cmsImport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="cmsDeleteBackup.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>127, 17</value>
+  </metadata>
 </root>

GBM/Forms/frmGameManager.vb

@@ -11,7 +11,7 @@ Public Class frmGameManager
     Private bTriggerBackup As Boolean = False
     Private bTriggerRestore As Boolean = False
     Private oBackupList As New List(Of clsGame)
-    Private oRestoreList As New List(Of clsGame)
+    Private oRestoreList As New Hashtable
     Private oAppData As Hashtable
     Private oLocalBackupData As SortedList
     Private oRemoteBackupData As SortedList
@@ -114,11 +114,11 @@ Public Class frmGameManager
         End Set
     End Property
 
-    Property RestoreList As List(Of clsGame)
+    Property RestoreList As Hashtable
         Get
             Return oRestoreList
         End Get
-        Set(value As List(Of clsGame))
+        Set(value As Hashtable)
             oRestoreList = value
         End Set
     End Property
@@ -142,8 +142,8 @@ Public Class frmGameManager
     End Property
 
     Private Sub LoadBackupData()
-        oRemoteBackupData = mgrManifest.ReadManifest(mgrSQLite.Database.Remote)
+        oRemoteBackupData = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Remote)
-        oLocalBackupData = mgrManifest.ReadManifest(mgrSQLite.Database.Local)
+        oLocalBackupData = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local)
     End Sub
 
     Private Function ConvertToRelativePath(ByVal sSavePath As String, ByVal sAppPath As String) As String
@@ -160,7 +160,7 @@ Public Class frmGameManager
     End Function
 
     Private Sub CheckManifestandUpdate(ByVal oOriginalApp As clsGame, ByVal oNewApp As clsGame)
-        Dim oBackupItem As clsBackup
+        Dim oBackupItems As List(Of clsBackup)
         Dim sDirectory As String
         Dim sNewDirectory As String
         Dim sFileName As String
@@ -169,9 +169,10 @@ Public Class frmGameManager
         'If there is a name change, check and update the manifest
         If oNewApp.Name <> oOriginalApp.Name Then
             'Local
-            If mgrManifest.DoManifestCheck(oOriginalApp.Name, mgrSQLite.Database.Local) Then
+            If mgrManifest.DoManifestNameCheck(oOriginalApp.Name, mgrSQLite.Database.Local) Then
-                oBackupItem = mgrManifest.DoManifestGetByName(oOriginalApp.Name, mgrSQLite.Database.Local)
+                oBackupItems = mgrManifest.DoManifestGetByName(oOriginalApp.Name, mgrSQLite.Database.Local)
-
+                'The local manifest will only have one entry per game, therefore this runs only once
+                For Each oBackupItem As clsBackup In oBackupItems
                     'Rename Current Backup File & Folder
                     sFileName = BackupFolder & oBackupItem.FileName
 
@@ -192,16 +193,21 @@ Public Class frmGameManager
 
                     oBackupItem.Name = oNewApp.Name
                     oBackupItem.FileName = oBackupItem.FileName.Replace(oOriginalApp.Name, oNewApp.Name)
-                mgrManifest.DoManifestNameUpdate(oOriginalApp.Name, oBackupItem, mgrSQLite.Database.Local)
+                    mgrManifest.DoManifestUpdateByID(oBackupItem, mgrSQLite.Database.Local)
-                oLocalBackupData = mgrManifest.ReadManifest(mgrSQLite.Database.Local)
+                Next
+                oLocalBackupData = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local)
             End If
+
             'Remote
-            If mgrManifest.DoManifestCheck(oOriginalApp.Name, mgrSQLite.Database.Remote) Then
+            If mgrManifest.DoManifestNameCheck(oOriginalApp.Name, mgrSQLite.Database.Remote) Then
-                oBackupItem = mgrManifest.DoManifestGetByName(oOriginalApp.Name, mgrSQLite.Database.Remote)
+                oBackupItems = mgrManifest.DoManifestGetByName(oOriginalApp.Name, mgrSQLite.Database.Remote)
+
+                For Each oBackupItem As clsBackup In oBackupItems
                     oBackupItem.Name = oNewApp.Name
                     oBackupItem.FileName = oBackupItem.FileName.Replace(oOriginalApp.Name, oNewApp.Name)
-                mgrManifest.DoManifestNameUpdate(oOriginalApp.Name, oBackupItem, mgrSQLite.Database.Remote)
+                    mgrManifest.DoManifestUpdateByID(oBackupItem, mgrSQLite.Database.Remote)
-                oRemoteBackupData = mgrManifest.ReadManifest(mgrSQLite.Database.Remote)
+                Next
+                oRemoteBackupData = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Remote)
             End If
         End If
     End Sub
@@ -281,7 +287,7 @@ Public Class frmGameManager
             End If
         End If
 
-        sNewPath = mgrCommon.OpenFileBrowser(frmGameManager_ChooseExe, "exe", _
+        sNewPath = mgrCommon.OpenFileBrowser(frmGameManager_ChooseExe, "exe",
                                           frmGameManager_Executable, sDefaultFolder, False)
 
         If sNewPath <> String.Empty Then
@@ -339,10 +345,10 @@ Public Class frmGameManager
 
         'Unix Handler
         If Not mgrCommon.IsUnix Then
-            sNewPath = mgrCommon.OpenFileBrowser(frmGameManager_ChooseCustomIcon, "ico", _
+            sNewPath = mgrCommon.OpenFileBrowser(frmGameManager_ChooseCustomIcon, "ico",
                                               frmGameManager_Icon, sDefaultFolder, False)
         Else
-            sNewPath = mgrCommon.OpenFileBrowser(frmGameManager_ChooseCustomIcon, "png", _
+            sNewPath = mgrCommon.OpenFileBrowser(frmGameManager_ChooseCustomIcon, "png",
                                               "PNG", sDefaultFolder, False)
         End If
 
@@ -541,13 +547,49 @@ Public Class frmGameManager
         ModeChange()
     End Sub
 
-    Private Sub GetBackupInfo(ByVal oApp As clsGame)
+    Private Sub UpdateBackupInfo(ByVal sManifestID As String)
-        Dim oBackupInfo As clsBackup
         Dim sFileName As String
 
+        If sManifestID <> String.Empty Then
+            CurrentBackupItem = mgrManifest.DoManifestGetByID(sManifestID, mgrSQLite.Database.Remote)
+
+            sFileName = BackupFolder & CurrentBackupItem.FileName
+
+            If File.Exists(sFileName) Then
+                lblBackupFileData.Text = Path.GetFileName(CurrentBackupItem.FileName) & " (" & mgrCommon.GetFileSize(sFileName) & ")"
+            Else
+                lblBackupFileData.Text = frmGameManager_ErrorNoBackupExists
+            End If
+
+            mgrRestore.DoPathOverride(CurrentBackupItem, CurrentGame)
+            lblRestorePathData.Text = CurrentBackupItem.RestorePath
+        End If
+
+    End Sub
+
+    Private Sub GetBackupInfo(ByVal oApp As clsGame)
+        Dim oBackupInfo As clsBackup
+        Dim oCurrentBackup As clsBackup
+        Dim oCurrentBackups As List(Of clsBackup)
+        Dim sFileName As String
+        Dim oComboItems As New List(Of KeyValuePair(Of String, String))
+        Dim bLocalData As Boolean = False
+        Dim bRemoteData As Boolean = False
+
+        'cboRemoteBackup
+        cboRemoteBackup.ValueMember = "Key"
+        cboRemoteBackup.DisplayMember = "Value"
+
         If oRemoteBackupData.Contains(oApp.Name) Then
+            bRemoteData = True
+            oCurrentBackups = mgrManifest.DoManifestGetByName(oApp.Name, mgrSQLite.Database.Remote)
+
+            For Each oCurrentBackup In oCurrentBackups
+                oComboItems.Add(New KeyValuePair(Of String, String)(oCurrentBackup.ID, mgrCommon.FormatString(frmGameManager_BackupTimeAndName, New String() {oCurrentBackup.DateUpdated, oCurrentBackup.UpdatedBy})))
+            Next
+
             CurrentBackupItem = DirectCast(oRemoteBackupData(oApp.Name), clsBackup)
-            txtCurrentBackup.Text = mgrCommon.FormatString(frmGameManager_BackupTimeAndName, New String() {CurrentBackupItem.DateUpdated, CurrentBackupItem.UpdatedBy})
+
             sFileName = BackupFolder & CurrentBackupItem.FileName
 
             btnOpenBackupFile.Enabled = True
@@ -556,80 +598,95 @@ Public Class frmGameManager
             btnDeleteBackup.Enabled = True
 
             If File.Exists(sFileName) Then
-                txtFileSize.Text = mgrCommon.GetFileSize(sFileName)
+                lblBackupFileData.Text = Path.GetFileName(CurrentBackupItem.FileName) & " (" & mgrCommon.GetFileSize(sFileName) & ")"
             Else
-                txtFileSize.Text = frmGameManager_ErrorNoBackupExists
+                lblBackupFileData.Text = frmGameManager_ErrorNoBackupExists
             End If
 
             mgrRestore.DoPathOverride(CurrentBackupItem, oApp)
-            txtRestorePath.Text = CurrentBackupItem.RestorePath
+            lblRestorePathData.Text = CurrentBackupItem.RestorePath
         Else
-            txtCurrentBackup.Text = frmGameManager_Never
+            oComboItems.Add(New KeyValuePair(Of String, String)(String.Empty, frmGameManager_None))
-            txtFileSize.Text = String.Empty
+            lblBackupFileData.Text = String.Empty
-            txtRestorePath.Text = String.Empty
+            lblRestorePathData.Text = String.Empty
             btnOpenBackupFile.Enabled = False
             btnOpenRestorePath.Enabled = False
             btnRestore.Enabled = False
             btnDeleteBackup.Enabled = False
         End If
 
+        cboRemoteBackup.DataSource = oComboItems
+
         If oLocalBackupData.Contains(oApp.Name) Then
+            bLocalData = True
             oBackupInfo = DirectCast(oLocalBackupData(oApp.Name), clsBackup)
-            txtLocalBackup.Text = mgrCommon.FormatString(frmGameManager_BackupTimeAndName, New String() {oBackupInfo.DateUpdated, oBackupInfo.UpdatedBy})
+            lblLocalBackupData.Text = mgrCommon.FormatString(frmGameManager_BackupTimeAndName, New String() {oBackupInfo.DateUpdated, oBackupInfo.UpdatedBy})
         Else
-            txtLocalBackup.Text = frmGameManager_Never
+            lblLocalBackupData.Text = frmGameManager_Unknown
         End If
 
-        If txtCurrentBackup.Text = frmGameManager_Never And txtLocalBackup.Text = frmGameManager_Never Then
+        If Not bRemoteData And Not bLocalData Then
-            lblSync.Visible = False
             btnMarkAsRestored.Enabled = False
-        ElseIf txtCurrentBackup.Text = frmGameManager_Never And txtLocalBackup.Text <> frmGameManager_Never Then
+            lblLocalBackupData.ForeColor = Color.Black
-            lblSync.Visible = False
+        ElseIf Not bRemoteData And bLocalData Then
             btnMarkAsRestored.Enabled = False
-        ElseIf txtCurrentBackup.Text <> txtLocalBackup.Text Then
+            lblLocalBackupData.ForeColor = Color.Black
-            lblSync.ForeColor = Color.Red
+        ElseIf oComboItems(0).Value <> lblLocalBackupData.Text Then
-            lblSync.Text = frmGameManager_OutofSync
+            lblLocalBackupData.ForeColor = Color.Red
-            lblSync.Visible = True
             btnMarkAsRestored.Enabled = True
         Else
-            lblSync.ForeColor = Color.Green
+            lblLocalBackupData.ForeColor = Color.Green
-            lblSync.Text = frmGameManager_UpToDate
-            lblSync.Visible = True
             btnMarkAsRestored.Enabled = False
         End If
 
     End Sub
 
-    Private Sub DeleteBackup()
+    Private Sub DeleteAllBackups()
-        Dim oDir As DirectoryInfo
+        Dim oBackupData As List(Of clsBackup)
-        Dim sSubDir As String
+        Dim oBackup As clsBackup
 
-        If mgrCommon.ShowMessage(frmGameManager_ConfirmBackupDelete, CurrentBackupItem.Name, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+        If mgrCommon.ShowMessage(frmGameManager_ConfirmBackupDeleteAll, CurrentGame.Name, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
-            mgrManifest.DoManifestDelete(CurrentBackupItem, mgrSQLite.Database.Local)
+            oBackupData = mgrManifest.DoManifestGetByName(CurrentGame.Name, mgrSQLite.Database.Remote)
-            mgrManifest.DoManifestDelete(CurrentBackupItem, mgrSQLite.Database.Remote)
+
+            For Each oBackup In oBackupData
+                'Delete the specific remote manifest entry
+                mgrManifest.DoManifestDeletebyID(oBackup, mgrSQLite.Database.Remote)
+                'Delete referenced backup file from the backup folder
+                mgrCommon.DeleteFile(BackupFolder & oBackup.FileName)
+                'Check for sub-directory and delete if empty (we need to do this every pass just in case the user had a mix of settings at one point)
+                mgrCommon.DeleteDirectoryByBackup(BackupFolder, oBackup)
+            Next
+
+            'Delete local manifest entry
+            mgrManifest.DoManifestDeletebyName(CurrentBackupItem, mgrSQLite.Database.Local)
+
+            LoadBackupData()
+
+            If oCurrentGame.Temporary Then
+                LoadData()
+                eCurrentMode = eModes.Disabled
+                ModeChange()
+            Else
+                FillData()
+            End If
+        End If
+    End Sub
+
+    Private Sub DeleteBackup()
+        If mgrCommon.ShowMessage(frmGameManager_ConfirmBackupDelete, Path.GetFileName(CurrentBackupItem.FileName), MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+            'Delete the specific remote manifest entry
+            mgrManifest.DoManifestDeletebyID(CurrentBackupItem, mgrSQLite.Database.Remote)
+
+            'If a remote manifest entry no longer exists for this game, delete the local entry
+            If Not mgrManifest.DoGlobalManifestCheck(CurrentBackupItem.Name, mgrSQLite.Database.Remote) Then
+                mgrManifest.DoManifestDeletebyName(CurrentBackupItem, mgrSQLite.Database.Local)
+            End If
 
             'Delete referenced backup file from the backup folder
             mgrCommon.DeleteFile(BackupFolder & CurrentBackupItem.FileName)
 
-            'Check if using backup sub-directories (Probably not the best way to check for this)
+            'Check for sub-directory and delete if empty
-            If CurrentBackupItem.FileName.StartsWith(CurrentBackupItem.Name & Path.DirectorySeparatorChar) Then
+            mgrCommon.DeleteDirectoryByBackup(BackupFolder, CurrentBackupItem)
-                'Build sub-dir backup path
-                sSubDir = BackupFolder & CurrentBackupItem.Name
-
-                If Directory.Exists(sSubDir) Then
-                    'Check if there's any sub-directories or files remaining
-                    oDir = New DirectoryInfo(sSubDir)
-                    If oDir.GetDirectories.Length > 0 Or oDir.GetFiles.Length > 0 Then
-                        'Confirm
-                        If mgrCommon.ShowMessage(frmGameManager_ConfirmBackupFolderDelete, New String() {sSubDir, oDir.GetDirectories.Length, oDir.GetFiles.Length}, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
-                            If Directory.Exists(sSubDir) Then mgrCommon.DeleteDirectory(sSubDir, True)
-                        End If
-                    Else
-                        'Folder is empty,  delete the empty sub-folder
-                        If Directory.Exists(sSubDir) Then mgrCommon.DeleteDirectory(sSubDir)
-                    End If
-                End If
-            End If
 
             LoadBackupData()
 
@@ -658,6 +715,7 @@ Public Class frmGameManager
         txtExclude.Text = oApp.ExcludeList
         chkFolderSave.Checked = oApp.FolderSave
         chkTimeStamp.Checked = oApp.AppendTimeStamp
+        nudLimit.Value = oApp.BackupLimit
         chkEnabled.Checked = oApp.Enabled
         chkMonitorOnly.Checked = oApp.MonitorOnly
 
@@ -729,9 +787,6 @@ Public Class frmGameManager
                 AddHandler DirectCast(ctl, NumericUpDown).ValueChanged, AddressOf DirtyCheck_ValueChanged
             End If
         Next
-
-        'Exemptions
-        RemoveHandler txtRestorePath.TextChanged, AddressOf DirtyCheck_ValueChanged
     End Sub
 
     Private Sub AssignDirtyHandlersMisc()
@@ -745,8 +800,12 @@ Public Class frmGameManager
                 DirectCast(ctl, TextBox).Text = String.Empty
             ElseIf TypeOf ctl Is CheckBox Then
                 DirectCast(ctl, CheckBox).Checked = False
+            ElseIf TypeOf ctl Is Label Then
+                If ctl.Tag = "wipe" Then DirectCast(ctl, Label).Text = String.Empty
             ElseIf TypeOf ctl Is NumericUpDown Then
-                DirectCast(ctl, NumericUpDown).Value = 0
+                DirectCast(ctl, NumericUpDown).Value = DirectCast(ctl, NumericUpDown).Minimum
+            ElseIf TypeOf ctl Is ComboBox Then
+                DirectCast(ctl, ComboBox).DataSource = Nothing
             End If
         Next
     End Sub
@@ -780,7 +839,6 @@ Public Class frmGameManager
                 btnDeleteBackup.Enabled = False
                 btnOpenBackupFile.Enabled = False
                 btnOpenRestorePath.Enabled = False
-                lblSync.Visible = False
                 chkEnabled.Checked = True
                 chkMonitorOnly.Checked = False
                 btnTags.Enabled = False
@@ -863,7 +921,6 @@ Public Class frmGameManager
                 WipeControls(grpExtra.Controls)
                 WipeControls(grpStats.Controls)
                 pbIcon.Image = Icon_Unknown
-                lblSync.Visible = False
                 btnSave.Enabled = False
                 btnCancel.Enabled = False
                 grpConfig.Enabled = False
@@ -890,7 +947,6 @@ Public Class frmGameManager
                 WipeControls(grpExtra.Controls)
                 WipeControls(grpStats.Controls)
                 pbIcon.Image = Icon_Unknown
-                lblSync.Visible = False
                 btnSave.Enabled = True
                 btnCancel.Enabled = False
                 grpConfig.Enabled = False
@@ -928,36 +984,15 @@ Public Class frmGameManager
         End If
     End Sub
 
-    Private Sub MonitorOnlyModeChange()
+    Private Sub TimeStampModeChange()
-        If chkMonitorOnly.Checked Then
+        If chkTimeStamp.Checked Then
-            txtSavePath.Text = String.Empty
+            nudLimit.Visible = True
-            chkFolderSave.Checked = True
+            lblLimit.Visible = True
-            chkTimeStamp.Checked = False
+            nudLimit.Value = 5
-
-            If txtFileType.Text <> String.Empty Then
-                txtFileType.Text = String.Empty
-                UpdateBuilderButtonLabel(txtFileType.Text, frmGameManager_IncludeShortcut, btnInclude, False)
-            End If
-            If txtExclude.Text <> String.Empty Then
-                txtExclude.Text = String.Empty
-                UpdateBuilderButtonLabel(txtExclude.Text, frmGameManager_ExcludeShortcut, btnExclude, False)
-            End If
-
-            lblSavePath.Enabled = False
-            btnSavePathBrowse.Enabled = False
-            txtSavePath.Enabled = False
-            chkFolderSave.Enabled = False
-            chkTimeStamp.Enabled = False
-            btnInclude.Enabled = False
-            btnExclude.Enabled = False
         Else
-            lblSavePath.Enabled = True
+            nudLimit.Visible = False
-            btnSavePathBrowse.Enabled = True
+            nudLimit.Value = nudLimit.Minimum
-            txtSavePath.Enabled = True
+            lblLimit.Visible = False
-            chkFolderSave.Enabled = True
-            chkTimeStamp.Enabled = True
-            btnInclude.Enabled = True
-            btnExclude.Enabled = True
         End If
     End Sub
 
@@ -1028,6 +1063,7 @@ Public Class frmGameManager
         oApp.ExcludeList = txtExclude.Text
         oApp.FolderSave = chkFolderSave.Checked
         oApp.AppendTimeStamp = chkTimeStamp.Checked
+        oApp.BackupLimit = nudLimit.Value
         oApp.Enabled = chkEnabled.Checked
         oApp.MonitorOnly = chkMonitorOnly.Checked
         oApp.ProcessPath = txtAppPath.Text
@@ -1160,8 +1196,8 @@ Public Class frmGameManager
             If oMarkList.Count = 1 Then
                 If mgrCommon.ShowMessage(frmGameManager_ConfirmMark, oMarkList(0).Name, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
                     bWasUpdated = True
-                    If mgrManifest.DoManifestCheck(oMarkList(0).Name, mgrSQLite.Database.Local) Then
+                    If mgrManifest.DoGlobalManifestCheck(oMarkList(0).Name, mgrSQLite.Database.Local) Then
-                        mgrManifest.DoManifestUpdate(oMarkList(0), mgrSQLite.Database.Local)
+                        mgrManifest.DoManifestUpdateByName(oMarkList(0), mgrSQLite.Database.Local)
                     Else
                         mgrManifest.DoManifestAdd(oMarkList(0), mgrSQLite.Database.Local)
                     End If
@@ -1170,8 +1206,8 @@ Public Class frmGameManager
                 If mgrCommon.ShowMessage(frmGameManager_ConfirmMultiMark, oMarkList.Count, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
                     bWasUpdated = True
                     For Each oGameBackup In oMarkList
-                        If mgrManifest.DoManifestCheck(oGameBackup.Name, mgrSQLite.Database.Local) Then
+                        If mgrManifest.DoGlobalManifestCheck(oGameBackup.Name, mgrSQLite.Database.Local) Then
-                            mgrManifest.DoManifestUpdate(oGameBackup, mgrSQLite.Database.Local)
+                            mgrManifest.DoManifestUpdateByName(oGameBackup, mgrSQLite.Database.Local)
                         Else
                             mgrManifest.DoManifestAdd(oGameBackup, mgrSQLite.Database.Local)
                         End If
@@ -1198,7 +1234,7 @@ Public Class frmGameManager
         End If
     End Sub
 
-    Private Sub TriggerSelectedBackup()
+    Private Sub TriggerSelectedBackup(Optional ByVal bPrompt As Boolean = True)
         Dim oData As KeyValuePair(Of String, String)
         Dim sMsg As String = String.Empty
         Dim oGame As clsGame
@@ -1209,8 +1245,7 @@ Public Class frmGameManager
 
             For Each oData In lstGames.SelectedItems
                 oGame = DirectCast(AppData(oData.Key), clsGame)
-                'Filter out any games set to monitor only
+                BackupList.Add(oGame)
-                If Not oGame.MonitorOnly Then BackupList.Add(oGame)
             Next
 
             If BackupList.Count = 1 Then
@@ -1224,37 +1259,51 @@ Public Class frmGameManager
             End If
 
             If bDoBackup Then
+                If bPrompt Then
                     If mgrCommon.ShowMessage(sMsg, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
                         TriggerBackup = True
                         Me.Close()
                     End If
+                Else
+                    TriggerBackup = True
+                    Me.Close()
+                End If
             End If
         End If
     End Sub
 
-    Private Sub TriggerSelectedRestore()
+    Private Sub TriggerSelectedRestore(Optional ByVal bPrompt As Boolean = True)
         Dim oData As KeyValuePair(Of String, String)
         Dim sMsg As String = String.Empty
         Dim oGame As clsGame
+        Dim oBackup As clsBackup
         Dim bDoRestore As Boolean = False
 
         If lstGames.SelectedItems.Count > 0 Then
             RestoreList.Clear()
 
+            If lstGames.SelectedItems.Count = 1 Then
+                RestoreList.Add(CurrentGame, CurrentBackupItem)
+            Else
                 For Each oData In lstGames.SelectedItems
                     If oRemoteBackupData.Contains(oData.Value) Then
                         oGame = DirectCast(AppData(oData.Key), clsGame)
-                    'Filter out any games set to monitor only
+                        oBackup = DirectCast(oRemoteBackupData(oData.Value), clsBackup)
-                    If Not oGame.MonitorOnly Then RestoreList.Add(oGame)
+                        RestoreList.Add(oGame, oBackup)
                     End If
                 Next
+            End If
 
             If RestoreList.Count = 1 Then
                 bDoRestore = True
-                If Not mgrRestore.CheckManifest(RestoreList(0).Name) Then
+                oGame = New clsGame
-                    sMsg = mgrCommon.FormatString(frmGameManager_ConfirmRestoreAnyway, RestoreList(0).Name)
+                For Each de As DictionaryEntry In RestoreList
+                    oGame = DirectCast(de.Key, clsGame)
+                Next
+                If Not mgrRestore.CheckManifest(oGame.Name) Then
+                    sMsg = mgrCommon.FormatString(frmGameManager_ConfirmRestoreAnyway, oGame.Name)
                 Else
-                    sMsg = mgrCommon.FormatString(frmGameManager_ConfirmRestore, RestoreList(0).Name)
+                    sMsg = mgrCommon.FormatString(frmGameManager_ConfirmRestore, oGame.Name)
                 End If
             ElseIf RestoreList.Count > 1 Then
                 bDoRestore = True
@@ -1264,10 +1313,15 @@ Public Class frmGameManager
             End If
 
             If bDoRestore Then
+                If bPrompt Then
                     If mgrCommon.ShowMessage(sMsg, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
                         TriggerRestore = True
                         Me.Close()
                     End If
+                Else
+                    TriggerRestore = True
+                    Me.Close()
+                End If
             End If
         End If
     End Sub
@@ -1338,9 +1392,9 @@ Public Class frmGameManager
         btnOpenRestorePath.Text = frmGameManager_btnOpenRestorePath
         btnOpenBackupFile.Text = frmGameManager_btnOpenBackupFile
         btnDeleteBackup.Text = frmGameManager_btnDeleteBackup
-        lblFileSize.Text = frmGameManager_lblFileSize
+        lblBackupFile.Text = frmGameManager_lblBackupFile
-        lblCurrentBackup.Text = frmGameManager_lblCurrentBackup
+        lblRemote.Text = frmGameManager_lblRemote
-        lblLastBackup.Text = frmGameManager_lblLastBackup
+        lblLocalData.Text = frmGameManager_lblLocalData
         btnIconBrowse.Text = frmGameManager_btnIconBrowse
         lblVersion.Text = frmGameManager_lblVersion
         lblCompany.Text = frmGameManager_lblCompany
@@ -1364,6 +1418,9 @@ Public Class frmGameManager
         cmsOfficial.Text = frmGameManager_cmsOfficial
         cmsFile.Text = frmGameManager_cmsFile
         lblQuickFilter.Text = frmGameManager_lblQuickFilter
+        lblLimit.Text = frmGameManager_lblLimit
+        cmsDeleteOne.Text = frmGameManager_cmsDeleteOne
+        cmsDeleteAll.Text = frmGameManager_cmsDeleteAll
 
         'Init Filter Timer
         tmFilterTimer = New Timer()
@@ -1471,7 +1528,19 @@ Public Class frmGameManager
     End Sub
 
     Private Sub btnDeleteBackup_Click(sender As Object, e As EventArgs) Handles btnDeleteBackup.Click
+        If cboRemoteBackup.Items.Count > 1 Then
+            cmsDeleteBackup.Show(btnDeleteBackup, New Drawing.Point(109, 11), ToolStripDropDownDirection.AboveRight)
+        Else
             DeleteBackup()
+        End If
+    End Sub
+
+    Private Sub cmsDeleteOne_Click(sender As Object, e As EventArgs) Handles cmsDeleteOne.Click
+        DeleteBackup()
+    End Sub
+
+    Private Sub cmsDeleteAll_Click(sender As Object, e As EventArgs) Handles cmsDeleteAll.Click
+        DeleteAllBackups()
     End Sub
 
     Private Sub btnMarkAsRestored_Click(sender As Object, e As EventArgs) Handles btnMarkAsRestored.Click
@@ -1505,8 +1574,14 @@ Public Class frmGameManager
         FolderSaveModeChange()
     End Sub
 
-    Private Sub chkMonitorOnly_CheckedChanged(sender As Object, e As EventArgs) Handles chkMonitorOnly.CheckedChanged
+    Private Sub chkTimeStamp_CheckedChanged(sender As Object, e As EventArgs) Handles chkTimeStamp.CheckedChanged
-        MonitorOnlyModeChange()
+        TimeStampModeChange()
+    End Sub
+
+    Private Sub cboRemoteBackup_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboRemoteBackup.SelectedIndexChanged
+        If Not bIsLoading Then
+            UpdateBackupInfo(DirectCast(cboRemoteBackup.SelectedItem, KeyValuePair(Of String, String)).Key)
+        End If
     End Sub
 
     Private Sub btnImport_Click(sender As Object, e As EventArgs) Handles btnImport.Click
@@ -1542,4 +1617,5 @@ Public Class frmGameManager
     Private Sub frmGameManager_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
         txtQuickFilter.Focus()
     End Sub
+
 End Class

GBM/Forms/frmMain.vb

@@ -157,8 +157,7 @@ Public Class frmMain
         OperationEnded()
     End Sub
 
-    Private Sub RunRestore(ByVal oRestoreList As List(Of clsGame))
+    Private Sub RunRestore(ByVal oRestoreList As Hashtable)
-        Dim oBackupData As SortedList = mgrManifest.ReadManifest(mgrSQLite.Database.Remote)
         Dim oGame As clsGame
         Dim oReadyList As New List(Of clsBackup)
         Dim oRestoreInfo As clsBackup
@@ -168,9 +167,10 @@ Public Class frmMain
         OperationStarted()
 
         'Build Restore List
-        For Each oGame In oRestoreList
+        For Each de As DictionaryEntry In oRestoreList
             bPathVerified = False
-            oRestoreInfo = oBackupData(oGame.Name)
+            oGame = DirectCast(de.Key, clsGame)
+            oRestoreInfo = DirectCast(de.Value, clsBackup)
 
             If mgrRestore.CheckPath(oRestoreInfo, oGame, bTriggerReload) Then
                 bPathVerified = True
@@ -813,6 +813,13 @@ Public Class frmMain
 
     Private Sub LoadAndVerify()
 
+        'If the default utility is missing we cannot continue
+        If Not oBackup.CheckForUtilities(mgrPath.Default7zLocation) Then
+            mgrCommon.ShowMessage(frmMain_Error7zip, MsgBoxStyle.Critical)
+            bInitFail = True
+            Exit Sub
+        End If
+
         'Local Database Check
         VerifyDBVersion(mgrSQLite.Database.Local)
         LocalDatabaseCheck()
@@ -825,8 +832,8 @@ Public Class frmMain
         If Not bFirstRun Then
             'The application cannot continue if this fails
             If Not VerifyBackupLocation() Then
-                bShutdown = True
+                bInitFail = True
-                Me.Close()
+                Exit Sub
             End If
 
             'Remote Database Check
@@ -857,13 +864,6 @@ Public Class frmMain
             End If
         End If
 
-        'If the default utility is missing we cannot continue
-        If Not oBackup.CheckForUtilities(mgrPath.Default7zLocation) Then
-            mgrCommon.ShowMessage(frmMain_Error7zip, MsgBoxStyle.Critical)
-            bShutdown = True
-            Me.Close()
-        End If
-
     End Sub
 
     'Functions that handle buttons, menus and other GUI features on this form
@@ -1643,6 +1643,7 @@ Public Class frmMain
             SetForm()
             VerifyGameDataPath()
             LoadAndVerify()
+            If Not bInitFail Then
                 VerifyCustomPathVariables()
 
                 If oSettings.StartToTray And Not mgrCommon.IsUnix Then
@@ -1659,11 +1660,6 @@ Public Class frmMain
 
                 HandleScan()
                 CheckForNewBackups()
-        Catch ex As Exception
-            If mgrCommon.ShowMessage(frmMain_ErrorInitFailure, ex.Message, MsgBoxStyle.YesNo) = MsgBoxResult.No Then
-                bInitFail = True
-            End If
-        End Try
 
                 'Unix Handler
                 If mgrCommon.IsUnix Then
@@ -1671,7 +1667,12 @@ Public Class frmMain
                 Else
                     Me.gMonTray.Visible = True
                 End If
-
+            End If
+        Catch ex As Exception
+            If mgrCommon.ShowMessage(frmMain_ErrorInitFailure, ex.Message, MsgBoxStyle.YesNo) = MsgBoxResult.No Then
+                bInitFail = True
+            End If
+        End Try
     End Sub
 
     Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown

GBM/Forms/frmSyncFields.Designer.vb

@@ -104,9 +104,9 @@ Partial Class frmSyncFields
         Me.chkTimeStamp.AutoSize = True
         Me.chkTimeStamp.Location = New System.Drawing.Point(6, 19)
         Me.chkTimeStamp.Name = "chkTimeStamp"
-        Me.chkTimeStamp.Size = New System.Drawing.Size(146, 17)
+        Me.chkTimeStamp.Size = New System.Drawing.Size(133, 17)
         Me.chkTimeStamp.TabIndex = 0
-        Me.chkTimeStamp.Text = "Time stamp each backup"
+        Me.chkTimeStamp.Text = "Save multiple backups"
         Me.chkTimeStamp.UseVisualStyleBackColor = True
         '
         'btnCancel

GBM/License/7z license.txt

@@ -3,7 +3,7 @@
       License for use and distribution
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-      Copyright (C) 1999-2015 Igor Pavlov.
+      Copyright (C) 1999-2016 Igor Pavlov.
 
       7-Zip Extra files are under the GNU LGPL license.
 

GBM/License/license.txt

@@ -1,5 +1,5 @@
 GBM - Game Backup Monitor 
-Copyright (C) 2015 Michael J. Seiferling
+Copyright (C) 2016 Michael J. Seiferling
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,4 +16,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Contact Information:
 
-mseiferling@gmail.com
+gamebackupmonitor@gmail.com

GBM/Managers/mgrBackup.vb

@@ -50,15 +50,15 @@ Public Class mgrBackup
         oItem.CheckSum = sCheckSum
 
         'Save Remote Manifest
-        If mgrManifest.DoManifestCheck(oItem.Name, mgrSQLite.Database.Remote) Then
+        If mgrManifest.DoSpecificManifestCheck(oItem, mgrSQLite.Database.Remote) Then
-            mgrManifest.DoManifestUpdate(oItem, mgrSQLite.Database.Remote)
+            mgrManifest.DoManifestUpdateByID(oItem, mgrSQLite.Database.Remote)
         Else
             mgrManifest.DoManifestAdd(oItem, mgrSQLite.Database.Remote)
         End If
 
         'Save Local Manifest
-        If mgrManifest.DoManifestCheck(oItem.Name, mgrSQLite.Database.Local) Then
+        If mgrManifest.DoGlobalManifestCheck(oItem.Name, mgrSQLite.Database.Local) Then
-            mgrManifest.DoManifestUpdate(oItem, mgrSQLite.Database.Local)
+            mgrManifest.DoManifestUpdateByName(oItem, mgrSQLite.Database.Local)
         Else
             mgrManifest.DoManifestAdd(oItem, mgrSQLite.Database.Local)
         End If
@@ -107,6 +107,33 @@ Public Class mgrBackup
         Return True
     End Function
 
+    Private Sub CheckOldBackups(ByVal oGame As clsGame)
+        Dim oGameBackups As List(Of clsBackup) = mgrManifest.DoManifestGetByName(oGame.Name, mgrSQLite.Database.Remote)
+        Dim oGameBackup As clsBackup
+        Dim sOldBackup As String
+        Dim iBackupCount As Integer = oGameBackups.Count
+        Dim iDelCount As Integer
+
+        'If we've hit or exceeded the maximum backup limit
+        If oGameBackups.Count >= oGame.BackupLimit Then
+            'How many do we need to delete
+            iDelCount = (oGameBackups.Count - oGame.BackupLimit) + 1
+
+            'Delete the oldest backup(s) (Manifest entry and backup file)
+            For i = 1 To iDelCount
+                oGameBackup = oGameBackups(oGameBackups.Count - i)
+                sOldBackup = Settings.BackupFolder & Path.DirectorySeparatorChar & oGameBackup.FileName
+
+                mgrManifest.DoManifestDeletebyID(oGameBackup, mgrSQLite.Database.Remote)
+                mgrManifest.DoManifestDeletebyID(oGameBackup, mgrSQLite.Database.Local)
+                mgrCommon.DeleteFile(sOldBackup)
+                mgrCommon.DeleteDirectoryByBackup(Settings.BackupFolder & Path.DirectorySeparatorChar, oGameBackup)
+
+                RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupLimitExceeded, Path.GetFileName(sOldBackup)), False, ToolTipIcon.Info, True)
+            Next
+        End If
+    End Sub
+
     Public Sub DoBackup(ByVal oBackupList As List(Of clsGame))
         Dim oGame As clsGame
         Dim bDoBackup As Boolean
@@ -144,6 +171,7 @@ Public Class mgrBackup
             End If
 
             If oGame.AppendTimeStamp Then
+                CheckOldBackups(oGame)
                 sBackupFile = sBackupFile & Path.DirectorySeparatorChar & oGame.Name & sTimeStamp & ".7z"
             Else
                 sBackupFile = sBackupFile & Path.DirectorySeparatorChar & oGame.Name & ".7z"

GBM/Managers/mgrCommon.vb

@@ -191,6 +191,24 @@ Public Class mgrCommon
         End If
     End Sub
 
+    'Delete a sub-folder based on the provided backup information
+    Public Shared Sub DeleteDirectoryByBackup(ByVal sBackupFolder As String, ByVal oBackup As clsBackup)
+        Dim oDir As DirectoryInfo
+        Dim sDir As String = sBackupFolder & oBackup.Name
+
+        'Delete sub directory if it's empty
+        If oBackup.FileName.StartsWith(oBackup.Name & Path.DirectorySeparatorChar) Then
+            If Directory.Exists(sDir) Then
+                'Check if there's any sub-directories or files remaining
+                oDir = New DirectoryInfo(sDir)
+                If oDir.GetDirectories.Length = 0 And oDir.GetFiles.Length = 0 Then
+                    'Folder is empty,  delete the empty sub-folder
+                    If Directory.Exists(sDir) Then DeleteDirectory(sDir)
+                End If
+            End If
+        End If
+    End Sub
+
     'Save string as text file
     Public Shared Sub SaveText(ByVal sText As String, ByVal sPath As String)
         Dim oStream As StreamWriter

GBM/Managers/mgrManifest.vb

@@ -1,6 +1,37 @@
 Public Class mgrManifest
 
-    Public Shared Function ReadManifest(ByVal iSelectDB As mgrSQLite.Database) As SortedList
+    Private Shared Function MapToObject(ByVal dr As DataRow) As clsBackup
+        Dim oBackupItem As clsBackup
+
+        oBackupItem = New clsBackup
+        oBackupItem.ID = CStr(dr("ManifestID"))
+        oBackupItem.Name = CStr(dr("Name"))
+        oBackupItem.FileName = CStr(dr("FileName"))
+        oBackupItem.RestorePath = CStr(dr("RestorePath"))
+        oBackupItem.AbsolutePath = CBool(dr("AbsolutePath"))
+        oBackupItem.DateUpdated = mgrCommon.UnixToDate(dr("DateUpdated"))
+        oBackupItem.UpdatedBy = CStr(dr("UpdatedBy"))
+        If Not IsDBNull(dr("CheckSum")) Then oBackupItem.CheckSum = CStr(dr("CheckSum"))
+
+        Return oBackupItem
+    End Function
+
+    Private Shared Function SetCoreParameters(ByVal oBackupItem As clsBackup) As Hashtable
+        Dim hshParams As New Hashtable
+
+        hshParams.Add("ID", oBackupItem.ID)
+        hshParams.Add("Name", oBackupItem.Name)
+        hshParams.Add("FileName", oBackupItem.FileName)
+        hshParams.Add("Path", oBackupItem.TruePath)
+        hshParams.Add("AbsolutePath", oBackupItem.AbsolutePath)
+        hshParams.Add("DateUpdated", oBackupItem.DateUpdatedUnix)
+        hshParams.Add("UpdatedBy", oBackupItem.UpdatedBy)
+        hshParams.Add("CheckSum", oBackupItem.CheckSum)
+
+        Return hshParams
+    End Function
+
+    Public Shared Function ReadFullManifest(ByVal iSelectDB As mgrSQLite.Database) As SortedList
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim oData As DataSet
         Dim sSQL As String
@@ -11,15 +42,26 @@
         oData = oDatabase.ReadParamData(sSQL, New Hashtable)
 
         For Each dr As DataRow In oData.Tables(0).Rows
-            oBackupItem = New clsBackup
+            oBackupItem = MapToObject(dr)
-            oBackupItem.ID = CStr(dr("ManifestID"))
+            slList.Add(oBackupItem.ID, oBackupItem)
-            oBackupItem.Name = CStr(dr("Name"))
+        Next
-            oBackupItem.FileName = CStr(dr("FileName"))
+
-            oBackupItem.RestorePath = CStr(dr("RestorePath"))
+        Return slList
-            oBackupItem.AbsolutePath = CBool(dr("AbsolutePath"))
+
-            oBackupItem.DateUpdated = mgrCommon.UnixToDate(dr("DateUpdated"))
+    End Function
-            oBackupItem.UpdatedBy = CStr(dr("UpdatedBy"))
+
-            If Not IsDBNull(dr("CheckSum")) Then oBackupItem.CheckSum = CStr(dr("CheckSum"))
+    Public Shared Function ReadLatestManifest(ByVal iSelectDB As mgrSQLite.Database) As SortedList
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim oData As DataSet
+        Dim sSQL As String
+        Dim oBackupItem As clsBackup
+        Dim slList As New SortedList
+
+        sSQL = "SELECT ManifestID, Name, FileName, RestorePath, AbsolutePath, Max(DateUpdated) As DateUpdated, UpdatedBy, CheckSum FROM manifest GROUP BY Name ORDER By Name ASC"
+        oData = oDatabase.ReadParamData(sSQL, New Hashtable)
+
+        For Each dr As DataRow In oData.Tables(0).Rows
+            oBackupItem = MapToObject(dr)
             slList.Add(oBackupItem.Name, oBackupItem)
         Next
 
@@ -27,7 +69,80 @@
 
     End Function
 
-    Public Shared Function DoManifestCheck(ByVal sName As String, ByVal iSelectDB As mgrSQLite.Database) As Boolean
+    Public Shared Function DoManifestGetByName(ByVal sName As String, ByVal iSelectDB As mgrSQLite.Database) As List(Of clsBackup)
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim oData As DataSet
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+        Dim oBackupItem As New clsBackup
+        Dim oList As New List(Of clsBackup)
+
+
+        sSQL = "SELECT * from manifest "
+        sSQL &= "WHERE Name = @Name ORDER BY DateUpdated Desc"
+
+        hshParams.Add("Name", sName)
+
+        oData = oDatabase.ReadParamData(sSQL, hshParams)
+
+        For Each dr As DataRow In oData.Tables(0).Rows
+            oBackupItem = MapToObject(dr)
+            oList.Add(oBackupItem)
+        Next
+
+        Return oList
+    End Function
+
+    Public Shared Function DoManifestGetByID(ByVal sID As String, ByVal iSelectDB As mgrSQLite.Database) As clsBackup
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim oData As DataSet
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+        Dim oBackupItem As New clsBackup
+        Dim oList As New List(Of clsBackup)
+
+        sSQL = "SELECT * from manifest "
+        sSQL &= "WHERE ManifestID = @ID ORDER BY DateUpdated Desc"
+
+        hshParams.Add("ID", sID)
+
+        oData = oDatabase.ReadParamData(sSQL, hshParams)
+
+        For Each dr As DataRow In oData.Tables(0).Rows
+            oBackupItem = MapToObject(dr)
+        Next
+
+        Return oBackupItem
+    End Function
+
+    'This should only be used to update specific entries in the remote manifest
+    Public Shared Function DoSpecificManifestCheck(ByRef oItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database) As Boolean
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim oData As DataSet
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+
+        sSQL = "SELECT * from manifest "
+        sSQL &= "WHERE Name = @Name AND FileName = @FileName"
+
+        hshParams.Add("Name", oItem.Name)
+        hshParams.Add("FileName", oItem.FileName)
+
+        oData = oDatabase.ReadParamData(sSQL, hshParams)
+
+        If oData.Tables(0).Rows.Count > 0 Then
+            For Each dr As DataRow In oData.Tables(0).Rows
+                oItem.ID = CStr(dr("ManifestID"))
+            Next
+            Return True
+        Else
+            Return False
+        End If
+
+    End Function
+
+    'This should only be used to update entries in the local manifest
+    Public Shared Function DoGlobalManifestCheck(ByVal sName As String, ByVal iSelectDB As mgrSQLite.Database) As Boolean
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim oData As DataSet
         Dim sSQL As String
@@ -48,12 +163,11 @@
 
     End Function
 
-    Public Shared Function DoManifestGetByName(ByVal sName As String, ByVal iSelectDB As mgrSQLite.Database) As clsBackup
+    Public Shared Function DoManifestNameCheck(ByVal sName As String, ByVal iSelectDB As mgrSQLite.Database) As Boolean
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim oData As DataSet
         Dim sSQL As String
         Dim hshParams As New Hashtable
-        Dim oBackupItem As New clsBackup
 
         sSQL = "SELECT * from manifest "
         sSQL &= "WHERE Name = @Name"
@@ -62,82 +176,55 @@
 
         oData = oDatabase.ReadParamData(sSQL, hshParams)
 
-        For Each dr As DataRow In oData.Tables(0).Rows
+        If oData.Tables(0).Rows.Count > 0 Then
-            oBackupItem = New clsBackup
+            Return True
-            oBackupItem.ID = CStr(dr("ManifestID"))
+        Else
-            oBackupItem.Name = CStr(dr("Name"))
+            Return False
-            oBackupItem.FileName = CStr(dr("FileName"))
+        End If
-            oBackupItem.RestorePath = CStr(dr("RestorePath"))
-            oBackupItem.AbsolutePath = CBool(dr("AbsolutePath"))
-            oBackupItem.DateUpdated = mgrCommon.UnixToDate(dr("DateUpdated"))
-            oBackupItem.UpdatedBy = CStr(dr("UpdatedBy"))
-            If Not IsDBNull(dr("CheckSum")) Then oBackupItem.CheckSum = CStr(dr("CheckSum"))
-        Next
 
-        Return oBackupItem
     End Function
 
     Public Shared Sub DoManifestAdd(ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim sSQL As String
-        Dim hshParams As New Hashtable
+        Dim hshParams As Hashtable
 
-        sSQL = "INSERT OR REPLACE INTO manifest VALUES (@ID, @Name, @FileName, @Path, @AbsolutePath, @DateUpdated, @UpdatedBy, @CheckSum)"
+        sSQL = "INSERT INTO manifest VALUES (@ID, @Name, @FileName, @Path, @AbsolutePath, @DateUpdated, @UpdatedBy, @CheckSum)"
 
-        hshParams.Add("ID", oBackupItem.ID)
+        hshParams = SetCoreParameters(oBackupItem)
-        hshParams.Add("Name", oBackupItem.Name)
-        hshParams.Add("FileName", oBackupItem.FileName)
-        hshParams.Add("Path", oBackupItem.TruePath)
-        hshParams.Add("AbsolutePath", oBackupItem.AbsolutePath)
-        hshParams.Add("DateUpdated", oBackupItem.DateUpdatedUnix)
-        hshParams.Add("UpdatedBy", oBackupItem.UpdatedBy)
-        hshParams.Add("CheckSum", oBackupItem.CheckSum)
 
         oDatabase.RunParamQuery(sSQL, hshParams)
     End Sub
 
-    Public Shared Sub DoManifestUpdate(ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
+    Public Shared Sub DoManifestUpdateByName(ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim sSQL As String
-        Dim hshParams As New Hashtable
+        Dim hshParams As Hashtable
 
         sSQL = "UPDATE manifest SET Name = @Name, FileName = @FileName, RestorePath = @Path, AbsolutePath = @AbsolutePath, "
         sSQL &= "DateUpdated = @DateUpdated, UpdatedBy = @UpdatedBy, CheckSum = @CheckSum WHERE Name = @QueryName"
 
-        hshParams.Add("Name", oBackupItem.Name)
+        hshParams = SetCoreParameters(oBackupItem)
-        hshParams.Add("FileName", oBackupItem.FileName)
-        hshParams.Add("Path", oBackupItem.TruePath)
-        hshParams.Add("AbsolutePath", oBackupItem.AbsolutePath)
-        hshParams.Add("DateUpdated", oBackupItem.DateUpdatedUnix)
-        hshParams.Add("UpdatedBy", oBackupItem.UpdatedBy)
-        hshParams.Add("CheckSum", oBackupItem.CheckSum)
         hshParams.Add("QueryName", oBackupItem.Name)
 
         oDatabase.RunParamQuery(sSQL, hshParams)
     End Sub
 
-    Public Shared Sub DoManifestNameUpdate(ByVal sOriginalName As String, ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
+    Public Shared Sub DoManifestUpdateByID(ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim sSQL As String
-        Dim hshParams As New Hashtable
+        Dim hshParams As Hashtable
 
         sSQL = "UPDATE manifest SET Name = @Name, FileName = @FileName, RestorePath = @Path, AbsolutePath = @AbsolutePath, "
-        sSQL &= "DateUpdated = @DateUpdated, UpdatedBy = @UpdatedBy, CheckSum = @CheckSum WHERE Name = @QueryName"
+        sSQL &= "DateUpdated = @DateUpdated, UpdatedBy = @UpdatedBy, CheckSum = @CheckSum WHERE ManifestID = @QueryID"
 
-        hshParams.Add("Name", oBackupItem.Name)
+        hshParams = SetCoreParameters(oBackupItem)
-        hshParams.Add("FileName", oBackupItem.FileName)
+        hshParams.Add("QueryID", oBackupItem.ID)
-        hshParams.Add("Path", oBackupItem.TruePath)
-        hshParams.Add("AbsolutePath", oBackupItem.AbsolutePath)
-        hshParams.Add("DateUpdated", oBackupItem.DateUpdatedUnix)
-        hshParams.Add("UpdatedBy", oBackupItem.UpdatedBy)
-        hshParams.Add("CheckSum", oBackupItem.CheckSum)
-        hshParams.Add("QueryName", sOriginalName)
 
         oDatabase.RunParamQuery(sSQL, hshParams)
-
     End Sub
 
-    Public Shared Sub DoManifestDelete(ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
+    Public Shared Sub DoManifestDeletebyName(ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim sSQL As String
         Dim hshParams As New Hashtable
@@ -150,6 +237,19 @@
         oDatabase.RunParamQuery(sSQL, hshParams)
     End Sub
 
+    Public Shared Sub DoManifestDeletebyID(ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+
+        sSQL = "DELETE FROM manifest "
+        sSQL &= "WHERE ManifestID = @ID"
+
+        hshParams.Add("ID", oBackupItem.ID)
+
+        oDatabase.RunParamQuery(sSQL, hshParams)
+    End Sub
+
     Public Shared Sub DoManifestHashWipe()
         Dim oLocalDatabase As New mgrSQLite(mgrSQLite.Database.Local)
         Dim oRemoteDatabase As New mgrSQLite(mgrSQLite.Database.Remote)

GBM/Managers/mgrMonitorList.vb

@@ -10,57 +10,261 @@ Public Class mgrMonitorList
 
     Public Shared Event UpdateLog(sLogUpdate As String, bTrayUpdate As Boolean, objIcon As System.Windows.Forms.ToolTipIcon, bTimeStamp As Boolean)
 
-    Public Shared Sub HandleBackupLocationChange(ByVal oSettings As mgrSettings)
+    Private Shared Function MapToObject(ByVal dr As DataRow) As clsGame
-        Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Remote)
+        Dim oGame As New clsGame
-        Dim iGameCount As Integer
 
-        'Check if a remote database already exists in the new backup location
+        oGame.ID = CStr(dr("MonitorID"))
-        If oDatabase.CheckDB() Then
+        oGame.Name = CStr(dr("Name"))
-            'Make sure database is the latest version
+        oGame.ProcessName = CStr(dr("Process"))
-            oDatabase.DatabaseUpgrade()
+        If Not IsDBNull(dr("Path")) Then oGame.Path = CStr(dr("Path"))
+        oGame.AbsolutePath = CBool(dr("AbsolutePath"))
+        oGame.FolderSave = CBool(dr("FolderSave"))
+        If Not IsDBNull(dr("FileType")) Then oGame.FileType = CStr(dr("FileType"))
+        oGame.AppendTimeStamp = CBool(dr("TimeStamp"))
+        If Not IsDBNull(dr("ExcludeList")) Then oGame.ExcludeList = CStr(dr("ExcludeList"))
+        If Not IsDBNull(dr("ProcessPath")) Then oGame.ProcessPath = CStr(dr("ProcessPath"))
+        If Not IsDBNull(dr("Icon")) Then oGame.Icon = CStr(dr("Icon"))
+        oGame.Hours = CDbl(dr("Hours"))
+        If Not IsDBNull(dr("Version")) Then oGame.Version = CStr(dr("Version"))
+        If Not IsDBNull(dr("Company")) Then oGame.Company = CStr(dr("Company"))
+        oGame.Enabled = CBool(dr("Enabled"))
+        oGame.MonitorOnly = CBool(dr("MonitorOnly"))
+        oGame.BackupLimit = CInt(dr("BackupLimit"))
 
-            'See if the remote database is empty
+        Return oGame
-            iGameCount = mgrMonitorList.ReadList(eListTypes.FullList, mgrSQLite.Database.Remote).Count
+    End Function
 
-            'If the remote database actually contains a list, then ask what to do
+    Private Shared Function SetCoreParameters(ByVal oGame As clsGame) As Hashtable
-            If iGameCount > 0 Then
+        Dim hshParams As New Hashtable
-                If mgrCommon.ShowMessage(mgrMonitorList_ConfirmExistingData, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+
-                    mgrMonitorList.SyncMonitorLists(oSettings.SyncFields)
+        hshParams.Add("ID", oGame.ID)
-                Else
+        hshParams.Add("Name", oGame.Name)
-                    mgrMonitorList.SyncMonitorLists(oSettings.SyncFields, False)
+        hshParams.Add("Process", oGame.TrueProcess)
-                End If
+        hshParams.Add("Path", oGame.TruePath)
-            Else
+        hshParams.Add("AbsolutePath", oGame.AbsolutePath)
-                mgrMonitorList.SyncMonitorLists(oSettings.SyncFields)
+        hshParams.Add("FolderSave", oGame.FolderSave)
-            End If
+        hshParams.Add("FileType", oGame.FileType)
-        Else
+        hshParams.Add("TimeStamp", oGame.AppendTimeStamp)
-            mgrMonitorList.SyncMonitorLists(oSettings.SyncFields)
+        hshParams.Add("ExcludeList", oGame.ExcludeList)
+        hshParams.Add("ProcessPath", oGame.ProcessPath)
+        hshParams.Add("Icon", oGame.Icon)
+        hshParams.Add("Hours", oGame.Hours)
+        hshParams.Add("Version", oGame.Version)
+        hshParams.Add("Company", oGame.Company)
+        hshParams.Add("Enabled", oGame.Enabled)
+        hshParams.Add("MonitorOnly", oGame.MonitorOnly)
+        hshParams.Add("BackupLimit", oGame.BackupLimit)
+
+        Return hshParams
+    End Function
+
+    Public Shared Function ReadList(ByVal eListType As eListTypes, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As Hashtable
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim oData As DataSet
+        Dim sSQL As String
+        Dim hshList As New Hashtable
+        Dim hshDupeList As New Hashtable
+        Dim oGame As clsGame
+
+        sSQL = "Select * from monitorlist ORDER BY Name Asc"
+        oData = oDatabase.ReadParamData(sSQL, New Hashtable)
+
+        For Each dr As DataRow In oData.Tables(0).Rows
+            oGame = MapToObject(dr)
+            Select Case eListType
+                Case eListTypes.FullList
+                    'Don't wrap this, if it fails there's a problem with the database
+                    hshList.Add(oGame.ProcessName & ":" & oGame.Name, oGame)
+                Case eListTypes.ScanList
+                    If hshList.Contains(oGame.ProcessName) Then
+                        DirectCast(hshList.Item(oGame.ProcessName), clsGame).Duplicate = True
+                        oGame.ProcessName = oGame.ProcessName & ":" & oGame.Name
+                        oGame.Duplicate = True
                     End If
+                    If oGame.Enabled Then hshList.Add(oGame.ProcessName, oGame)
+            End Select
+        Next
+
+        Return hshList
+    End Function
+
+    Public Shared Sub DoListAdd(ByVal oGame As clsGame, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim hshParams As Hashtable
+
+        sSQL = "INSERT INTO monitorlist VALUES (@ID, @Name, @Process, @Path, @AbsolutePath, @FolderSave, @FileType, @TimeStamp, "
+        sSQL &= "@ExcludeList, @ProcessPath, @Icon, @Hours, @Version, @Company, @Enabled, @MonitorOnly, @BackupLimit)"
+
+        'Parameters
+        hshParams = SetCoreParameters(oGame)
+
+        oDatabase.RunParamQuery(sSQL, hshParams)
+
     End Sub
 
-    Public Shared Sub ExportMonitorList(ByVal sLocation As String)
+    Public Shared Sub DoListUpdate(ByVal oGame As clsGame, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
-        Dim oList As List(Of Game)
+        Dim oDatabase As New mgrSQLite(iSelectDB)
-        Dim bSuccess As Boolean = False
+        Dim sSQL As String
-        Dim oTagFilters As New List(Of clsTag)
+        Dim hshParams As Hashtable
-        Dim oStringFilters As New Hashtable
-        Dim eCurrentFilter As frmFilter.eFilterType = frmFilter.eFilterType.NoFilter
 
-        If mgrCommon.ShowMessage(mgrMonitorList_ConfirmApplyFilter, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+        sSQL = "UPDATE monitorlist SET Name=@Name, Process=@Process, Path=@Path, AbsolutePath=@AbsolutePath, FolderSave=@FolderSave, "
-            Dim frm As New frmFilter
+        sSQL &= "FileType=@FileType, TimeStamp=@TimeStamp, ExcludeList=@ExcludeList, ProcessPath=@ProcessPath, Icon=@Icon, "
-            frm.ShowDialog()
+        sSQL &= "Hours=@Hours, Version=@Version, Company=@Company, Enabled=@Enabled, MonitorOnly=@MonitorOnly, BackupLimit=@BackupLimit WHERE MonitorID=@ID"
-            oTagFilters = frm.TagFilters
-            oStringFilters = frm.StringFilters
-            eCurrentFilter = frm.FilterType
-        End If
 
-        oList = ReadListForExport(oTagFilters, oStringFilters, eCurrentFilter)
+        'Parameters
+        hshParams = SetCoreParameters(oGame)
 
-        bSuccess = mgrXML.SerializeAndExport(oList, sLocation)
+        oDatabase.RunParamQuery(sSQL, hshParams)
 
-        If bSuccess Then
-            mgrCommon.ShowMessage(mgrMonitorList_ExportComplete, oList.Count, MsgBoxStyle.Information)
-        End If
     End Sub
 
+    Public Shared Sub DoListUpdateMulti(ByVal sMonitorIDs As List(Of String), ByVal oGame As clsGame, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+        Dim iCounter As Integer
+
+        sSQL = "UPDATE monitorlist SET Enabled=@Enabled, MonitorOnly=@MonitorOnly WHERE MonitorID IN ("
+
+        'Parameters
+        hshParams.Add("Enabled", oGame.Enabled)
+        hshParams.Add("MonitorOnly", oGame.MonitorOnly)
+
+        For Each s As String In sMonitorIDs
+            sSQL &= "@MonitorID" & iCounter & ","
+            hshParams.Add("MonitorID" & iCounter, s)
+            iCounter += 1
+        Next
+
+        sSQL = sSQL.TrimEnd(",")
+        sSQL &= ")"
+
+        oDatabase.RunParamQuery(sSQL, hshParams)
+
+    End Sub
+
+    Public Shared Sub DoListDelete(ByVal sMonitorID As String, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+
+        sSQL = "DELETE FROM gametags "
+        sSQL &= "WHERE MonitorID = @MonitorID;"
+        sSQL &= "DELETE FROM monitorlist "
+        sSQL &= "WHERE MonitorID = @MonitorID;"
+
+        hshParams.Add("MonitorID", sMonitorID)
+
+        oDatabase.RunParamQuery(sSQL, hshParams)
+
+    End Sub
+
+    Public Shared Sub DoListDeleteMulti(ByVal sMonitorIDs As List(Of String), Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+        Dim iCounter As Integer
+
+        sSQL = "DELETE FROM gametags "
+        sSQL &= "WHERE MonitorID IN ("
+
+        For Each s As String In sMonitorIDs
+            sSQL &= "@MonitorID" & iCounter & ","
+            hshParams.Add("MonitorID" & iCounter, s)
+            iCounter += 1
+        Next
+
+        sSQL = sSQL.TrimEnd(",")
+        sSQL &= ");"
+
+        sSQL &= "DELETE FROM monitorlist "
+        sSQL &= "WHERE MonitorID IN ("
+
+        For Each s As String In sMonitorIDs
+            sSQL &= "@MonitorID" & iCounter & ","
+            hshParams.Add("MonitorID" & iCounter, s)
+            iCounter += 1
+        Next
+
+        sSQL = sSQL.TrimEnd(",")
+        sSQL &= ");"
+
+        oDatabase.RunParamQuery(sSQL, hshParams)
+    End Sub
+
+    Public Shared Function DoListGetbyID(ByVal iMonitorID As Integer, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As clsGame
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim oData As DataSet
+        Dim oGame As New clsGame
+        Dim hshParams As New Hashtable
+
+        sSQL = "SELECT * from monitorlist "
+        sSQL &= "WHERE MonitorID = @MonitorID"
+
+        hshParams.Add("MonitorID", iMonitorID)
+
+        oData = oDatabase.ReadParamData(sSQL, hshParams)
+
+        For Each dr As DataRow In oData.Tables(0).Rows
+            oGame = MapToObject(dr)
+        Next
+
+        Return oGame
+    End Function
+
+    Public Shared Function DoListGetbyName(ByVal sName As String, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As Hashtable
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim oData As DataSet
+        Dim oGame As New clsGame
+        Dim hshGames As New Hashtable
+        Dim hshParams As New Hashtable
+        Dim iCounter As Integer = 0
+
+        sSQL = "SELECT * from monitorlist "
+        sSQL &= "WHERE Name = @Name"
+
+        hshParams.Add("Name", sName)
+
+        oData = oDatabase.ReadParamData(sSQL, hshParams)
+
+        For Each dr As DataRow In oData.Tables(0).Rows
+            oGame = MapToObject(dr)
+            hshGames.Add(iCounter, oGame)
+            iCounter += 1
+        Next
+
+        Return hshGames
+    End Function
+
+    Public Shared Function DoDuplicateListCheck(ByVal sName As String, ByVal sProcess As String, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local, Optional ByVal sExcludeID As String = "") As Boolean
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim oData As DataSet
+        Dim hshParams As New Hashtable
+
+        sSQL = "SELECT * FROM monitorlist WHERE Name = @Name AND Process= @Process"
+
+        hshParams.Add("Name", sName)
+        hshParams.Add("Process", sProcess)
+
+        If sExcludeID <> String.Empty Then
+            sSQL &= " AND MonitorID <> @MonitorID"
+            hshParams.Add("MonitorID", sExcludeID)
+        End If
+
+        oData = oDatabase.ReadParamData(sSQL, hshParams)
+
+        If oData.Tables(0).Rows.Count > 0 Then
+            Return True
+        Else
+            Return False
+        End If
+    End Function
+
+    'Sync Functions
     Public Shared Sub DoListAddUpdateSync(ByVal hshGames As Hashtable, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local,
                                           Optional ByVal eSyncFields As clsGame.eOptionalSyncFields = clsGame.eOptionalSyncFields.None)
         Dim oDatabase As New mgrSQLite(iSelectDB)
@@ -75,6 +279,7 @@ Public Class mgrMonitorList
         Dim sCompany As String
         Dim sMonitorGame As String
         Dim sTimeStamp As String
+        Dim sBackupLimit As String
 
         'Setup SQL for optional fields
         If (eSyncFields And clsGame.eOptionalSyncFields.Company) = clsGame.eOptionalSyncFields.Company Then
@@ -99,8 +304,10 @@ Public Class mgrMonitorList
         End If
         If (eSyncFields And clsGame.eOptionalSyncFields.TimeStamp) = clsGame.eOptionalSyncFields.TimeStamp Then
             sTimeStamp = "@TimeStamp"
+            sBackupLimit = "@BackupLimit"
         Else
             sTimeStamp = "COALESCE((SELECT TimeStamp FROM monitorlist WHERE MonitorID=@ID),0)"
+            sBackupLimit = "COALESCE((SELECT BackupLimit FROM monitorlist WHERE MonitorID=@ID),2)"
         End If
         If (eSyncFields And clsGame.eOptionalSyncFields.Version) = clsGame.eOptionalSyncFields.Version Then
             sVersion = "@Version"
@@ -108,11 +315,11 @@ Public Class mgrMonitorList
             sVersion = "(SELECT Version FROM monitorlist WHERE MonitorID=@ID)"
         End If
 
-        sSQL = "INSERT OR REPLACE INTO monitorlist (MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly) "
+        sSQL = "INSERT OR REPLACE INTO monitorlist (MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit) "
         sSQL &= "VALUES (@ID, @Name, @Process, @Path, @AbsolutePath, @FolderSave, @FileType, "
         sSQL &= sTimeStamp & ", @ExcludeList, " & sGamePath & ", "
         sSQL &= sIcon & ", @Hours, " & sVersion & ", "
-        sSQL &= sCompany & ", " & sMonitorGame & ", @MonitorOnly);"
+        sSQL &= sCompany & ", " & sMonitorGame & ", @MonitorOnly, " & sBackupLimit & ");"
 
         For Each oGame As clsGame In hshGames.Values
             hshParams = New Hashtable
@@ -144,6 +351,7 @@ Public Class mgrMonitorList
             End If
             If (eSyncFields And clsGame.eOptionalSyncFields.TimeStamp) = clsGame.eOptionalSyncFields.TimeStamp Then
                 hshParams.Add("TimeStamp", oGame.AppendTimeStamp)
+                hshParams.Add("BackupLimit", oGame.BackupLimit)
             End If
             If (eSyncFields And clsGame.eOptionalSyncFields.Version) = clsGame.eOptionalSyncFields.Version Then
                 hshParams.Add("Version", oGame.Version)
@@ -256,6 +464,145 @@ Public Class mgrMonitorList
         Application.DoEvents()
     End Sub
 
+    'Filter Functions
+    Private Shared Function BuildFilterQuery(ByVal oTagFilters As List(Of clsTag), ByVal hshStringFilters As Hashtable, eFilterType As frmFilter.eFilterType, ByRef hshParams As Hashtable) As String
+        Dim sSQL As String = String.Empty
+        Dim iCounter As Integer = 0
+
+        Select Case eFilterType
+            Case frmFilter.eFilterType.NoFilter
+                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit FROM monitorlist ORDER BY Name Asc"
+            Case frmFilter.eFilterType.FieldAnd, frmFilter.eFilterType.FieldOr
+                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit FROM monitorlist"
+
+                If hshStringFilters.Count > 0 Then
+                    sSQL &= " WHERE ("
+                    For Each de As DictionaryEntry In hshStringFilters
+                        sSQL &= de.Key & " LIKE @" & de.Key
+                        hshParams.Add(de.Key, "%" & de.Value.ToString & "%")
+                        iCounter += 1
+                        If iCounter <> hshStringFilters.Count Then
+                            Select Case eFilterType
+                                Case frmFilter.eFilterType.FieldAnd
+                                    sSQL &= " AND "
+                                Case frmFilter.eFilterType.FieldOr
+                                    sSQL &= " OR "
+                            End Select
+                        End If
+
+                    Next
+                    sSQL &= ")"
+                End If
+                sSQL &= " ORDER BY Name Asc"
+            Case frmFilter.eFilterType.AnyTag
+                sSQL = "SELECT DISTINCT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit FROM monitorlist "
+                sSQL &= "NATURAL JOIN gametags WHERE gametags.TagID IN ("
+
+                For Each oTag As clsTag In oTagFilters
+                    sSQL &= "@TagID" & iCounter & ","
+                    hshParams.Add("TagID" & iCounter, oTag.ID)
+                    iCounter += 1
+                Next
+
+                sSQL = sSQL.TrimEnd(",")
+                sSQL &= ") ORDER BY Name Asc"
+            Case frmFilter.eFilterType.AllTags
+                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit FROM monitorlist WHERE MonitorID IN "
+
+                For Each oTag As clsTag In oTagFilters
+                    sSQL &= "(SELECT MonitorID FROM gametags WHERE monitorlist.MonitorID = gametags.MonitorID And TagID = @TagID" & iCounter & ")"
+                    If iCounter <> oTagFilters.Count - 1 Then
+                        sSQL &= " AND MonitorID IN "
+                    End If
+                    hshParams.Add("TagID" & iCounter, oTag.ID)
+                    iCounter += 1
+                Next
+
+                sSQL &= " ORDER BY Name Asc"
+            Case frmFilter.eFilterType.NoTags
+                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit FROM monitorlist WHERE MonitorID NOT IN (SELECT MonitorID FROM gametags) ORDER BY Name Asc"
+        End Select
+
+        Return sSQL
+
+    End Function
+
+    Public Shared Function ReadFilteredList(ByVal oTagFilters As List(Of clsTag), ByVal hshStringFilters As Hashtable, eFilterType As frmFilter.eFilterType, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As Hashtable
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim oData As DataSet
+        Dim sSQL As String = String.Empty
+        Dim hshList As New Hashtable
+        Dim oGame As clsGame
+        Dim hshParams As New Hashtable
+        Dim iCounter As Integer = 0
+
+        sSQL = BuildFilterQuery(oTagFilters, hshStringFilters, eFilterType, hshParams)
+
+        oData = oDatabase.ReadParamData(sSQL, hshParams)
+
+        For Each dr As DataRow In oData.Tables(0).Rows
+            oGame = MapToObject(dr)
+
+            hshList.Add(oGame.ID, oGame)
+        Next
+
+        Return hshList
+    End Function
+
+
+    'Import / Export Functions
+    Public Shared Function ReadListForExport(ByVal oTagFilters As List(Of clsTag), ByVal hshStringFilters As Hashtable, ByVal eFilterType As frmFilter.eFilterType, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As List(Of Game)
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim oData As DataSet
+        Dim sSQL As String = String.Empty
+        Dim sID As String
+        Dim oList As New List(Of Game)
+        Dim oGame As Game
+        Dim hshParams As New Hashtable
+
+        sSQL = BuildFilterQuery(oTagFilters, hshStringFilters, eFilterType, hshParams)
+
+        oData = oDatabase.ReadParamData(sSQL, hshParams)
+
+        For Each dr As DataRow In oData.Tables(0).Rows
+            oGame = New Game
+            sID = CStr(dr("MonitorID"))
+            oGame.Name = CStr(dr("Name"))
+            oGame.ProcessName = CStr(dr("Process"))
+            If Not IsDBNull(dr("Path")) Then oGame.Path = CStr(dr("Path"))
+            oGame.AbsolutePath = CBool(dr("AbsolutePath"))
+            oGame.FolderSave = CBool(dr("FolderSave"))
+            If Not IsDBNull(dr("FileType")) Then oGame.FileType = CStr(dr("FileType"))
+            If Not IsDBNull(dr("ExcludeList")) Then oGame.ExcludeList = CStr(dr("ExcludeList"))
+            oGame.Tags = mgrGameTags.GetTagsByGameForExport(sID)
+            oList.Add(oGame)
+        Next
+
+        Return oList
+    End Function
+
+    Public Shared Function DoImport(ByVal sPath As String) As Boolean
+        If (sPath.IndexOf("http://", 0, StringComparison.CurrentCultureIgnoreCase) > -1) Or
+               (sPath.IndexOf("https://", 0, StringComparison.CurrentCultureIgnoreCase) > -1) Then
+            If mgrCommon.CheckAddress(sPath) Then
+                ImportMonitorList(sPath, True)
+                Return True
+            Else
+                mgrCommon.ShowMessage(mgrMonitorList_WebNoReponse, sPath, MsgBoxStyle.Exclamation)
+                Return False
+            End If
+        Else
+            If File.Exists(sPath) Then
+                ImportMonitorList(sPath)
+                Return True
+            Else
+                mgrCommon.ShowMessage(mgrMonitorList_FileNotFound, sPath, MsgBoxStyle.Exclamation)
+                Return False
+            End If
+        End If
+        Return True
+    End Function
+
     Private Shared Sub ImportMonitorList(ByVal sLocation As String, Optional ByVal bWebRead As Boolean = False)
         Dim hshCompareFrom As Hashtable
         Dim hshCompareTo As Hashtable
@@ -301,441 +648,55 @@ Public Class mgrMonitorList
         Application.DoEvents()
     End Sub
 
-    Public Shared Function DoImport(ByVal sPath As String) As Boolean
+    Public Shared Sub ExportMonitorList(ByVal sLocation As String)
-        If (sPath.IndexOf("http://", 0, StringComparison.CurrentCultureIgnoreCase) > -1) Or _
+        Dim oList As List(Of Game)
-               (sPath.IndexOf("https://", 0, StringComparison.CurrentCultureIgnoreCase) > -1) Then
+        Dim bSuccess As Boolean = False
-            If mgrCommon.CheckAddress(sPath) Then
+        Dim oTagFilters As New List(Of clsTag)
-                ImportMonitorList(sPath, True)
+        Dim oStringFilters As New Hashtable
-                Return True
+        Dim eCurrentFilter As frmFilter.eFilterType = frmFilter.eFilterType.NoFilter
+
+        If mgrCommon.ShowMessage(mgrMonitorList_ConfirmApplyFilter, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+            Dim frm As New frmFilter
+            frm.ShowDialog()
+            oTagFilters = frm.TagFilters
+            oStringFilters = frm.StringFilters
+            eCurrentFilter = frm.FilterType
+        End If
+
+        oList = ReadListForExport(oTagFilters, oStringFilters, eCurrentFilter)
+
+        bSuccess = mgrXML.SerializeAndExport(oList, sLocation)
+
+        If bSuccess Then
+            mgrCommon.ShowMessage(mgrMonitorList_ExportComplete, oList.Count, MsgBoxStyle.Information)
+        End If
+    End Sub
+
+    'Other Functions
+    Public Shared Sub HandleBackupLocationChange(ByVal oSettings As mgrSettings)
+        Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Remote)
+        Dim iGameCount As Integer
+
+        'Check if a remote database already exists in the new backup location
+        If oDatabase.CheckDB() Then
+            'Make sure database is the latest version
+            oDatabase.DatabaseUpgrade()
+
+            'See if the remote database is empty
+            iGameCount = mgrMonitorList.ReadList(eListTypes.FullList, mgrSQLite.Database.Remote).Count
+
+            'If the remote database actually contains a list, then ask what to do
+            If iGameCount > 0 Then
+                If mgrCommon.ShowMessage(mgrMonitorList_ConfirmExistingData, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+                    mgrMonitorList.SyncMonitorLists(oSettings.SyncFields)
                 Else
-                mgrCommon.ShowMessage(mgrMonitorList_WebNoReponse, sPath, MsgBoxStyle.Exclamation)
+                    mgrMonitorList.SyncMonitorLists(oSettings.SyncFields, False)
-                Return False
                 End If
             Else
-            If File.Exists(sPath) Then
+                mgrMonitorList.SyncMonitorLists(oSettings.SyncFields)
-                ImportMonitorList(sPath)
+            End If
-                Return True
         Else
-                mgrCommon.ShowMessage(mgrMonitorList_FileNotFound, sPath, MsgBoxStyle.Exclamation)
+            mgrMonitorList.SyncMonitorLists(oSettings.SyncFields)
-                Return False
         End If
-        End If
-        Return True
-    End Function
-
-    Private Shared Function BuildFilterQuery(ByVal oTagFilters As List(Of clsTag), ByVal hshStringFilters As Hashtable, eFilterType As frmFilter.eFilterType, ByRef hshParams As Hashtable) As String
-        Dim sSQL As String = String.Empty
-        Dim iCounter As Integer = 0
-
-        Select Case eFilterType
-            Case frmFilter.eFilterType.NoFilter
-                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly FROM monitorlist ORDER BY Name Asc"
-            Case frmFilter.eFilterType.FieldAnd, frmFilter.eFilterType.FieldOr
-                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly FROM monitorlist"
-
-                If hshStringFilters.Count > 0 Then
-                    sSQL &= " WHERE ("
-                    For Each de As DictionaryEntry In hshStringFilters
-                        sSQL &= de.Key & " LIKE @" & de.Key
-                        hshParams.Add(de.Key, "%" & de.Value.ToString & "%")
-                        iCounter += 1
-                        If iCounter <> hshStringFilters.Count Then
-                            Select Case eFilterType
-                                Case frmFilter.eFilterType.FieldAnd
-                                    sSQL &= " AND "
-                                Case frmFilter.eFilterType.FieldOr
-                                    sSQL &= " OR "
-                            End Select
-                        End If
-
-                    Next
-                    sSQL &= ")"
-                End If
-                sSQL &= " ORDER BY Name Asc"
-            Case frmFilter.eFilterType.AnyTag
-                sSQL = "SELECT DISTINCT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly FROM monitorlist "
-                sSQL &= "NATURAL JOIN gametags WHERE gametags.TagID IN ("
-
-                For Each oTag As clsTag In oTagFilters
-                    sSQL &= "@TagID" & iCounter & ","
-                    hshParams.Add("TagID" & iCounter, oTag.ID)
-                    iCounter += 1
-                Next
-
-                sSQL = sSQL.TrimEnd(",")
-                sSQL &= ") ORDER BY Name Asc"
-            Case frmFilter.eFilterType.AllTags
-                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly FROM monitorlist WHERE MonitorID IN "
-
-                For Each oTag As clsTag In oTagFilters
-                    sSQL &= "(SELECT MonitorID FROM gametags WHERE monitorlist.MonitorID = gametags.MonitorID And TagID = @TagID" & iCounter & ")"
-                    If iCounter <> oTagFilters.Count - 1 Then
-                        sSQL &= " AND MonitorID IN "
-                    End If
-                    hshParams.Add("TagID" & iCounter, oTag.ID)
-                    iCounter += 1
-                Next
-
-                sSQL &= " ORDER BY Name Asc"
-            Case frmFilter.eFilterType.NoTags
-                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly FROM monitorlist WHERE MonitorID NOT IN (SELECT MonitorID FROM gametags) ORDER BY Name Asc"
-        End Select
-
-        Return sSQL
-
-    End Function
-
-    Public Shared Function ReadFilteredList(ByVal oTagFilters As List(Of clsTag), ByVal hshStringFilters As Hashtable, eFilterType As frmFilter.eFilterType, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As Hashtable
-        Dim oDatabase As New mgrSQLite(iSelectDB)
-        Dim oData As DataSet
-        Dim sSQL As String = String.Empty
-        Dim hshList As New Hashtable
-        Dim oGame As clsGame
-        Dim hshParams As New Hashtable
-        Dim iCounter As Integer = 0
-
-        sSQL = BuildFilterQuery(oTagFilters, hshStringFilters, eFilterType, hshParams)
-
-        oData = oDatabase.ReadParamData(sSQL, hshParams)
-
-        For Each dr As DataRow In oData.Tables(0).Rows
-            oGame = New clsGame
-            oGame.ID = CStr(dr("MonitorID"))
-            oGame.Name = CStr(dr("Name"))
-            oGame.ProcessName = CStr(dr("Process"))
-            If Not IsDBNull(dr("Path")) Then oGame.Path = CStr(dr("Path"))
-            oGame.AbsolutePath = CBool(dr("AbsolutePath"))
-            oGame.FolderSave = CBool(dr("FolderSave"))
-            If Not IsDBNull(dr("FileType")) Then oGame.FileType = CStr(dr("FileType"))
-            oGame.AppendTimeStamp = CBool(dr("TimeStamp"))
-            If Not IsDBNull(dr("ExcludeList")) Then oGame.ExcludeList = CStr(dr("ExcludeList"))
-            If Not IsDBNull(dr("ProcessPath")) Then oGame.ProcessPath = CStr(dr("ProcessPath"))
-            If Not IsDBNull(dr("Icon")) Then oGame.Icon = CStr(dr("Icon"))
-            oGame.Hours = CDbl(dr("Hours"))
-            If Not IsDBNull(dr("Version")) Then oGame.Version = CStr(dr("Version"))
-            If Not IsDBNull(dr("Company")) Then oGame.Company = CStr(dr("Company"))
-            oGame.Enabled = CBool(dr("Enabled"))
-            oGame.MonitorOnly = CBool(dr("MonitorOnly"))
-
-            hshList.Add(oGame.ID, oGame)
-        Next
-
-        Return hshList
-    End Function
-
-    Public Shared Function ReadListForExport(ByVal oTagFilters As List(Of clsTag), ByVal hshStringFilters As Hashtable, ByVal eFilterType As frmFilter.eFilterType, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As List(Of Game)
-        Dim oDatabase As New mgrSQLite(iSelectDB)
-        Dim oData As DataSet
-        Dim sSQL As String = String.Empty
-        Dim sID As String
-        Dim oList As New List(Of Game)
-        Dim oGame As Game
-        Dim hshParams As New Hashtable
-
-        sSQL = BuildFilterQuery(oTagFilters, hshStringFilters, eFilterType, hshParams)
-
-        oData = oDatabase.ReadParamData(sSQL, hshParams)
-
-        For Each dr As DataRow In oData.Tables(0).Rows
-            oGame = New Game
-            sID = CStr(dr("MonitorID"))
-            oGame.Name = CStr(dr("Name"))
-            oGame.ProcessName = CStr(dr("Process"))
-            If Not IsDBNull(dr("Path")) Then oGame.Path = CStr(dr("Path"))
-            oGame.AbsolutePath = CBool(dr("AbsolutePath"))
-            oGame.FolderSave = CBool(dr("FolderSave"))
-            If Not IsDBNull(dr("FileType")) Then oGame.FileType = CStr(dr("FileType"))
-            If Not IsDBNull(dr("ExcludeList")) Then oGame.ExcludeList = CStr(dr("ExcludeList"))
-            oGame.Tags = mgrGameTags.GetTagsByGameForExport(sID)
-            oList.Add(oGame)
-        Next
-
-        Return oList
-    End Function
-
-    Public Shared Function ReadList(ByVal eListType As eListTypes, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As Hashtable
-        Dim oDatabase As New mgrSQLite(iSelectDB)
-        Dim oData As DataSet
-        Dim sSQL As String
-        Dim hshList As New Hashtable
-        Dim hshDupeList As New Hashtable
-        Dim oGame As clsGame
-
-        sSQL = "Select * from monitorlist ORDER BY Name Asc"
-        oData = oDatabase.ReadParamData(sSQL, New Hashtable)
-
-        For Each dr As DataRow In oData.Tables(0).Rows
-            oGame = New clsGame
-            oGame.ID = CStr(dr("MonitorID"))
-            oGame.Name = CStr(dr("Name"))
-            oGame.ProcessName = CStr(dr("Process"))
-            If Not IsDBNull(dr("Path")) Then oGame.Path = CStr(dr("Path"))
-            oGame.AbsolutePath = CBool(dr("AbsolutePath"))
-            oGame.FolderSave = CBool(dr("FolderSave"))
-            If Not IsDBNull(dr("FileType")) Then oGame.FileType = CStr(dr("FileType"))
-            oGame.AppendTimeStamp = CBool(dr("TimeStamp"))
-            If Not IsDBNull(dr("ExcludeList")) Then oGame.ExcludeList = CStr(dr("ExcludeList"))
-            If Not IsDBNull(dr("ProcessPath")) Then oGame.ProcessPath = CStr(dr("ProcessPath"))
-            If Not IsDBNull(dr("Icon")) Then oGame.Icon = CStr(dr("Icon"))
-            oGame.Hours = CDbl(dr("Hours"))
-            If Not IsDBNull(dr("Version")) Then oGame.Version = CStr(dr("Version"))
-            If Not IsDBNull(dr("Company")) Then oGame.Company = CStr(dr("Company"))
-            oGame.Enabled = CBool(dr("Enabled"))
-            oGame.MonitorOnly = CBool(dr("MonitorOnly"))
-
-            Select Case eListType
-                Case eListTypes.FullList
-                    'Don't wrap this, if it fails there's a problem with the database
-                    hshList.Add(oGame.ProcessName & ":" & oGame.Name, oGame)
-                Case eListTypes.ScanList
-                    If hshList.Contains(oGame.ProcessName) Then
-                        DirectCast(hshList.Item(oGame.ProcessName), clsGame).Duplicate = True
-                        oGame.ProcessName = oGame.ProcessName & ":" & oGame.Name
-                        oGame.Duplicate = True
-                    End If
-                    If oGame.Enabled Then hshList.Add(oGame.ProcessName, oGame)
-            End Select
-        Next
-
-        Return hshList
-    End Function
-
-    Public Shared Sub DoListAdd(ByVal oGame As clsGame, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
-        Dim oDatabase As New mgrSQLite(iSelectDB)
-        Dim sSQL As String
-        Dim hshParams As New Hashtable
-
-        sSQL = "INSERT INTO monitorlist VALUES (@ID, @Name, @Process, @Path, @AbsolutePath, @FolderSave, @FileType, @TimeStamp, "
-        sSQL &= "@ExcludeList, @ProcessPath, @Icon, @Hours, @Version, @Company, @Enabled, @MonitorOnly)"
-
-        'Parameters
-        hshParams.Add("ID", oGame.ID)
-        hshParams.Add("Name", oGame.Name)
-        hshParams.Add("Process", oGame.TrueProcess)
-        hshParams.Add("Path", oGame.TruePath)
-        hshParams.Add("AbsolutePath", oGame.AbsolutePath)
-        hshParams.Add("FolderSave", oGame.FolderSave)
-        hshParams.Add("FileType", oGame.FileType)
-        hshParams.Add("TimeStamp", oGame.AppendTimeStamp)
-        hshParams.Add("ExcludeList", oGame.ExcludeList)
-        hshParams.Add("ProcessPath", oGame.ProcessPath)
-        hshParams.Add("Icon", oGame.Icon)
-        hshParams.Add("Hours", oGame.Hours)
-        hshParams.Add("Version", oGame.Version)
-        hshParams.Add("Company", oGame.Company)
-        hshParams.Add("Enabled", oGame.Enabled)
-        hshParams.Add("MonitorOnly", oGame.MonitorOnly)
-
-        oDatabase.RunParamQuery(sSQL, hshParams)
-
     End Sub
-
-    Public Shared Sub DoListUpdate(ByVal oGame As clsGame, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
-        Dim oDatabase As New mgrSQLite(iSelectDB)
-        Dim sSQL As String
-        Dim hshParams As New Hashtable
-
-        sSQL = "UPDATE monitorlist SET Name=@Name, Process=@Process, Path=@Path, AbsolutePath=@AbsolutePath, FolderSave=@FolderSave, "
-        sSQL &= "FileType=@FileType, TimeStamp=@TimeStamp, ExcludeList=@ExcludeList, ProcessPath=@ProcessPath, Icon=@Icon, "
-        sSQL &= "Hours=@Hours, Version=@Version, Company=@Company, Enabled=@Enabled, MonitorOnly=@MonitorOnly WHERE MonitorID=@ID"
-
-        'Parameters
-        hshParams.Add("Name", oGame.Name)
-        hshParams.Add("Process", oGame.TrueProcess)
-        hshParams.Add("Path", oGame.TruePath)
-        hshParams.Add("AbsolutePath", oGame.AbsolutePath)
-        hshParams.Add("FolderSave", oGame.FolderSave)
-        hshParams.Add("FileType", oGame.FileType)
-        hshParams.Add("TimeStamp", oGame.AppendTimeStamp)
-        hshParams.Add("ExcludeList", oGame.ExcludeList)
-        hshParams.Add("ProcessPath", oGame.ProcessPath)
-        hshParams.Add("Icon", oGame.Icon)
-        hshParams.Add("Hours", oGame.Hours)
-        hshParams.Add("Version", oGame.Version)
-        hshParams.Add("Company", oGame.Company)
-        hshParams.Add("Enabled", oGame.Enabled)
-        hshParams.Add("MonitorOnly", oGame.MonitorOnly)
-        hshParams.Add("ID", oGame.ID)
-
-        oDatabase.RunParamQuery(sSQL, hshParams)
-
-    End Sub
-
-    Public Shared Sub DoListUpdateMulti(ByVal sMonitorIDs As List(Of String), ByVal oGame As clsGame, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
-        Dim oDatabase As New mgrSQLite(iSelectDB)
-        Dim sSQL As String
-        Dim hshParams As New Hashtable
-        Dim iCounter As Integer
-
-        sSQL = "UPDATE monitorlist SET Enabled=@Enabled, MonitorOnly=@MonitorOnly WHERE MonitorID IN ("
-
-        'Parameters
-        hshParams.Add("Enabled", oGame.Enabled)
-        hshParams.Add("MonitorOnly", oGame.MonitorOnly)
-
-        For Each s As String In sMonitorIDs
-            sSQL &= "@MonitorID" & iCounter & ","
-            hshParams.Add("MonitorID" & iCounter, s)
-            iCounter += 1
-        Next
-
-        sSQL = sSQL.TrimEnd(",")
-        sSQL &= ")"
-
-        oDatabase.RunParamQuery(sSQL, hshParams)
-
-    End Sub
-
-    Public Shared Sub DoListDelete(ByVal sMonitorID As String, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
-        Dim oDatabase As New mgrSQLite(iSelectDB)
-        Dim sSQL As String
-        Dim hshParams As New Hashtable
-
-        sSQL = "DELETE FROM gametags "
-        sSQL &= "WHERE MonitorID = @MonitorID;"
-        sSQL &= "DELETE FROM monitorlist "
-        sSQL &= "WHERE MonitorID = @MonitorID;"
-
-        hshParams.Add("MonitorID", sMonitorID)
-
-        oDatabase.RunParamQuery(sSQL, hshParams)
-
-    End Sub
-
-    Public Shared Sub DoListDeleteMulti(ByVal sMonitorIDs As List(Of String), Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
-        Dim oDatabase As New mgrSQLite(iSelectDB)
-        Dim sSQL As String
-        Dim hshParams As New Hashtable
-        Dim iCounter As Integer
-
-        sSQL = "DELETE FROM gametags "
-        sSQL &= "WHERE MonitorID IN ("
-
-        For Each s As String In sMonitorIDs
-            sSQL &= "@MonitorID" & iCounter & ","
-            hshParams.Add("MonitorID" & iCounter, s)
-            iCounter += 1
-        Next
-
-        sSQL = sSQL.TrimEnd(",")
-        sSQL &= ");"
-
-        sSQL &= "DELETE FROM monitorlist "
-        sSQL &= "WHERE MonitorID IN ("
-
-        For Each s As String In sMonitorIDs
-            sSQL &= "@MonitorID" & iCounter & ","
-            hshParams.Add("MonitorID" & iCounter, s)
-            iCounter += 1
-        Next
-
-        sSQL = sSQL.TrimEnd(",")
-        sSQL &= ");"
-
-        oDatabase.RunParamQuery(sSQL, hshParams)
-    End Sub
-
-    Public Shared Function DoListGetbyID(ByVal iMonitorID As Integer, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As clsGame
-        Dim oDatabase As New mgrSQLite(iSelectDB)
-        Dim sSQL As String
-        Dim oData As DataSet
-        Dim oGame As New clsGame
-        Dim hshParams As New Hashtable
-
-        sSQL = "SELECT * from monitorlist "
-        sSQL &= "WHERE MonitorID = @MonitorID"
-
-        hshParams.Add("MonitorID", iMonitorID)
-
-        oData = oDatabase.ReadParamData(sSQL, hshParams)
-
-        For Each dr As DataRow In oData.Tables(0).Rows
-            oGame = New clsGame
-            oGame.ID = CStr(dr("MonitorID"))
-            oGame.Name = CStr(dr("Name"))
-            oGame.ProcessName = CStr(dr("Process"))
-            If Not IsDBNull(dr("Path")) Then oGame.Path = CStr(dr("Path"))
-            oGame.AbsolutePath = CBool(dr("AbsolutePath"))
-            oGame.FolderSave = CBool(dr("FolderSave"))
-            If Not IsDBNull(dr("FileType")) Then oGame.FileType = CStr(dr("FileType"))
-            oGame.AppendTimeStamp = CBool(dr("TimeStamp"))
-            If Not IsDBNull(dr("ExcludeList")) Then oGame.ExcludeList = CStr(dr("ExcludeList"))
-            If Not IsDBNull(dr("ProcessPath")) Then oGame.ProcessPath = CStr(dr("ProcessPath"))
-            If Not IsDBNull(dr("Icon")) Then oGame.Icon = CStr(dr("Icon"))
-            oGame.Hours = CDbl(dr("Hours"))
-            If Not IsDBNull(dr("Version")) Then oGame.Version = CStr(dr("Version"))
-            If Not IsDBNull(dr("Company")) Then oGame.Company = CStr(dr("Company"))
-            oGame.Enabled = CBool(dr("Enabled"))
-            oGame.MonitorOnly = CBool(dr("MonitorOnly"))
-        Next
-
-        Return oGame
-    End Function
-
-    Public Shared Function DoListGetbyName(ByVal sName As String, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As Hashtable
-        Dim oDatabase As New mgrSQLite(iSelectDB)
-        Dim sSQL As String
-        Dim oData As DataSet
-        Dim oGame As New clsGame
-        Dim hshGames As New Hashtable
-        Dim hshParams As New Hashtable
-        Dim iCounter As Integer = 0
-
-        sSQL = "SELECT * from monitorlist "
-        sSQL &= "WHERE Name = @Name"
-
-        hshParams.Add("Name", sName)
-
-        oData = oDatabase.ReadParamData(sSQL, hshParams)
-
-        For Each dr As DataRow In oData.Tables(0).Rows
-            oGame = New clsGame
-            oGame.ID = CStr(dr("MonitorID"))
-            oGame.Name = CStr(dr("Name"))
-            oGame.ProcessName = CStr(dr("Process"))
-            If Not IsDBNull(dr("Path")) Then oGame.Path = CStr(dr("Path"))
-            oGame.AbsolutePath = CBool(dr("AbsolutePath"))
-            oGame.FolderSave = CBool(dr("FolderSave"))
-            If Not IsDBNull(dr("FileType")) Then oGame.FileType = CStr(dr("FileType"))
-            oGame.AppendTimeStamp = CBool(dr("TimeStamp"))
-            If Not IsDBNull(dr("ExcludeList")) Then oGame.ExcludeList = CStr(dr("ExcludeList"))
-            If Not IsDBNull(dr("ProcessPath")) Then oGame.ProcessPath = CStr(dr("ProcessPath"))
-            If Not IsDBNull(dr("Icon")) Then oGame.Icon = CStr(dr("Icon"))
-            oGame.Hours = CDbl(dr("Hours"))
-            If Not IsDBNull(dr("Version")) Then oGame.Version = CStr(dr("Version"))
-            If Not IsDBNull(dr("Company")) Then oGame.Company = CStr(dr("Company"))
-            oGame.Enabled = CBool(dr("Enabled"))
-            oGame.MonitorOnly = CBool(dr("MonitorOnly"))
-            hshGames.Add(iCounter, oGame)
-            iCounter += 1
-        Next
-
-        Return hshGames
-    End Function
-
-    Public Shared Function DoDuplicateListCheck(ByVal sName As String, ByVal sProcess As String, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local, Optional ByVal sExcludeID As String = "") As Boolean
-        Dim oDatabase As New mgrSQLite(iSelectDB)
-        Dim sSQL As String
-        Dim oData As DataSet
-        Dim hshParams As New Hashtable
-
-        sSQL = "SELECT * FROM monitorlist WHERE Name = @Name AND Process= @Process"
-
-        hshParams.Add("Name", sName)
-        hshParams.Add("Process", sProcess)
-
-        If sExcludeID <> String.Empty Then
-            sSQL &= " AND MonitorID <> @MonitorID"
-            hshParams.Add("MonitorID", sExcludeID)
-        End If
-
-        oData = oDatabase.ReadParamData(sSQL, hshParams)
-
-        If oData.Tables(0).Rows.Count > 0 Then
-            Return True
-        Else
-            Return False
-        End If
-    End Function
-
 End Class

GBM/Managers/mgrPath.vb

@@ -283,10 +283,10 @@ Public Class mgrPath
 
         hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData))
         hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData))
+        hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
 
         'Don't use these in Unix
         If Not mgrCommon.IsUnix Then
-            hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
             hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments))
             hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.UserProfile))
         End If

GBM/Managers/mgrProcesses.vb

@@ -130,9 +130,9 @@ Public Class mgrProcesses
 
                 'Unix Handler
                 'We need some special handling for Wine processes
-                If mgrCommon.IsUnix And sProcessCheck.ToLower = "wine-preloader" Then
+                If mgrCommon.IsUnix And (sProcessCheck.ToLower = "wine-preloader" Or sProcessCheck.ToLower = "wine64-preloader") Then
                     Dim sWinePath As String()
-                    'We can't use Path.GetFileName here, Wine uses the Windows seperator in arguments and the Unix version of the function expects a different one.
+                    'We can't use Path.GetFileName here, Wine uses the Windows seperator in arguments and Mono expects a different one in Unix.
                     sWinePath = GetUnixProcessArguments(prsCurrent)(0).Split("\")
                     sProcessCheck = sWinePath(sWinePath.Length - 1).Replace(".exe", "")
                     bWineProcess = True

GBM/Managers/mgrRestore.vb

@@ -80,8 +80,8 @@ Public Class mgrRestore
         Dim bLocal As Boolean = False
         Dim bRemote As Boolean = False
 
-        slLocalManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Local)
+        slLocalManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local)
-        slRemoteManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Remote)
+        slRemoteManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Remote)
 
         If slLocalManifest.Contains(sAppName) Then
             oLocalItem = DirectCast(slLocalManifest(sAppName), clsBackup)
@@ -117,8 +117,8 @@ Public Class mgrRestore
         Dim bLocal As Boolean = False
         Dim bRemote As Boolean = False
 
-        slLocalManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Local)
+        slLocalManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local)
-        slRemoteManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Remote)
+        slRemoteManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Remote)
 
         For Each oItem As clsBackup In slRemoteManifest.Values
             If slLocalManifest.Contains(oItem.Name) Then
@@ -148,13 +148,13 @@ Public Class mgrRestore
         Dim slRemoteManifest As SortedList
         Dim slRemovedItems As New SortedList
 
-        slLocalManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Local)
+        slLocalManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local)
-        slRemoteManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Remote)
+        slRemoteManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Remote)
 
         For Each oItem As clsBackup In slLocalManifest.Values
             If Not slRemoteManifest.Contains(oItem.Name) Then
                 slRemovedItems.Add(oItem.Name, oItem)
-                mgrManifest.DoManifestDelete(oItem, mgrSQLite.Database.Local)
+                mgrManifest.DoManifestDeletebyName(oItem, mgrSQLite.Database.Local)
             End If
         Next
 
@@ -268,8 +268,8 @@ Public Class mgrRestore
 
                 If bRestoreCompleted Then
                     'Save Local Manifest
-                    If mgrManifest.DoManifestCheck(oBackupInfo.Name, mgrSQLite.Database.Local) Then
+                    If mgrManifest.DoGlobalManifestCheck(oBackupInfo.Name, mgrSQLite.Database.Local) Then
-                        mgrManifest.DoManifestUpdate(oBackupInfo, mgrSQLite.Database.Local)
+                        mgrManifest.DoManifestUpdateByName(oBackupInfo, mgrSQLite.Database.Local)
                     Else
                         mgrManifest.DoManifestAdd(oBackupInfo, mgrSQLite.Database.Local)
                     End If

GBM/Managers/mgrSQLite.vb

@@ -80,7 +80,7 @@ Public Class mgrSQLite
             sSql &= "CREATE TABLE monitorlist (MonitorID TEXT NOT NULL UNIQUE, Name TEXT NOT NULL, Process TEXT NOT NULL, Path TEXT, " &
                    "AbsolutePath BOOLEAN NOT NULL, FolderSave BOOLEAN NOT NULL, FileType TEXT, TimeStamp BOOLEAN NOT NULL, ExcludeList TEXT NOT NULL, " &
                    "ProcessPath TEXT, Icon TEXT, Hours REAL, Version TEXT, Company TEXT, Enabled BOOLEAN NOT NULL, MonitorOnly BOOLEAN NOT NULL, " &
-                   "PRIMARY KEY(Name, Process));"
+                   "BackupLimit INTEGER NOT NULL, PRIMARY KEY(Name, Process));"
 
             'Add Tables (Tags)
             sSql &= "CREATE TABLE tags (TagID TEXT NOT NULL UNIQUE, Name TEXT NOT NULL PRIMARY KEY); "
@@ -92,7 +92,7 @@ Public Class mgrSQLite
             sSql &= "CREATE TABLE variables (VariableID TEXT NOT NULL UNIQUE, Name TEXT NOT NULL PRIMARY KEY, Path TEXT NOT NULL);"
 
             'Add Tables (Local Manifest)
-            sSql &= "CREATE TABLE manifest (ManifestID TEXT NOT NULL UNIQUE, Name TEXT NOT NULL PRIMARY KEY, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, " &
+            sSql &= "CREATE TABLE manifest (ManifestID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, " &
                    "AbsolutePath BOOLEAN NOT NULL, DateUpdated TEXT NOT NULL, UpdatedBy TEXT NOT NULL, CheckSum TEXT);"
 
             'Set Version
@@ -111,16 +111,16 @@ Public Class mgrSQLite
 
         Try
             'Create the DB
-            SQLiteConnection.CreateFile(sDatabaseLocation)
+            SqliteConnection.CreateFile(sDatabaseLocation)
 
             'Add Tables (Remote Monitor List)
             sSql = "CREATE TABLE monitorlist (MonitorID TEXT NOT NULL UNIQUE, Name TEXT NOT NULL, Process TEXT NOT NULL, Path TEXT, " &
                    "AbsolutePath BOOLEAN NOT NULL, FolderSave BOOLEAN NOT NULL, FileType TEXT, TimeStamp BOOLEAN NOT NULL, ExcludeList TEXT NOT NULL, " &
                    "ProcessPath TEXT, Icon TEXT, Hours REAL, Version TEXT, Company TEXT, Enabled BOOLEAN NOT NULL, MonitorOnly BOOLEAN NOT NULL, " &
-                   "PRIMARY KEY(Name, Process));"
+                   "BackupLimit INTEGER NOT NULL, PRIMARY KEY(Name, Process));"
 
             'Add Tables (Remote Manifest)
-            sSql &= "CREATE TABLE manifest (ManifestID TEXT NOT NULL UNIQUE, Name TEXT NOT NULL PRIMARY KEY, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, " &
+            sSql &= "CREATE TABLE manifest (ManifestID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, " &
                    "AbsolutePath BOOLEAN NOT NULL, DateUpdated TEXT NOT NULL, UpdatedBy TEXT NOT NULL, CheckSum TEXT);"
 
             'Add Tables (Remote Tags)
@@ -155,7 +155,7 @@ Public Class mgrSQLite
 
     Public Sub Connect()
         If CheckDB() Then
-            db = New SQLiteConnection(sConnectString)
+            db = New SqliteConnection(sConnectString)
             db.Open()
         Else
             CreateDB()
@@ -167,18 +167,18 @@ Public Class mgrSQLite
         db.Close()
     End Sub
 
-    Private Sub BuildParams(ByRef command As SQLiteCommand, ByRef hshParams As Hashtable)
+    Private Sub BuildParams(ByRef command As SqliteCommand, ByRef hshParams As Hashtable)
         For Each de As DictionaryEntry In hshParams
             command.Parameters.AddWithValue(de.Key, de.Value)
         Next
     End Sub
 
     Public Function RunParamQuery(ByVal sSQL As String, ByVal hshParams As Hashtable) As Boolean
-        Dim trans As SQLiteTransaction
+        Dim trans As SqliteTransaction
-        Dim command As SQLiteCommand
+        Dim command As SqliteCommand
 
         Connect()
-        command = New SQLiteCommand(sSQL, db)
+        command = New SqliteCommand(sSQL, db)
         BuildParams(command, hshParams)
         trans = db.BeginTransaction()
 
@@ -198,11 +198,11 @@ Public Class mgrSQLite
     End Function
 
     Public Function RunMassParamQuery(ByVal sSQL As String, ByVal oParamList As List(Of Hashtable)) As Boolean
-        Dim trans As SQLiteTransaction
+        Dim trans As SqliteTransaction
-        Dim command As SQLiteCommand
+        Dim command As SqliteCommand
 
         Connect()
-        command = New SQLiteCommand(sSQL, db)
+        command = New SqliteCommand(sSQL, db)
         trans = db.BeginTransaction()
 
         Try
@@ -224,12 +224,12 @@ Public Class mgrSQLite
     End Function
 
     Public Function ReadParamData(ByVal sSQL As String, ByVal hshParams As Hashtable) As DataSet
-        Dim adapter As SQLiteDataAdapter
+        Dim adapter As SqliteDataAdapter
-        Dim command As SQLiteCommand
+        Dim command As SqliteCommand
         Dim oData As New DataSet
 
         Connect()
-        command = New SQLiteCommand(sSQL, db)
+        command = New SqliteCommand(sSQL, db)
         BuildParams(command, hshParams)
 
         Try
@@ -556,6 +556,50 @@ Public Class mgrSQLite
             End If
         End If
 
+        '0.98 Upgrade
+        If GetDatabaseVersion() < 98 Then
+            If eDatabase = Database.Local Then
+                'Backup DB before starting
+                BackupDB("v97")
+
+                'Overhaul Manifest Table
+                sSQL = "CREATE TABLE manifest_new (ManifestID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, AbsolutePath BOOLEAN NOT NULL, DateUpdated TEXT NOT NULL, UpdatedBy TEXT NOT NULL, CheckSum TEXT);"
+                sSQL &= "INSERT INTO manifest_new (ManifestID, Name, FileName, RestorePath, AbsolutePath, DateUpdated, UpdatedBy) "
+                sSQL &= "SELECT ManifestID, Name, FileName, RestorePath, AbsolutePath, DateUpdated, UpdatedBy FROM manifest;"
+                sSQL &= "DROP TABLE manifest; ALTER TABLE manifest_new RENAME TO manifest;"
+
+                'Add backup limit field
+                sSQL &= "ALTER TABLE monitorlist ADD COLUMN BackupLimit INTEGER NOT NULL DEFAULT 5;"
+
+                sSQL &= "PRAGMA user_version=98"
+
+                RunParamQuery(sSQL, New Hashtable)
+
+                'Run a compact
+                CompactDatabase()
+            End If
+            If eDatabase = Database.Remote Then
+                'Backup DB before starting
+                BackupDB("v97")
+
+                'Overhaul Manifest Table
+                sSQL = "CREATE TABLE manifest_new (ManifestID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, AbsolutePath BOOLEAN NOT NULL, DateUpdated TEXT NOT NULL, UpdatedBy TEXT NOT NULL, CheckSum TEXT);"
+                sSQL &= "INSERT INTO manifest_new (ManifestID, Name, FileName, RestorePath, AbsolutePath, DateUpdated, UpdatedBy) "
+                sSQL &= "SELECT ManifestID, Name, FileName, RestorePath, AbsolutePath, DateUpdated, UpdatedBy FROM manifest;"
+                sSQL &= "DROP TABLE manifest; ALTER TABLE manifest_new RENAME TO manifest;"
+
+                'Add backup limit field
+                sSQL &= "ALTER TABLE monitorlist ADD COLUMN BackupLimit INTEGER NOT NULL DEFAULT 5;"
+
+                sSQL &= "PRAGMA user_version=98"
+
+                RunParamQuery(sSQL, New Hashtable)
+
+                'Run a compact
+                CompactDatabase()
+            End If
+        End If
+
     End Sub
 
     Public Function GetDBSize() As Long

GBM/Managers/mgrTags.vb

@@ -1,26 +1,44 @@
 Public Class mgrTags
 
+    Private Shared Function MapToObject(ByVal dr As DataRow) As clsTag
+        Dim oTag As New clsTag
+
+        oTag.ID = CStr(dr("TagID"))
+        oTag.Name = CStr(dr("Name"))
+
+        Return oTag
+    End Function
+
+    Private Shared Function SetCoreParameters(ByVal oTag As clsTag) As Hashtable
+        Dim hshParams As New Hashtable
+
+        hshParams.Add("ID", oTag.ID)
+        hshParams.Add("Name", oTag.Name)
+
+        Return hshParams
+    End Function
+
     Public Shared Sub DoTagAdd(ByVal oTag As clsTag, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim sSQL As String
-        Dim hshParams As New Hashtable
+        Dim hshParams As Hashtable
 
         sSQL = "INSERT INTO tags VALUES (@ID, @Name)"
-        hshParams.Add("ID", oTag.ID)
+
-        hshParams.Add("Name", oTag.Name)
+        hshParams = SetCoreParameters(oTag)
+
         oDatabase.RunParamQuery(sSQL, hshParams)
     End Sub
 
     Public Shared Sub DoTagUpdate(ByVal oTag As clsTag, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim sSQL As String
-        Dim hshParams As New Hashtable
+        Dim hshParams As Hashtable
 
         sSQL = "UPDATE tags SET Name=@Name "
         sSQL &= "WHERE TagID = @ID"
 
-        hshParams.Add("Name", oTag.Name)
+        hshParams = SetCoreParameters(oTag)
-        hshParams.Add("ID", oTag.ID)
 
         oDatabase.RunParamQuery(sSQL, hshParams)
 
@@ -57,9 +75,7 @@
         oData = oDatabase.ReadParamData(sSQL, hshParams)
 
         For Each dr As DataRow In oData.Tables(0).Rows
-            oTag = New clsTag
+            oTag = MapToObject(dr)
-            oTag.ID = CStr(dr("TagID"))
-            oTag.Name = CStr(dr("Name"))
         Next
 
         Return oTag
@@ -80,9 +96,7 @@
         oData = oDatabase.ReadParamData(sSQL, hshParams)
 
         For Each dr As DataRow In oData.Tables(0).Rows
-            oTag = New clsTag
+            oTag = MapToObject(dr)
-            oTag.ID = CStr(dr("TagID"))
-            oTag.Name = CStr(dr("Name"))
         Next
 
         Return oTag
@@ -124,9 +138,7 @@
         oData = oDatabase.ReadParamData(sSQL, New Hashtable)
 
         For Each dr As DataRow In oData.Tables(0).Rows
-            oTag = New clsTag
+            oTag = MapToObject(dr)
-            oTag.ID = CStr(dr("TagID"))
-            oTag.Name = CStr(dr("Name"))
             hshList.Add(oTag.Name, oTag)
         Next
 

GBM/Managers/mgrVariables.vb

@@ -1,5 +1,25 @@
 Public Class mgrVariables
 
+    Private Shared Function MapToObject(ByVal dr As DataRow) As clsPathVariable
+        Dim oCustomVariable As New clsPathVariable
+
+        oCustomVariable.ID = CStr(dr("VariableID"))
+        oCustomVariable.Name = CStr(dr("Name"))
+        oCustomVariable.Path = CStr(dr("Path"))
+
+        Return oCustomVariable
+    End Function
+
+    Private Shared Function SetCoreParameters(ByVal oCustomVariable As clsPathVariable) As Hashtable
+        Dim hshParams As New Hashtable
+
+        hshParams.Add("ID", oCustomVariable.ID)
+        hshParams.Add("Name", oCustomVariable.Name)
+        hshParams.Add("Path", oCustomVariable.Path)
+
+        Return hshParams
+    End Function
+
     Public Shared Sub DoPathUpdate(ByVal sOld As String, ByVal sNew As String)
         Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Local)
         Dim sSQL As String
@@ -15,26 +35,22 @@
     Public Shared Sub DoVariableAdd(ByVal oCustomVariable As clsPathVariable)
         Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Local)
         Dim sSQL As String
-        Dim hshParams As New Hashtable
+        Dim hshParams As Hashtable
 
         sSQL = "INSERT INTO variables VALUES (@ID, @Name, @Path)"
-        hshParams.Add("ID", oCustomVariable.ID)
+        hshParams = SetCoreParameters(oCustomVariable)
-        hshParams.Add("Name", oCustomVariable.Name)
-        hshParams.Add("Path", oCustomVariable.Path)
         oDatabase.RunParamQuery(sSQL, hshParams)
     End Sub
 
     Public Shared Sub DoVariableUpdate(ByVal oCustomVariable As clsPathVariable)
         Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Local)
         Dim sSQL As String
-        Dim hshParams As New Hashtable
+        Dim hshParams As Hashtable
 
         sSQL = "UPDATE variables SET Name=@Name, Path = @Path "
         sSQL &= "WHERE VariableID = @ID"
 
-        hshParams.Add("Name", oCustomVariable.Name)
+        hshParams = SetCoreParameters(oCustomVariable)
-        hshParams.Add("Path", oCustomVariable.Path)
-        hshParams.Add("ID", oCustomVariable.ID)
 
         oDatabase.RunParamQuery(sSQL, hshParams)
 
@@ -69,10 +85,7 @@
         oData = oDatabase.ReadParamData(sSQL, hshParams)
 
         For Each dr As DataRow In oData.Tables(0).Rows
-            oCustomVariable = New clsPathVariable
+            oCustomVariable = MapToObject(dr)
-            oCustomVariable.ID = CStr(dr("VariableID"))
-            oCustomVariable.Name = CStr(dr("Name"))
-            oCustomVariable.Path = CStr(dr("Path"))
         Next
 
         Return oCustomVariable
@@ -93,10 +106,7 @@
         oData = oDatabase.ReadParamData(sSQL, hshParams)
 
         For Each dr As DataRow In oData.Tables(0).Rows
-            oCustomVariable = New clsPathVariable
+            oCustomVariable = MapToObject(dr)
-            oCustomVariable.ID = CStr(dr("VariableID"))
-            oCustomVariable.Name = CStr(dr("Name"))
-            oCustomVariable.Path = CStr(dr("Path"))
         Next
 
         Return oCustomVariable
@@ -138,10 +148,7 @@
         oData = oDatabase.ReadParamData(sSQL, New Hashtable)
 
         For Each dr As DataRow In oData.Tables(0).Rows
-            oCustomVariable = New clsPathVariable
+            oCustomVariable = MapToObject(dr)
-            oCustomVariable.ID = CStr(dr("VariableID"))
-            oCustomVariable.Name = CStr(dr("Name"))
-            oCustomVariable.Path = CStr(dr("Path"))
             hshList.Add(oCustomVariable.Name, oCustomVariable)
         Next
 

GBM/My Project/AssemblyInfo.vb

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("0.97.*")>
+<Assembly: AssemblyVersion("0.98.*")>
-<Assembly: AssemblyFileVersion("0.97.0.0")>
+<Assembly: AssemblyFileVersion("0.98.0.0")>
 
 <Assembly: NeutralResourcesLanguageAttribute("en")> 

GBM/My Project/Resources.Designer.vb

@@ -259,7 +259,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Save Entire Folder.
+        '''  Looks up a localized string similar to Save entire folder.
         '''</summary>
         Friend ReadOnly Property frmAddWizard_chkFolderSave() As String
             Get
@@ -268,7 +268,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Time Stamp Backup.
+        '''  Looks up a localized string similar to Save multiple backups.
         '''</summary>
         Friend ReadOnly Property frmAddWizard_chkTimeStamp() As String
             Get
@@ -501,6 +501,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Backup Limit.
+        '''</summary>
+        Friend ReadOnly Property frmAddWizard_lblLimit() As String
+            Get
+                Return ResourceManager.GetString("frmAddWizard_lblLimit", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to The name will be automatically filtered for length and invalid characters.  You may drag and drop a shortcut here to complete this step, only Windows shortcuts are currently supported..
         '''</summary>
@@ -574,7 +583,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to If you&apos;re unsure of exactly which files to backup,  make sure Save Entire Folder is checked.  You can also time stamp your backup files to make incremental backups..
+        '''  Looks up a localized string similar to If you&apos;re unsure of exactly which files to backup,  make sure Save entire folder is checked.  You can also choose to save multiple backups and set a limit on how many to keep..
         '''</summary>
         Friend ReadOnly Property frmAddWizard_lblStep3Instructions() As String
             Get
@@ -709,7 +718,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Timestamp.
+        '''  Looks up a localized string similar to Multiple Backups.
         '''</summary>
         Friend ReadOnly Property frmAddWizard_Summary_Timestamp() As String
             Get
@@ -1069,7 +1078,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to [PARAM] by [PARAM].
+        '''  Looks up a localized string similar to [PARAM] ([PARAM]).
         '''</summary>
         Friend ReadOnly Property frmGameManager_BackupTimeAndName() As String
             Get
@@ -1077,6 +1086,24 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Choose a new [PARAM] backup file.
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_BrowseBackup() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_BrowseBackup", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to 7-Zip.
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_BrowseBackupType() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_BrowseBackupType", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to +.
         '''</summary>
@@ -1113,6 +1140,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to &amp;Change Backup File.
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_btnChangeBackup() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_btnChangeBackup", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to C&amp;lose.
         '''</summary>
@@ -1285,7 +1321,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Timestamp each backup.
+        '''  Looks up a localized string similar to Save multiple backups.
         '''</summary>
         Friend ReadOnly Property frmGameManager_chkTimeStamp() As String
             Get
@@ -1347,6 +1383,24 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to &amp;All Files.
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_cmsDeleteAll() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_cmsDeleteAll", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to &amp;Selected File.
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_cmsDeleteOne() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_cmsDeleteOne", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to &amp;File....
         '''</summary>
@@ -1375,7 +1429,25 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to This will delete the backup file and all records of this backup.  This cannot be undone. [BR][BR]Do you want to remove the data for [PARAM]?.
+        '''  Looks up a localized string similar to [PARAM] will be the new backup file for [PARAM].[BR][BR]Is this correct?.
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_ConfirmBackupChange() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_ConfirmBackupChange", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Do you want to restore [PARAM] now?.
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_ConfirmBackupChangeRestore() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_ConfirmBackupChangeRestore", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to This will delete the selected backup file.  This cannot be undone. [BR][BR]Do you want to delete [PARAM]?.
         '''</summary>
         Friend ReadOnly Property frmGameManager_ConfirmBackupDelete() As String
             Get
@@ -1384,11 +1456,11 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to The backup folder [PARAM] still contains [PARAM] directories and [PARAM] files.[BR][BR]Do you want to delete the contents and remove the sub-folder for this game?.
+        '''  Looks up a localized string similar to This will delete all backup files for [PARAM].  This cannot be undone. [BR][BR]Do you want to continue?.
         '''</summary>
-        Friend ReadOnly Property frmGameManager_ConfirmBackupFolderDelete() As String
+        Friend ReadOnly Property frmGameManager_ConfirmBackupDeleteAll() As String
             Get
-                Return ResourceManager.GetString("frmGameManager_ConfirmBackupFolderDelete", resourceCulture)
+                Return ResourceManager.GetString("frmGameManager_ConfirmBackupDeleteAll", resourceCulture)
             End Get
         End Property
         
@@ -1491,6 +1563,24 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to [PARAM] is already the current backup file..
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_ErrorBackupChangeFileName() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_ErrorBackupChangeFileName", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to You cannot choose a file located outside the current [PARAM] backup folder..
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_ErrorBackupChangePath() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_ErrorBackupChangePath", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to A game with this exact name and process already exists..
         '''</summary>
@@ -1689,6 +1779,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Backup File:.
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_lblBackupFile() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_lblBackupFile", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Company:.
         '''</summary>
@@ -1698,24 +1797,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        '''<summary>
-        '''  Looks up a localized string similar to Current Backup:.
-        '''</summary>
-        Friend ReadOnly Property frmGameManager_lblCurrentBackup() As String
-            Get
-                Return ResourceManager.GetString("frmGameManager_lblCurrentBackup", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Backup Size:.
-        '''</summary>
-        Friend ReadOnly Property frmGameManager_lblFileSize() As String
-            Get
-                Return ResourceManager.GetString("frmGameManager_lblFileSize", resourceCulture)
-            End Get
-        End Property
-        
         '''<summary>
         '''  Looks up a localized string similar to Game Path:.
         '''</summary>
@@ -1744,11 +1825,20 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Local Backup:.
+        '''  Looks up a localized string similar to Backup Limit.
         '''</summary>
-        Friend ReadOnly Property frmGameManager_lblLastBackup() As String
+        Friend ReadOnly Property frmGameManager_lblLimit() As String
             Get
-                Return ResourceManager.GetString("frmGameManager_lblLastBackup", resourceCulture)
+                Return ResourceManager.GetString("frmGameManager_lblLimit", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Local Data:.
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_lblLocalData() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_lblLocalData", resourceCulture)
             End Get
         End Property
         
@@ -1779,6 +1869,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Backup Data:.
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_lblRemote() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_lblRemote", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Restore Path:.
         '''</summary>
@@ -1807,11 +1906,11 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Never.
+        '''  Looks up a localized string similar to None.
         '''</summary>
-        Friend ReadOnly Property frmGameManager_Never() As String
+        Friend ReadOnly Property frmGameManager_None() As String
             Get
-                Return ResourceManager.GetString("frmGameManager_Never", resourceCulture)
+                Return ResourceManager.GetString("frmGameManager_None", resourceCulture)
             End Get
         End Property
         
@@ -1860,6 +1959,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Unknown.
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_Unknown() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_Unknown", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Up to Date!.
         '''</summary>
@@ -3850,7 +3958,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Time stamp each backup.
+        '''  Looks up a localized string similar to Save multiple backups.
         '''</summary>
         Friend ReadOnly Property frmSyncFields_chkTimeStamp() As String
             Get
@@ -4294,6 +4402,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to [PARAM] was automatically removed..
+        '''</summary>
+        Friend ReadOnly Property mgrBackup_BackupLimitExceeded() As String
+            Get
+                Return ResourceManager.GetString("mgrBackup_BackupLimitExceeded", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to [PARAM] backup finished with warnings or errors..
         '''</summary>

GBM/My Project/Resources.resx

@@ -431,7 +431,7 @@
     <value>[PARAM] MB</value>
   </data>
   <data name="frmGameManager_BackupTimeAndName" xml:space="preserve">
-    <value>[PARAM] by [PARAM]</value>
+    <value>[PARAM] ([PARAM])</value>
   </data>
   <data name="frmGameManager_btnAdd" xml:space="preserve">
     <value>+</value>
@@ -503,7 +503,7 @@
     <value>Monitor only</value>
   </data>
   <data name="frmGameManager_chkTimeStamp" xml:space="preserve">
-    <value>Timestamp each backup</value>
+    <value>Save multiple backups</value>
   </data>
   <data name="frmGameManager_ChooseCustomIcon" xml:space="preserve">
     <value>Choose a custom icon for the game</value>
@@ -527,10 +527,7 @@
     <value>Are you sure you want to run a backup for [PARAM]?  This will close the form.</value>
   </data>
   <data name="frmGameManager_ConfirmBackupDelete" xml:space="preserve">
-    <value>This will delete the backup file and all records of this backup.  This cannot be undone. [BR][BR]Do you want to remove the data for [PARAM]?</value>
+    <value>This will delete the selected backup file.  This cannot be undone. [BR][BR]Do you want to delete [PARAM]?</value>
-  </data>
-  <data name="frmGameManager_ConfirmBackupFolderDelete" xml:space="preserve">
-    <value>The backup folder [PARAM] still contains [PARAM] directories and [PARAM] files.[BR][BR]Do you want to delete the contents and remove the sub-folder for this game?</value>
   </data>
   <data name="frmGameManager_ConfirmGameDelete" xml:space="preserve">
     <value>Are you sure you want to delete [PARAM]?  This cannot be undone.[BR][BR]This will not delete any backup files that already exist for this game.</value>
@@ -616,11 +613,11 @@
   <data name="frmGameManager_lblCompany" xml:space="preserve">
     <value>Company:</value>
   </data>
-  <data name="frmGameManager_lblCurrentBackup" xml:space="preserve">
+  <data name="frmGameManager_lblRemote" xml:space="preserve">
-    <value>Current Backup:</value>
+    <value>Backup Data:</value>
   </data>
-  <data name="frmGameManager_lblFileSize" xml:space="preserve">
+  <data name="frmGameManager_lblBackupFile" xml:space="preserve">
-    <value>Backup Size:</value>
+    <value>Backup File:</value>
   </data>
   <data name="frmGameManager_lblGamePath" xml:space="preserve">
     <value>Game Path:</value>
@@ -631,8 +628,8 @@
   <data name="frmGameManager_lblIcon" xml:space="preserve">
     <value>Icon:</value>
   </data>
-  <data name="frmGameManager_lblLastBackup" xml:space="preserve">
+  <data name="frmGameManager_lblLocalData" xml:space="preserve">
-    <value>Local Backup:</value>
+    <value>Local Data:</value>
   </data>
   <data name="frmGameManager_lblName" xml:space="preserve">
     <value>Name:</value>
@@ -649,8 +646,8 @@
   <data name="frmGameManager_lblVersion" xml:space="preserve">
     <value>Version:</value>
   </data>
-  <data name="frmGameManager_Never" xml:space="preserve">
+  <data name="frmGameManager_None" xml:space="preserve">
-    <value>Never</value>
+    <value>None</value>
   </data>
   <data name="frmGameManager_optAllGames" xml:space="preserve">
     <value>All</value>
@@ -704,10 +701,10 @@
     <value>...</value>
   </data>
   <data name="frmAddWizard_chkFolderSave" xml:space="preserve">
-    <value>Save Entire Folder</value>
+    <value>Save entire folder</value>
   </data>
   <data name="frmAddWizard_chkTimeStamp" xml:space="preserve">
-    <value>Time Stamp Backup</value>
+    <value>Save multiple backups</value>
   </data>
   <data name="frmAddWizard_ChooseProcess" xml:space="preserve">
     <value>Choose exe file that starts the game</value>
@@ -809,7 +806,7 @@
     <value>Choose Files to Backup</value>
   </data>
   <data name="frmAddWizard_lblStep3Instructions" xml:space="preserve">
-    <value>If you're unsure of exactly which files to backup,  make sure Save Entire Folder is checked.  You can also time stamp your backup files to make incremental backups.</value>
+    <value>If you're unsure of exactly which files to backup,  make sure Save entire folder is checked.  You can also choose to save multiple backups and set a limit on how many to keep.</value>
   </data>
   <data name="frmAddWizard_lblStep3Intro" xml:space="preserve">
     <value>Choose the location of your game's save files:</value>
@@ -854,7 +851,7 @@
     <value>Save Path</value>
   </data>
   <data name="frmAddWizard_Summary_Timestamp" xml:space="preserve">
-    <value>Timestamp</value>
+    <value>Multiple Backups</value>
   </data>
   <data name="frmAdvancedImport_btnCancel" xml:space="preserve">
     <value>&amp;Cancel</value>
@@ -1652,7 +1649,7 @@
     <value>Monitor this game</value>
   </data>
   <data name="frmSyncFields_chkTimeStamp" xml:space="preserve">
-    <value>Time stamp each backup</value>
+    <value>Save multiple backups</value>
   </data>
   <data name="frmSyncFields_chkVersion" xml:space="preserve">
     <value>Version</value>
@@ -1693,4 +1690,46 @@
   <data name="App_URLImportLinux" xml:space="preserve">
     <value>http://mikemaximus.github.io/gbm-web/GBM_Official_Linux.xml</value>
   </data>
+  <data name="frmGameManager_BrowseBackup" xml:space="preserve">
+    <value>Choose a new [PARAM] backup file</value>
+  </data>
+  <data name="frmGameManager_BrowseBackupType" xml:space="preserve">
+    <value>7-Zip</value>
+  </data>
+  <data name="frmGameManager_btnChangeBackup" xml:space="preserve">
+    <value>&amp;Change Backup File</value>
+  </data>
+  <data name="frmGameManager_ConfirmBackupChange" xml:space="preserve">
+    <value>[PARAM] will be the new backup file for [PARAM].[BR][BR]Is this correct?</value>
+  </data>
+  <data name="frmGameManager_ConfirmBackupChangeRestore" xml:space="preserve">
+    <value>Do you want to restore [PARAM] now?</value>
+  </data>
+  <data name="frmGameManager_ErrorBackupChangeFileName" xml:space="preserve">
+    <value>[PARAM] is already the current backup file.</value>
+  </data>
+  <data name="frmGameManager_ErrorBackupChangePath" xml:space="preserve">
+    <value>You cannot choose a file located outside the current [PARAM] backup folder.</value>
+  </data>
+  <data name="frmGameManager_lblLimit" xml:space="preserve">
+    <value>Backup Limit</value>
+  </data>
+  <data name="mgrBackup_BackupLimitExceeded" xml:space="preserve">
+    <value>[PARAM] was automatically removed.</value>
+  </data>
+  <data name="frmGameManager_cmsDeleteAll" xml:space="preserve">
+    <value>&amp;All Files</value>
+  </data>
+  <data name="frmGameManager_cmsDeleteOne" xml:space="preserve">
+    <value>&amp;Selected File</value>
+  </data>
+  <data name="frmGameManager_ConfirmBackupDeleteAll" xml:space="preserve">
+    <value>This will delete all backup files for [PARAM].  This cannot be undone. [BR][BR]Do you want to continue?</value>
+  </data>
+  <data name="frmAddWizard_lblLimit" xml:space="preserve">
+    <value>Backup Limit</value>
+  </data>
+  <data name="frmGameManager_Unknown" xml:space="preserve">
+    <value>Unknown</value>
+  </data>
 </root>

GBM/readme.txt

@@ -1,25 +1,32 @@
-Game Backup Monitor v0.97 Readme
+Game Backup Monitor v0.98 Readme
 http://mikemaximus.github.io/gbm-web/
 gamebackupmonitor@gmail.com
 
-June 30, 2016
+September 1, 2016
 
 Disclaimer:
 
 This is beta release software.  You may still encounter some bugs.
 
-New in 0.97
+New in 0.98
 
-- (All) Re-designed the Settings screen as a standard preference panel interface.
+- (All) Redesigned GBM's ability to manage multiple backups per game.
-- (Windows) Updated GBM's version of 7-Zip to 16.02 (2016-05-21)
+	- The "Timestamp each backup" option has been renamed "Save multiple backups".
-- (All) Custom arguments and switches can now be added to GBM's 7-Zip commands.
+	- You can limit the amount of backups you keep for each game by setting a limit (2 to 100).
-- (All) Custom versions of 7-Zip Console (7za) can now be used as a supported feature.
+	- GBM will keep your backup folder clean by automatically deleting old backups as limits are reached or modified.
-- (Windows) GBM's packaged version(s) of 7-Zip Console (7za) are now verified as a simple security feature.
+	- The Game Manager now allows you to browse and manage ALL backups for each game, not just the latest backup.
-- (All) A "Set Defaults" button is now available on the Settings screen.
+- (All) Using "Monitor Only" no longer puts anys limitations on the game configuration or available features.
-- (All) Optional data fields such as "Company" and "Version" can now be included in the sync.
+- (Windows Installer) The installer will now properly go into upgrade mode if a prior version of GBM is installed.  Note: 32-bit and 64-bit qualify as different versions.
-- (All) Reduced the maximum length of the session log to improve performance and added a setting to control log autosaves.
+- (Windows Installer) The installer will now create an uninstall entry in Add/Remove Programs (Apps & Features).
-- (All) A "Quick Filter" has been added to the Game Manager.  You can now quickly find a game by typing the name as soon as you open the window.
+- (Linux) 64-bit games running in Wine will now be properly detected.
-- (Linux) An official game list is now available for Linux, GBM will choose the official list based on your operating system.
+- (Linux) Add Game Wizard will no longer remove all extensions when selecting an executable.
+- (Linux) GBM now prefers to use an absolute path when creating Linux game configurations.
+
+Important Upgrade Information:
+
+- The v0.98 Game Manager will not detect old backup files made using the "Timestamp each backup" setting in prior versions.
+- Configurations using the "Timestamp each backup" option will have "Save multiple backups" automatically enabled with a backup limit of 5.
+- If "Timestamp each backup" is currently set to sync, then "Save multiple backups" will also be set to sync after upgrading.
 
 For more information regarding Linux support read the FAQ at http://mikemaximus.github.io/gbm-web/linux.html