From bfe2346e8ae0d1a5664be421b5efae939250a970 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Sun, 21 Aug 2016 11:25:10 -0600 Subject: [PATCH 1/8] Manifest Re-write (Functional, Pass 1) --- GBM/Forms/frmGameManager.vb | 82 ++++++++------- GBM/Forms/frmMain.vb | 2 +- GBM/Managers/mgrBackup.vb | 8 +- GBM/Managers/mgrManifest.vb | 203 ++++++++++++++++++++++++++++-------- GBM/Managers/mgrRestore.vb | 18 ++-- GBM/Managers/mgrSQLite.vb | 64 +++++++++--- 6 files changed, 265 insertions(+), 112 deletions(-) diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index 103c080..f62e2f6 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -142,8 +142,8 @@ Public Class frmGameManager End Property Private Sub LoadBackupData() - oRemoteBackupData = mgrManifest.ReadManifest(mgrSQLite.Database.Remote) - oLocalBackupData = mgrManifest.ReadManifest(mgrSQLite.Database.Local) + oRemoteBackupData = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Remote) + oLocalBackupData = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local) End Sub Private Function ConvertToRelativePath(ByVal sSavePath As String, ByVal sAppPath As String) As String @@ -160,48 +160,54 @@ 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 Dim sNewFileName As String - 'If there is a name change, check and update the manifest + '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 - oBackupItem = mgrManifest.DoManifestGetByName(oOriginalApp.Name, mgrSQLite.Database.Local) + If mgrManifest.DoManifestNameCheck(oOriginalApp.Name, mgrSQLite.Database.Local) Then + oBackupItems = mgrManifest.DoManifestGetByName(oOriginalApp.Name, mgrSQLite.Database.Local) - 'Rename Current Backup File & Folder - sFileName = BackupFolder & oBackupItem.FileName + For Each oBackupItem As clsBackup In oBackupItems + 'Rename Current Backup File & Folder + sFileName = BackupFolder & oBackupItem.FileName - 'Rename Backup File - sNewFileName = Path.GetDirectoryName(sFileName) & Path.DirectorySeparatorChar & Path.GetFileName(sFileName).Replace(oOriginalApp.Name, oNewApp.Name) - If File.Exists(sFileName) Then - FileSystem.Rename(sFileName, sNewFileName) - End If - - 'Rename Directory - sDirectory = Path.GetDirectoryName(sFileName) - sNewDirectory = sDirectory.Replace(oOriginalApp.Name, oNewApp.Name) - If sDirectory <> sNewDirectory Then - If Directory.Exists(sDirectory) Then - FileSystem.Rename(sDirectory, sNewDirectory) + 'Rename Backup File + sNewFileName = Path.GetDirectoryName(sFileName) & Path.DirectorySeparatorChar & Path.GetFileName(sFileName).Replace(oOriginalApp.Name, oNewApp.Name) + If File.Exists(sFileName) Then + FileSystem.Rename(sFileName, sNewFileName) End If - End If - oBackupItem.Name = oNewApp.Name - oBackupItem.FileName = oBackupItem.FileName.Replace(oOriginalApp.Name, oNewApp.Name) - mgrManifest.DoManifestNameUpdate(oOriginalApp.Name, oBackupItem, mgrSQLite.Database.Local) - oLocalBackupData = mgrManifest.ReadManifest(mgrSQLite.Database.Local) + 'Rename Directory + sDirectory = Path.GetDirectoryName(sFileName) + sNewDirectory = sDirectory.Replace(oOriginalApp.Name, oNewApp.Name) + If sDirectory <> sNewDirectory Then + If Directory.Exists(sDirectory) Then + FileSystem.Rename(sDirectory, sNewDirectory) + End If + End If + + oBackupItem.Name = oNewApp.Name + oBackupItem.FileName = oBackupItem.FileName.Replace(oOriginalApp.Name, oNewApp.Name) + mgrManifest.DoManifestNameUpdate(oOriginalApp.Name, oBackupItem, mgrSQLite.Database.Local) + Next + oLocalBackupData = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local) End If + 'Remote - If mgrManifest.DoManifestCheck(oOriginalApp.Name, mgrSQLite.Database.Remote) Then - oBackupItem = mgrManifest.DoManifestGetByName(oOriginalApp.Name, mgrSQLite.Database.Remote) - oBackupItem.Name = oNewApp.Name - oBackupItem.FileName = oBackupItem.FileName.Replace(oOriginalApp.Name, oNewApp.Name) - mgrManifest.DoManifestNameUpdate(oOriginalApp.Name, oBackupItem, mgrSQLite.Database.Remote) - oRemoteBackupData = mgrManifest.ReadManifest(mgrSQLite.Database.Remote) + If mgrManifest.DoManifestNameCheck(oOriginalApp.Name, mgrSQLite.Database.Remote) Then + 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) + Next + oRemoteBackupData = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Remote) End If End If End Sub @@ -606,8 +612,8 @@ Public Class frmGameManager Dim sSubDir As String If mgrCommon.ShowMessage(frmGameManager_ConfirmBackupDelete, CurrentBackupItem.Name, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - mgrManifest.DoManifestDelete(CurrentBackupItem, mgrSQLite.Database.Local) - mgrManifest.DoManifestDelete(CurrentBackupItem, mgrSQLite.Database.Remote) + mgrManifest.DoManifestDeletebyID(CurrentBackupItem, mgrSQLite.Database.Local) + mgrManifest.DoManifestDeletebyID(CurrentBackupItem, mgrSQLite.Database.Remote) 'Delete referenced backup file from the backup folder mgrCommon.DeleteFile(BackupFolder & CurrentBackupItem.FileName) @@ -1172,7 +1178,7 @@ Public Class frmGameManager oBackup.CheckSum = String.Empty 'Reset date oBackup.DateUpdated = Date.Now - mgrManifest.DoManifestUpdate(oBackup, mgrSQLite.Database.Remote) + mgrManifest.DoManifestUpdateByID(oBackup, mgrSQLite.Database.Remote) 'Refresh backup data and GUI bIsLoading = True LoadBackupData() @@ -1206,8 +1212,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 - mgrManifest.DoManifestUpdate(oMarkList(0), mgrSQLite.Database.Local) + If mgrManifest.DoManifestCheck(oMarkList(0).Name, oMarkList(0).FileName, mgrSQLite.Database.Local) Then + mgrManifest.DoManifestUpdateByID(oMarkList(0), mgrSQLite.Database.Local) Else mgrManifest.DoManifestAdd(oMarkList(0), mgrSQLite.Database.Local) End If @@ -1216,8 +1222,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 - mgrManifest.DoManifestUpdate(oGameBackup, mgrSQLite.Database.Local) + If mgrManifest.DoManifestCheck(oGameBackup.Name, oGameBackup.FileName, mgrSQLite.Database.Local) Then + mgrManifest.DoManifestUpdateByID(oGameBackup, mgrSQLite.Database.Local) Else mgrManifest.DoManifestAdd(oGameBackup, mgrSQLite.Database.Local) End If diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb index 3f3792f..8b622c3 100644 --- a/GBM/Forms/frmMain.vb +++ b/GBM/Forms/frmMain.vb @@ -158,7 +158,7 @@ Public Class frmMain End Sub Private Sub RunRestore(ByVal oRestoreList As List(Of clsGame)) - Dim oBackupData As SortedList = mgrManifest.ReadManifest(mgrSQLite.Database.Remote) + Dim oBackupData As SortedList = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Remote) Dim oGame As clsGame Dim oReadyList As New List(Of clsBackup) Dim oRestoreInfo As clsBackup diff --git a/GBM/Managers/mgrBackup.vb b/GBM/Managers/mgrBackup.vb index 2a1de0e..776ee55 100644 --- a/GBM/Managers/mgrBackup.vb +++ b/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 - mgrManifest.DoManifestUpdate(oItem, mgrSQLite.Database.Remote) + If mgrManifest.DoManifestCheck(oItem.Name, oItem.FileName, mgrSQLite.Database.Remote) Then + 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 - mgrManifest.DoManifestUpdate(oItem, mgrSQLite.Database.Local) + If mgrManifest.DoManifestCheck(oItem.Name, oItem.FileName, mgrSQLite.Database.Local) Then + mgrManifest.DoManifestUpdateByID(oItem, mgrSQLite.Database.Local) Else mgrManifest.DoManifestAdd(oItem, mgrSQLite.Database.Local) End If diff --git a/GBM/Managers/mgrManifest.vb b/GBM/Managers/mgrManifest.vb index 4f8ff26..070d080 100644 --- a/GBM/Managers/mgrManifest.vb +++ b/GBM/Managers/mgrManifest.vb @@ -1,6 +1,6 @@ Public Class mgrManifest - Public Shared Function ReadManifest(ByVal iSelectDB As mgrSQLite.Database) As SortedList + 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 @@ -10,6 +10,33 @@ sSQL = "SELECT * from manifest ORDER BY Name Asc" oData = oDatabase.ReadParamData(sSQL, New Hashtable) + For Each dr As DataRow In oData.Tables(0).Rows + 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")) + slList.Add(oBackupItem.ID, oBackupItem) + Next + + Return slList + + End Function + + 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 = New clsBackup oBackupItem.ID = CStr(dr("ManifestID")) @@ -27,7 +54,87 @@ End Function - Public Shared Function DoManifestCheck(ByVal sName As String, ByVal iSelectDB As mgrSQLite.Database) As Boolean + Public Shared Function ReadManifestByGame(ByVal sGame As String, 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 * from manifest WHERE Name=@Name ORDER BY DateUpdated Desc" + oData = oDatabase.ReadParamData(sSQL, New Hashtable) + + For Each dr As DataRow In oData.Tables(0).Rows + 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")) + slList.Add(oBackupItem.ID, oBackupItem) + Next + + Return slList + + End Function + + 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 oList As New List(Of clsBackup) + Dim oBackupItem As New clsBackup + + sSQL = "SELECT * from manifest " + sSQL &= "WHERE Name = @Name" + + hshParams.Add("Name", sName) + + oData = oDatabase.ReadParamData(sSQL, hshParams) + + For Each dr As DataRow In oData.Tables(0).Rows + 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")) + oList.Add(oBackupItem) + Next + + Return oList + End Function + + Public Shared Function DoManifestCheck(ByVal sName As String, ByVal sFileName 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 + + sSQL = "SELECT * from manifest " + sSQL &= "WHERE Name = @Name AND FileName = @FileName" + + hshParams.Add("Name", sName) + hshParams.Add("FileName", sFileName) + + oData = oDatabase.ReadParamData(sSQL, hshParams) + + If oData.Tables(0).Rows.Count > 0 Then + Return True + Else + Return False + End If + + End Function + + 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 @@ -48,41 +155,12 @@ End Function - Public Shared Function DoManifestGetByName(ByVal sName 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 - - sSQL = "SELECT * from manifest " - sSQL &= "WHERE Name = @Name" - - hshParams.Add("Name", sName) - - oData = oDatabase.ReadParamData(sSQL, hshParams) - - For Each dr As DataRow In oData.Tables(0).Rows - 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")) - 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 - 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.Add("Name", oBackupItem.Name) @@ -96,7 +174,7 @@ 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 @@ -116,6 +194,52 @@ oDatabase.RunParamQuery(sSQL, hshParams) End Sub + 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 + + sSQL = "UPDATE manifest SET Name = @Name, FileName = @FileName, RestorePath = @Path, AbsolutePath = @AbsolutePath, " + sSQL &= "DateUpdated = @DateUpdated, UpdatedBy = @UpdatedBy, CheckSum = @CheckSum WHERE ManifestID = @QueryID" + + 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) + hshParams.Add("QueryID", oBackupItem.ID) + + oDatabase.RunParamQuery(sSQL, hshParams) + End Sub + + 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 + + sSQL = "DELETE FROM manifest " + sSQL &= "WHERE Name = @Name" + + hshParams.Add("Name", oBackupItem.Name) + + 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 DoManifestNameUpdate(ByVal sOriginalName As String, ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database) Dim oDatabase As New mgrSQLite(iSelectDB) Dim sSQL As String @@ -137,19 +261,6 @@ End Sub - Public Shared Sub DoManifestDelete(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 Name = @Name" - - hshParams.Add("Name", oBackupItem.Name) - - 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) diff --git a/GBM/Managers/mgrRestore.vb b/GBM/Managers/mgrRestore.vb index 358d912..7e37371 100644 --- a/GBM/Managers/mgrRestore.vb +++ b/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) - slRemoteManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Remote) + slLocalManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local) + 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) - slRemoteManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Remote) + slLocalManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local) + 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) - slRemoteManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Remote) + slLocalManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local) + 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 - mgrManifest.DoManifestUpdate(oBackupInfo, mgrSQLite.Database.Local) + If mgrManifest.DoManifestCheck(oBackupInfo.Name, oBackupInfo.FileName, mgrSQLite.Database.Local) Then + mgrManifest.DoManifestUpdateByID(oBackupInfo, mgrSQLite.Database.Local) Else mgrManifest.DoManifestAdd(oBackupInfo, mgrSQLite.Database.Local) End If diff --git a/GBM/Managers/mgrSQLite.vb b/GBM/Managers/mgrSQLite.vb index 1de4ad0..994ee8a 100644 --- a/GBM/Managers/mgrSQLite.vb +++ b/GBM/Managers/mgrSQLite.vb @@ -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,7 +111,7 @@ 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, " & @@ -120,7 +120,7 @@ Public Class mgrSQLite "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 command As SQLiteCommand + Dim trans As SqliteTransaction + 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 command As SQLiteCommand + Dim trans As SqliteTransaction + 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 command As SQLiteCommand + Dim adapter As SqliteDataAdapter + 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,42 @@ 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;" + 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;" + sSQL &= "PRAGMA user_version=98" + + RunParamQuery(sSQL, New Hashtable) + + 'Run a compact + CompactDatabase() + End If + End If + End Sub Public Function GetDBSize() As Long From 18befc19b384d2cac6fc08e33ba51c9a2de1503e Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Sun, 21 Aug 2016 20:14:07 -0600 Subject: [PATCH 2/8] Manifest Re-write (Functional, New Features, Pass 2) --- GBM/Classes/clsGame.vb | 13 ++ GBM/Forms/frmGameManager.Designer.vb | 166 +++++++++--------- GBM/Forms/frmGameManager.vb | 246 ++++++++++++++------------- GBM/Forms/frmMain.vb | 8 +- GBM/Forms/frmSyncFields.Designer.vb | 4 +- GBM/Managers/mgrBackup.vb | 34 +++- GBM/Managers/mgrManifest.vb | 87 ++++++---- GBM/Managers/mgrMonitorList.vb | 28 ++- GBM/Managers/mgrRestore.vb | 4 +- GBM/Managers/mgrSQLite.vb | 12 +- GBM/My Project/Resources.Designer.vb | 48 ++++-- GBM/My Project/Resources.resx | 20 ++- 12 files changed, 404 insertions(+), 266 deletions(-) diff --git a/GBM/Classes/clsGame.vb b/GBM/Classes/clsGame.vb index 081578f..acf07ff 100644 --- a/GBM/Classes/clsGame.vb +++ b/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 diff --git a/GBM/Forms/frmGameManager.Designer.vb b/GBM/Forms/frmGameManager.Designer.vb index c8e1b95..b9f31ff 100644 --- a/GBM/Forms/frmGameManager.Designer.vb +++ b/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.lblCurrentBackupData = New System.Windows.Forms.Label() - Me.lblLatestBackupData = New System.Windows.Forms.Label() + Me.lblLocalBackupData = New System.Windows.Forms.Label() Me.lblRestorePath = New System.Windows.Forms.Label() - Me.btnChangeBackup = New System.Windows.Forms.Button() Me.btnOpenRestorePath = New System.Windows.Forms.Button() Me.btnOpenBackupFile = New System.Windows.Forms.Button() Me.btnDeleteBackup = New System.Windows.Forms.Button() Me.lblBackupFile = New System.Windows.Forms.Label() - Me.lblLatestBackup = New System.Windows.Forms.Label() - Me.lblCurrentBackup = New System.Windows.Forms.Label() + Me.lblRemote = New System.Windows.Forms.Label() + Me.lblLocalData = 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() @@ -92,6 +93,7 @@ Partial Class frmGameManager Me.txtQuickFilter = New System.Windows.Forms.TextBox() Me.lblQuickFilter = New System.Windows.Forms.Label() 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() @@ -145,6 +147,8 @@ Partial Class frmGameManager '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 +172,33 @@ 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.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + 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 +207,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 +217,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 +226,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 +235,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 +268,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 +289,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.TabIndex = 14 - Me.chkTimeStamp.Text = "Time stamp each backup" + Me.chkTimeStamp.Size = New System.Drawing.Size(133, 17) + Me.chkTimeStamp.TabIndex = 11 + Me.chkTimeStamp.Text = "Save multiple backups" Me.chkTimeStamp.UseVisualStyleBackColor = True ' 'chkFolderSave @@ -275,7 +300,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,21 +309,21 @@ 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 ' @@ -468,18 +493,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.lblCurrentBackupData) - Me.grpStats.Controls.Add(Me.lblLatestBackupData) + Me.grpStats.Controls.Add(Me.lblLocalBackupData) Me.grpStats.Controls.Add(Me.lblRestorePath) - Me.grpStats.Controls.Add(Me.btnChangeBackup) Me.grpStats.Controls.Add(Me.btnOpenRestorePath) Me.grpStats.Controls.Add(Me.btnOpenBackupFile) Me.grpStats.Controls.Add(Me.btnDeleteBackup) Me.grpStats.Controls.Add(Me.lblBackupFile) - Me.grpStats.Controls.Add(Me.lblLatestBackup) - Me.grpStats.Controls.Add(Me.lblCurrentBackup) + Me.grpStats.Controls.Add(Me.lblRemote) + Me.grpStats.Controls.Add(Me.lblLocalData) Me.grpStats.Location = New System.Drawing.Point(247, 365) Me.grpStats.Name = "grpStats" Me.grpStats.Size = New System.Drawing.Size(525, 154) @@ -487,6 +511,15 @@ 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 @@ -509,27 +542,16 @@ Partial Class frmGameManager Me.lblBackupFileData.Tag = "wipe" Me.lblBackupFileData.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' - 'lblCurrentBackupData + 'lblLocalBackupData ' - Me.lblCurrentBackupData.AutoEllipsis = True - Me.lblCurrentBackupData.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.lblCurrentBackupData.Location = New System.Drawing.Point(96, 49) - Me.lblCurrentBackupData.Name = "lblCurrentBackupData" - Me.lblCurrentBackupData.Size = New System.Drawing.Size(387, 20) - Me.lblCurrentBackupData.TabIndex = 5 - Me.lblCurrentBackupData.Tag = "wipe" - Me.lblCurrentBackupData.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - ' - 'lblLatestBackupData - ' - Me.lblLatestBackupData.AutoEllipsis = True - Me.lblLatestBackupData.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.lblLatestBackupData.Location = New System.Drawing.Point(96, 23) - Me.lblLatestBackupData.Name = "lblLatestBackupData" - Me.lblLatestBackupData.Size = New System.Drawing.Size(387, 20) - Me.lblLatestBackupData.TabIndex = 4 - Me.lblLatestBackupData.Tag = "wipe" - Me.lblLatestBackupData.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + 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 ' @@ -540,16 +562,6 @@ Partial Class frmGameManager Me.lblRestorePath.TabIndex = 3 Me.lblRestorePath.Text = "Restore Path:" ' - 'btnChangeBackup - ' - Me.btnChangeBackup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnChangeBackup.Location = New System.Drawing.Point(129, 125) - Me.btnChangeBackup.Name = "btnChangeBackup" - Me.btnChangeBackup.Size = New System.Drawing.Size(114, 23) - Me.btnChangeBackup.TabIndex = 9 - Me.btnChangeBackup.Text = "&Change Backup File" - Me.btnChangeBackup.UseVisualStyleBackColor = True - ' 'btnOpenRestorePath ' Me.btnOpenRestorePath.Location = New System.Drawing.Point(369, 125) @@ -570,7 +582,7 @@ Partial Class frmGameManager ' 'btnDeleteBackup ' - Me.btnDeleteBackup.Location = New System.Drawing.Point(9, 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 = 8 @@ -586,23 +598,23 @@ Partial Class frmGameManager Me.lblBackupFile.TabIndex = 2 Me.lblBackupFile.Text = "Backup File:" ' - 'lblLatestBackup + 'lblRemote ' - Me.lblLatestBackup.AutoSize = True - Me.lblLatestBackup.Location = New System.Drawing.Point(6, 27) - Me.lblLatestBackup.Name = "lblLatestBackup" - Me.lblLatestBackup.Size = New System.Drawing.Size(79, 13) - Me.lblLatestBackup.TabIndex = 0 - Me.lblLatestBackup.Text = "Latest Backup:" + Me.lblRemote.AutoSize = True + Me.lblRemote.Location = New System.Drawing.Point(6, 27) + Me.lblRemote.Name = "lblRemote" + Me.lblRemote.Size = New System.Drawing.Size(73, 13) + Me.lblRemote.TabIndex = 0 + Me.lblRemote.Text = "Backup Data:" ' - 'lblCurrentBackup + 'lblLocalData ' - Me.lblCurrentBackup.AutoSize = True - Me.lblCurrentBackup.Location = New System.Drawing.Point(6, 53) - Me.lblCurrentBackup.Name = "lblCurrentBackup" - Me.lblCurrentBackup.Size = New System.Drawing.Size(84, 13) - Me.lblCurrentBackup.TabIndex = 1 - Me.lblCurrentBackup.Text = "Current Backup:" + Me.lblLocalData.AutoSize = True + Me.lblLocalData.Location = New System.Drawing.Point(6, 53) + Me.lblLocalData.Name = "lblLocalData" + Me.lblLocalData.Size = New System.Drawing.Size(62, 13) + Me.lblLocalData.TabIndex = 1 + Me.lblLocalData.Text = "Local Data:" ' 'btnMarkAsRestored ' @@ -807,6 +819,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() @@ -857,8 +870,8 @@ 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 lblLatestBackup As System.Windows.Forms.Label - Friend WithEvents lblCurrentBackup As System.Windows.Forms.Label + Friend WithEvents lblRemote As System.Windows.Forms.Label + Friend WithEvents lblLocalData As System.Windows.Forms.Label Friend WithEvents chkEnabled As System.Windows.Forms.CheckBox Friend WithEvents lblBackupFile As System.Windows.Forms.Label Friend WithEvents btnMarkAsRestored As System.Windows.Forms.Button @@ -883,9 +896,10 @@ Partial Class frmGameManager Friend WithEvents cmsFile As System.Windows.Forms.ToolStripMenuItem Friend WithEvents txtQuickFilter As TextBox Friend WithEvents lblQuickFilter As Label - Friend WithEvents btnChangeBackup As Button - Friend WithEvents lblLatestBackupData As Label - Friend WithEvents lblCurrentBackupData 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 End Class diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index f62e2f6..ee91915 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/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 @@ -193,7 +193,7 @@ 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) Next oLocalBackupData = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local) End If @@ -205,7 +205,7 @@ Public Class frmGameManager 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) Next oRemoteBackupData = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Remote) End If @@ -547,20 +547,51 @@ Public Class frmGameManager ModeChange() End Sub - Private Sub GetBackupInfo(ByVal oApp As clsGame) - Dim oBackupInfo As clsBackup + Private Sub UpdateBackupInfo(ByVal sManifestID As String) 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)) + + 'cboRemoteBackup + cboRemoteBackup.ValueMember = "Key" + cboRemoteBackup.DisplayMember = "Value" + If oRemoteBackupData.Contains(oApp.Name) Then + 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) - lblLatestBackupData.Text = mgrCommon.FormatString(frmGameManager_BackupTimeAndName, New String() {CurrentBackupItem.DateUpdated, CurrentBackupItem.UpdatedBy}) - lblLatestBackupData.ForeColor = Color.Green + sFileName = BackupFolder & CurrentBackupItem.FileName btnOpenBackupFile.Enabled = True btnOpenRestorePath.Enabled = True btnRestore.Enabled = True - btnChangeBackup.Enabled = True btnDeleteBackup.Enabled = True If File.Exists(sFileName) Then @@ -572,71 +603,75 @@ Public Class frmGameManager mgrRestore.DoPathOverride(CurrentBackupItem, oApp) lblRestorePathData.Text = CurrentBackupItem.RestorePath Else - lblLatestBackupData.Text = frmGameManager_Never + oComboItems.Add(New KeyValuePair(Of String, String)(String.Empty, frmGameManager_Never)) lblBackupFileData.Text = String.Empty lblRestorePathData.Text = String.Empty btnOpenBackupFile.Enabled = False btnOpenRestorePath.Enabled = False btnRestore.Enabled = False - btnChangeBackup.Enabled = False btnDeleteBackup.Enabled = False End If + cboRemoteBackup.DataSource = oComboItems + If oLocalBackupData.Contains(oApp.Name) Then oBackupInfo = DirectCast(oLocalBackupData(oApp.Name), clsBackup) - lblCurrentBackupData.Text = mgrCommon.FormatString(frmGameManager_BackupTimeAndName, New String() {oBackupInfo.DateUpdated, oBackupInfo.UpdatedBy}) + lblLocalBackupData.Text = mgrCommon.FormatString(frmGameManager_BackupTimeAndName, New String() {oBackupInfo.DateUpdated, oBackupInfo.UpdatedBy}) Else - lblCurrentBackupData.Text = frmGameManager_Never + lblLocalBackupData.Text = frmGameManager_Never End If - If lblLatestBackupData.Text = frmGameManager_Never And lblCurrentBackupData.Text = frmGameManager_Never Then + If oComboItems(0).Value = frmGameManager_Never And lblLocalBackupData.Text = frmGameManager_Never Then btnMarkAsRestored.Enabled = False - lblLatestBackupData.ForeColor = Color.Black - lblCurrentBackupData.ForeColor = Color.Black - ElseIf lblLatestBackupData.Text = frmGameManager_Never And lblCurrentBackupData.Text <> frmGameManager_Never Then + lblLocalBackupData.ForeColor = Color.Black + ElseIf oComboItems(0).Value = frmGameManager_Never And lblLocalBackupData.Text <> frmGameManager_Never Then btnMarkAsRestored.Enabled = False - lblLatestBackupData.ForeColor = Color.Black - lblCurrentBackupData.ForeColor = Color.Red - ElseIf lblLatestBackupData.Text <> lblCurrentBackupData.Text Then - lblCurrentBackupData.ForeColor = Color.Red + lblLocalBackupData.ForeColor = Color.Red + ElseIf oComboItems(0).Value <> lblLocalBackupData.Text Then + lblLocalBackupData.ForeColor = Color.Red btnMarkAsRestored.Enabled = True Else - lblCurrentBackupData.ForeColor = Color.Green + lblLocalBackupData.ForeColor = Color.Green btnMarkAsRestored.Enabled = False End If End Sub Private Sub DeleteBackup() - Dim oDir As DirectoryInfo - Dim sSubDir As String + 'Dim oDir As DirectoryInfo + 'Dim sSubDir As String - If mgrCommon.ShowMessage(frmGameManager_ConfirmBackupDelete, CurrentBackupItem.Name, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - mgrManifest.DoManifestDeletebyID(CurrentBackupItem, mgrSQLite.Database.Local) + 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) - If CurrentBackupItem.FileName.StartsWith(CurrentBackupItem.Name & Path.DirectorySeparatorChar) Then - 'Build sub-dir backup path - sSubDir = BackupFolder & CurrentBackupItem.Name + 'If CurrentBackupItem.FileName.StartsWith(CurrentBackupItem.Name & Path.DirectorySeparatorChar) Then + ' '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 + ' 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() @@ -665,6 +700,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 @@ -752,7 +788,9 @@ Public Class frmGameManager 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 @@ -783,7 +821,6 @@ Public Class frmGameManager btnBackup.Enabled = False btnMarkAsRestored.Enabled = False btnRestore.Enabled = False - btnChangeBackup.Enabled = False btnDeleteBackup.Enabled = False btnOpenBackupFile.Enabled = False btnOpenRestorePath.Enabled = False @@ -812,7 +849,6 @@ Public Class frmGameManager btnBackup.Enabled = False btnMarkAsRestored.Enabled = False btnRestore.Enabled = False - btnChangeBackup.Enabled = False btnDeleteBackup.Enabled = False btnOpenBackupFile.Enabled = False btnOpenRestorePath.Enabled = False @@ -966,6 +1002,16 @@ Public Class frmGameManager End If End Sub + Private Sub TimeStampModeChange() + If chkTimeStamp.Checked Then + nudLimit.Visible = True + lblLimit.Visible = True + Else + nudLimit.Visible = False + lblLimit.Visible = False + End If + End Sub + Private Sub EditApp() eCurrentMode = eModes.Edit ModeChange() @@ -1033,6 +1079,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 @@ -1148,53 +1195,6 @@ Public Class frmGameManager Return True End Function - Private Sub ChangeBackup() - Dim sNewBackup As String - Dim sNewBackupFile As String - Dim sNewBackupPath As String - Dim sBackupPath As String = Path.GetDirectoryName(BackupFolder & CurrentBackupItem.FileName) - Dim sBackupFile As String = Path.GetFileName(BackupFolder & CurrentBackupItem.FileName) - Dim oBackup As clsBackup = oCurrentBackupItem - - sNewBackup = mgrCommon.OpenFileBrowser(mgrCommon.FormatString(frmGameManager_BrowseBackup, CurrentGame.CroppedName), "7z", frmGameManager_BrowseBackupType, sBackupPath, False) - - 'Check that a selection was made - If sNewBackup <> String.Empty Then - sNewBackupFile = Path.GetFileName(sNewBackup) - sNewBackupPath = Path.GetDirectoryName(sNewBackup) - - 'The new file must be located in the current backup folder for the selected game - If sNewBackupPath <> sBackupPath Then - mgrCommon.ShowMessage(frmGameManager_ErrorBackupChangePath, CurrentGame.CroppedName, MsgBoxStyle.Exclamation) - 'Check that the selection is a new file - ElseIf sNewBackupFile = sBackupFile Then - mgrCommon.ShowMessage(frmGameManager_ErrorBackupChangeFileName, sNewBackupFile, MsgBoxStyle.Exclamation) - Else - 'Verify that the user still wants to continue - If mgrCommon.ShowMessage(frmGameManager_ConfirmBackupChange, New String() {sNewBackupFile, CurrentGame.CroppedName}, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - 'Set the new file - oBackup.FileName = oBackup.FileName.Replace(Path.GetFileName(oBackup.FileName), sNewBackupFile) - 'Clear the checksum (old checksums aren't stored) - oBackup.CheckSum = String.Empty - 'Reset date - oBackup.DateUpdated = Date.Now - mgrManifest.DoManifestUpdateByID(oBackup, mgrSQLite.Database.Remote) - 'Refresh backup data and GUI - bIsLoading = True - LoadBackupData() - GetBackupInfo(CurrentGame) - bIsLoading = False - 'Check if we want to restore immediately after changing - If mgrCommon.ShowMessage(frmGameManager_ConfirmBackupChangeRestore, sNewBackupFile, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - TriggerSelectedRestore(False) - End If - End If - - End If - End If - - End Sub - Private Sub MarkAsRestored() Dim oData As KeyValuePair(Of String, String) Dim oGameBackup As clsBackup @@ -1212,8 +1212,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, oMarkList(0).FileName, mgrSQLite.Database.Local) Then - mgrManifest.DoManifestUpdateByID(oMarkList(0), mgrSQLite.Database.Local) + If mgrManifest.DoGlobalManifestCheck(oMarkList(0).Name, mgrSQLite.Database.Local) Then + mgrManifest.DoManifestUpdateByName(oMarkList(0), mgrSQLite.Database.Local) Else mgrManifest.DoManifestAdd(oMarkList(0), mgrSQLite.Database.Local) End If @@ -1222,8 +1222,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, oGameBackup.FileName, mgrSQLite.Database.Local) Then - mgrManifest.DoManifestUpdateByID(oGameBackup, mgrSQLite.Database.Local) + If mgrManifest.DoGlobalManifestCheck(oGameBackup.Name, mgrSQLite.Database.Local) Then + mgrManifest.DoManifestUpdateByName(oGameBackup, mgrSQLite.Database.Local) Else mgrManifest.DoManifestAdd(oGameBackup, mgrSQLite.Database.Local) End If @@ -1293,25 +1293,35 @@ Public Class frmGameManager 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() - 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 - If Not oGame.MonitorOnly Then RestoreList.Add(oGame) - End If - Next + 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) + oBackup = DirectCast(oRemoteBackupData(oData.Value), clsBackup) + 'Filter out any games set to monitor only + If Not oGame.MonitorOnly Then RestoreList.Add(oGame, oBackup) + End If + Next + End If If RestoreList.Count = 1 Then bDoRestore = True - If Not mgrRestore.CheckManifest(RestoreList(0).Name) Then - sMsg = mgrCommon.FormatString(frmGameManager_ConfirmRestoreAnyway, RestoreList(0).Name) + oGame = New clsGame + 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 @@ -1399,11 +1409,10 @@ Public Class frmGameManager lblRestorePath.Text = frmGameManager_lblRestorePath btnOpenRestorePath.Text = frmGameManager_btnOpenRestorePath btnOpenBackupFile.Text = frmGameManager_btnOpenBackupFile - btnChangeBackup.Text = frmGameManager_btnChangeBackup btnDeleteBackup.Text = frmGameManager_btnDeleteBackup lblBackupFile.Text = frmGameManager_lblBackupFile - lblLatestBackup.Text = frmGameManager_lblLatestbackup - lblCurrentBackup.Text = frmGameManager_lblCurrentBackup + lblRemote.Text = frmGameManager_lblRemote + lblLocalData.Text = frmGameManager_lblLocalData btnIconBrowse.Text = frmGameManager_btnIconBrowse lblVersion.Text = frmGameManager_lblVersion lblCompany.Text = frmGameManager_lblCompany @@ -1427,6 +1436,7 @@ Public Class frmGameManager cmsOfficial.Text = frmGameManager_cmsOfficial cmsFile.Text = frmGameManager_cmsFile lblQuickFilter.Text = frmGameManager_lblQuickFilter + lblLimit.Text = frmGameManager_lblLimit 'Init Filter Timer tmFilterTimer = New Timer() @@ -1537,10 +1547,6 @@ Public Class frmGameManager DeleteBackup() End Sub - Private Sub btnChangeBackup_Click(sender As Object, e As EventArgs) Handles btnChangeBackup.Click - ChangeBackup() - End Sub - Private Sub btnMarkAsRestored_Click(sender As Object, e As EventArgs) Handles btnMarkAsRestored.Click MarkAsRestored() End Sub @@ -1576,6 +1582,16 @@ Public Class frmGameManager MonitorOnlyModeChange() End Sub + Private Sub chkTimeStamp_CheckedChanged(sender As Object, e As EventArgs) Handles chkTimeStamp.CheckedChanged + 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 cmsImport.Show(btnImport, New Drawing.Point(70, 11), ToolStripDropDownDirection.AboveRight) End Sub diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb index 8b622c3..4efdc73 100644 --- a/GBM/Forms/frmMain.vb +++ b/GBM/Forms/frmMain.vb @@ -157,8 +157,7 @@ Public Class frmMain OperationEnded() End Sub - Private Sub RunRestore(ByVal oRestoreList As List(Of clsGame)) - Dim oBackupData As SortedList = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Remote) + Private Sub RunRestore(ByVal oRestoreList As Hashtable) 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 diff --git a/GBM/Forms/frmSyncFields.Designer.vb b/GBM/Forms/frmSyncFields.Designer.vb index ffaa1d2..962f68a 100644 --- a/GBM/Forms/frmSyncFields.Designer.vb +++ b/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 diff --git a/GBM/Managers/mgrBackup.vb b/GBM/Managers/mgrBackup.vb index 776ee55..aca3638 100644 --- a/GBM/Managers/mgrBackup.vb +++ b/GBM/Managers/mgrBackup.vb @@ -50,15 +50,15 @@ Public Class mgrBackup oItem.CheckSum = sCheckSum 'Save Remote Manifest - If mgrManifest.DoManifestCheck(oItem.Name, oItem.FileName, mgrSQLite.Database.Remote) Then + If mgrManifest.DoSpecificManifestCheck(oItem.Name, oItem.FileName, mgrSQLite.Database.Remote) Then mgrManifest.DoManifestUpdateByID(oItem, mgrSQLite.Database.Remote) Else mgrManifest.DoManifestAdd(oItem, mgrSQLite.Database.Remote) End If 'Save Local Manifest - If mgrManifest.DoManifestCheck(oItem.Name, oItem.FileName, mgrSQLite.Database.Local) Then - mgrManifest.DoManifestUpdateByID(oItem, mgrSQLite.Database.Local) + If mgrManifest.DoGlobalManifestCheck(oItem.Name, mgrSQLite.Database.Local) Then + 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, ByVal sBackupPath As String) + 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 = sBackupPath & Path.DirectorySeparatorChar & oGameBackup.FileName + + mgrManifest.DoManifestDeletebyID(oGameBackup, mgrSQLite.Database.Remote) + mgrManifest.DoManifestDeletebyID(oGameBackup, mgrSQLite.Database.Local) + If File.Exists(sOldBackup) Then + mgrCommon.DeleteFile(sOldBackup) + End If + RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupLimitExceeded, New String() {oGame.Name, oGame.BackupLimit, 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 = sBackupFile & Path.DirectorySeparatorChar & oGame.Name & sTimeStamp & ".7z" Else sBackupFile = sBackupFile & Path.DirectorySeparatorChar & oGame.Name & ".7z" diff --git a/GBM/Managers/mgrManifest.vb b/GBM/Managers/mgrManifest.vb index 070d080..35a3ae8 100644 --- a/GBM/Managers/mgrManifest.vb +++ b/GBM/Managers/mgrManifest.vb @@ -54,43 +54,17 @@ End Function - Public Shared Function ReadManifestByGame(ByVal sGame As String, 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 * from manifest WHERE Name=@Name ORDER BY DateUpdated Desc" - oData = oDatabase.ReadParamData(sSQL, New Hashtable) - - For Each dr As DataRow In oData.Tables(0).Rows - 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")) - slList.Add(oBackupItem.ID, oBackupItem) - Next - - Return slList - - End Function - 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 oList As New List(Of clsBackup) Dim oBackupItem As New clsBackup + Dim oList As New List(Of clsBackup) + sSQL = "SELECT * from manifest " - sSQL &= "WHERE Name = @Name" + sSQL &= "WHERE Name = @Name ORDER BY DateUpdated Desc" hshParams.Add("Name", sName) @@ -112,7 +86,37 @@ Return oList End Function - Public Shared Function DoManifestCheck(ByVal sName As String, ByVal sFileName As String, ByVal iSelectDB As mgrSQLite.Database) As Boolean + 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 = 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")) + Next + + Return oBackupItem + End Function + + Public Shared Function DoSpecificManifestCheck(ByVal sName As String, ByVal sFileName As String, ByVal iSelectDB As mgrSQLite.Database) As Boolean Dim oDatabase As New mgrSQLite(iSelectDB) Dim oData As DataSet Dim sSQL As String @@ -134,6 +138,27 @@ End Function + 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 + Dim hshParams As New Hashtable + + sSQL = "SELECT * from manifest " + sSQL &= "WHERE Name = @Name" + + hshParams.Add("Name", sName) + + oData = oDatabase.ReadParamData(sSQL, hshParams) + + If oData.Tables(0).Rows.Count > 0 Then + Return True + Else + Return False + End If + + End Function + 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 @@ -246,7 +271,7 @@ Dim hshParams As New 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.Add("FileName", oBackupItem.FileName) diff --git a/GBM/Managers/mgrMonitorList.vb b/GBM/Managers/mgrMonitorList.vb index 77a5b77..a4c5633 100644 --- a/GBM/Managers/mgrMonitorList.vb +++ b/GBM/Managers/mgrMonitorList.vb @@ -75,6 +75,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 +100,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 = "(SELECT BackupLimit FROM monitorlist WHERE MonitorID=@ID),0)" End If If (eSyncFields And clsGame.eOptionalSyncFields.Version) = clsGame.eOptionalSyncFields.Version Then sVersion = "@Version" @@ -108,11 +111,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 +147,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) @@ -329,9 +333,9 @@ Public Class mgrMonitorList 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" + 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 FROM monitorlist" + 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 (" @@ -353,7 +357,7 @@ Public Class mgrMonitorList 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 = "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 @@ -365,7 +369,7 @@ Public Class mgrMonitorList 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 " + 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 & ")" @@ -378,7 +382,7 @@ Public Class mgrMonitorList 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" + 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 @@ -416,6 +420,7 @@ Public Class mgrMonitorList 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")) hshList.Add(oGame.ID, oGame) Next @@ -482,6 +487,7 @@ Public Class mgrMonitorList 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")) Select Case eListType Case eListTypes.FullList @@ -506,7 +512,7 @@ Public Class mgrMonitorList 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)" + sSQL &= "@ExcludeList, @ProcessPath, @Icon, @Hours, @Version, @Company, @Enabled, @MonitorOnly, @BackupLimit)" 'Parameters hshParams.Add("ID", oGame.ID) @@ -525,6 +531,7 @@ Public Class mgrMonitorList hshParams.Add("Company", oGame.Company) hshParams.Add("Enabled", oGame.Enabled) hshParams.Add("MonitorOnly", oGame.MonitorOnly) + hshParams.Add("BackupLimit", oGame.BackupLimit) oDatabase.RunParamQuery(sSQL, hshParams) @@ -537,7 +544,7 @@ Public Class mgrMonitorList 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" + sSQL &= "Hours=@Hours, Version=@Version, Company=@Company, Enabled=@Enabled, MonitorOnly=@MonitorOnly, BackupLimit=@BackupLimit WHERE MonitorID=@ID" 'Parameters hshParams.Add("Name", oGame.Name) @@ -556,6 +563,7 @@ Public Class mgrMonitorList hshParams.Add("Enabled", oGame.Enabled) hshParams.Add("MonitorOnly", oGame.MonitorOnly) hshParams.Add("ID", oGame.ID) + hshParams.Add("BackupLimit", oGame.BackupLimit) oDatabase.RunParamQuery(sSQL, hshParams) @@ -667,6 +675,7 @@ Public Class mgrMonitorList 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")) Next Return oGame @@ -706,6 +715,7 @@ Public Class mgrMonitorList 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")) hshGames.Add(iCounter, oGame) iCounter += 1 Next diff --git a/GBM/Managers/mgrRestore.vb b/GBM/Managers/mgrRestore.vb index 7e37371..ca8f903 100644 --- a/GBM/Managers/mgrRestore.vb +++ b/GBM/Managers/mgrRestore.vb @@ -268,8 +268,8 @@ Public Class mgrRestore If bRestoreCompleted Then 'Save Local Manifest - If mgrManifest.DoManifestCheck(oBackupInfo.Name, oBackupInfo.FileName, mgrSQLite.Database.Local) Then - mgrManifest.DoManifestUpdateByID(oBackupInfo, mgrSQLite.Database.Local) + If mgrManifest.DoGlobalManifestCheck(oBackupInfo.Name, mgrSQLite.Database.Local) Then + mgrManifest.DoManifestUpdateByName(oBackupInfo, mgrSQLite.Database.Local) Else mgrManifest.DoManifestAdd(oBackupInfo, mgrSQLite.Database.Local) End If diff --git a/GBM/Managers/mgrSQLite.vb b/GBM/Managers/mgrSQLite.vb index 994ee8a..843687e 100644 --- a/GBM/Managers/mgrSQLite.vb +++ b/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); " @@ -117,7 +117,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 (Remote Manifest) sSql &= "CREATE TABLE manifest (ManifestID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, " & @@ -567,6 +567,10 @@ Public Class mgrSQLite 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) @@ -583,6 +587,10 @@ Public Class mgrSQLite 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 2;" + sSQL &= "PRAGMA user_version=98" RunParamQuery(sSQL, New Hashtable) diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 04c24f8..cc47a4b 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -1312,7 +1312,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Timestamp each backup. + ''' Looks up a localized string similar to Save multiple backups. ''' Friend ReadOnly Property frmGameManager_chkTimeStamp() As String Get @@ -1420,7 +1420,7 @@ Namespace My.Resources End Property ''' - ''' 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 This will delete the selected backup file. This cannot be undone. [BR][BR]Do you want to delete [PARAM]?. ''' Friend ReadOnly Property frmGameManager_ConfirmBackupDelete() As String Get @@ -1770,15 +1770,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized string similar to Current Backup:. - ''' - Friend ReadOnly Property frmGameManager_lblCurrentBackup() As String - Get - Return ResourceManager.GetString("frmGameManager_lblCurrentBackup", resourceCulture) - End Get - End Property - ''' ''' Looks up a localized string similar to Game Path:. ''' @@ -1807,11 +1798,20 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Latest Backup:. + ''' Looks up a localized string similar to Backup Limit. ''' - Friend ReadOnly Property frmGameManager_lblLatestbackup() As String + Friend ReadOnly Property frmGameManager_lblLimit() As String Get - Return ResourceManager.GetString("frmGameManager_lblLatestbackup", resourceCulture) + Return ResourceManager.GetString("frmGameManager_lblLimit", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Local Data:. + ''' + Friend ReadOnly Property frmGameManager_lblLocalData() As String + Get + Return ResourceManager.GetString("frmGameManager_lblLocalData", resourceCulture) End Get End Property @@ -1842,6 +1842,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Backup Data:. + ''' + Friend ReadOnly Property frmGameManager_lblRemote() As String + Get + Return ResourceManager.GetString("frmGameManager_lblRemote", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Restore Path:. ''' @@ -3913,7 +3922,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Time stamp each backup. + ''' Looks up a localized string similar to Save multiple backups. ''' Friend ReadOnly Property frmSyncFields_chkTimeStamp() As String Get @@ -4357,6 +4366,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to [PARAM] backup limit ([PARAM]) exceeded. [PARAM] was automatically removed.. + ''' + Friend ReadOnly Property mgrBackup_BackupLimitExceeded() As String + Get + Return ResourceManager.GetString("mgrBackup_BackupLimitExceeded", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to [PARAM] backup finished with warnings or errors.. ''' diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 9836e11..0a1e2b3 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -503,7 +503,7 @@ Monitor only - Timestamp each backup + Save multiple backups Choose a custom icon for the game @@ -527,7 +527,7 @@ Are you sure you want to run a backup for [PARAM]? This will close the form. - 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]? + This will delete the selected backup file. This cannot be undone. [BR][BR]Do you want to delete [PARAM]? 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? @@ -616,8 +616,8 @@ Company: - - Latest Backup: + + Backup Data: Backup File: @@ -631,8 +631,8 @@ Icon: - - Current Backup: + + Local Data: Name: @@ -1652,7 +1652,7 @@ Monitor this game - Time stamp each backup + Save multiple backups Version @@ -1714,4 +1714,10 @@ You cannot choose a file located outside the current [PARAM] backup folder. + + Backup Limit + + + [PARAM] backup limit ([PARAM]) exceeded. [PARAM] was automatically removed. + \ No newline at end of file From 87f93ed4f5b1a87d19618a29b6813d32b4f5c67f Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Sun, 21 Aug 2016 23:11:26 -0600 Subject: [PATCH 3/8] Updates and fixes for pass 2 --- GBM/Forms/frmGameManager.Designer.vb | 27 +++++++++++ GBM/Forms/frmGameManager.resx | 3 ++ GBM/Forms/frmGameManager.vb | 69 ++++++++++++++++++---------- GBM/Managers/mgrBackup.vb | 2 +- GBM/Managers/mgrManifest.vb | 9 ++-- GBM/My Project/Resources.Designer.vb | 24 ++++++++-- GBM/My Project/Resources.resx | 12 +++-- 7 files changed, 113 insertions(+), 33 deletions(-) diff --git a/GBM/Forms/frmGameManager.Designer.vb b/GBM/Forms/frmGameManager.Designer.vb index b9f31ff..f06a0ee 100644 --- a/GBM/Forms/frmGameManager.Designer.vb +++ b/GBM/Forms/frmGameManager.Designer.vb @@ -92,6 +92,9 @@ 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() @@ -100,6 +103,7 @@ Partial Class frmGameManager Me.grpStats.SuspendLayout() Me.grpFilter.SuspendLayout() Me.cmsImport.SuspendLayout() + Me.cmsDeleteBackup.SuspendLayout() Me.SuspendLayout() ' 'btnAdd @@ -785,6 +789,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(128, 70) + ' + 'cmsDeleteOne + ' + Me.cmsDeleteOne.Name = "cmsDeleteOne" + Me.cmsDeleteOne.Size = New System.Drawing.Size(127, 22) + Me.cmsDeleteOne.Text = "&Selected File" + ' + 'cmsDeleteAll + ' + Me.cmsDeleteAll.Name = "cmsDeleteAll" + Me.cmsDeleteAll.Size = New System.Drawing.Size(127, 22) + Me.cmsDeleteAll.Text = "&All Files" + ' 'frmGameManager ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -829,6 +852,7 @@ Partial Class frmGameManager Me.grpFilter.ResumeLayout(False) Me.grpFilter.PerformLayout() Me.cmsImport.ResumeLayout(False) + Me.cmsDeleteBackup.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -902,4 +926,7 @@ Partial Class frmGameManager 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 diff --git a/GBM/Forms/frmGameManager.resx b/GBM/Forms/frmGameManager.resx index 82082bf..aa8299a 100644 --- a/GBM/Forms/frmGameManager.resx +++ b/GBM/Forms/frmGameManager.resx @@ -120,4 +120,7 @@ 17, 17 + + 127, 17 + \ No newline at end of file diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index ee91915..667bdee 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -637,9 +637,36 @@ Public Class frmGameManager End Sub + Private Sub DeleteAllBackups() + Dim oBackupData As List(Of clsBackup) + Dim oBackup As clsBackup + + If mgrCommon.ShowMessage(frmGameManager_ConfirmBackupDeleteAll, CurrentGame.Name, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then + oBackupData = mgrManifest.DoManifestGetByName(CurrentGame.Name, 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) + 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() - 'Dim oDir As DirectoryInfo - 'Dim sSubDir As String If mgrCommon.ShowMessage(frmGameManager_ConfirmBackupDelete, Path.GetFileName(CurrentBackupItem.FileName), MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then 'Delete the specific remote manifest entry @@ -653,26 +680,6 @@ Public Class frmGameManager '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) - 'If CurrentBackupItem.FileName.StartsWith(CurrentBackupItem.Name & Path.DirectorySeparatorChar) Then - ' '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() If oCurrentGame.Temporary Then @@ -1008,6 +1015,7 @@ Public Class frmGameManager lblLimit.Visible = True Else nudLimit.Visible = False + nudLimit.Value = nudLimit.Minimum lblLimit.Visible = False End If End Sub @@ -1300,7 +1308,8 @@ Public Class frmGameManager RestoreList.Clear() If lstGames.SelectedItems.Count = 1 Then - RestoreList.Add(CurrentGame, CurrentBackupItem) + 'Filter out any games set to monitor only + If Not CurrentGame.MonitorOnly Then RestoreList.Add(CurrentGame, CurrentBackupItem) Else For Each oData In lstGames.SelectedItems If oRemoteBackupData.Contains(oData.Value) Then @@ -1437,6 +1446,8 @@ Public Class frmGameManager 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() @@ -1544,9 +1555,21 @@ 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 MarkAsRestored() End Sub diff --git a/GBM/Managers/mgrBackup.vb b/GBM/Managers/mgrBackup.vb index aca3638..df1b449 100644 --- a/GBM/Managers/mgrBackup.vb +++ b/GBM/Managers/mgrBackup.vb @@ -50,7 +50,7 @@ Public Class mgrBackup oItem.CheckSum = sCheckSum 'Save Remote Manifest - If mgrManifest.DoSpecificManifestCheck(oItem.Name, oItem.FileName, mgrSQLite.Database.Remote) Then + If mgrManifest.DoSpecificManifestCheck(oItem, mgrSQLite.Database.Remote) Then mgrManifest.DoManifestUpdateByID(oItem, mgrSQLite.Database.Remote) Else mgrManifest.DoManifestAdd(oItem, mgrSQLite.Database.Remote) diff --git a/GBM/Managers/mgrManifest.vb b/GBM/Managers/mgrManifest.vb index 35a3ae8..a7a15ee 100644 --- a/GBM/Managers/mgrManifest.vb +++ b/GBM/Managers/mgrManifest.vb @@ -116,7 +116,7 @@ Return oBackupItem End Function - Public Shared Function DoSpecificManifestCheck(ByVal sName As String, ByVal sFileName As String, ByVal iSelectDB As mgrSQLite.Database) As Boolean + 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 @@ -125,12 +125,15 @@ sSQL = "SELECT * from manifest " sSQL &= "WHERE Name = @Name AND FileName = @FileName" - hshParams.Add("Name", sName) - hshParams.Add("FileName", sFileName) + 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 diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index cc47a4b..cac209b 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -1374,6 +1374,24 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to &All Files. + ''' + Friend ReadOnly Property frmGameManager_cmsDeleteAll() As String + Get + Return ResourceManager.GetString("frmGameManager_cmsDeleteAll", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to &Selected File. + ''' + Friend ReadOnly Property frmGameManager_cmsDeleteOne() As String + Get + Return ResourceManager.GetString("frmGameManager_cmsDeleteOne", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to &File.... ''' @@ -1429,11 +1447,11 @@ Namespace My.Resources End Property ''' - ''' 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?. ''' - 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 diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 0a1e2b3..96d9992 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -529,9 +529,6 @@ This will delete the selected backup file. This cannot be undone. [BR][BR]Do you want to delete [PARAM]? - - 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? - 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. @@ -1720,4 +1717,13 @@ [PARAM] backup limit ([PARAM]) exceeded. [PARAM] was automatically removed. + + &All Files + + + &Selected File + + + This will delete all backup files for [PARAM]. This cannot be undone. [BR][BR]Do you want to continue? + \ No newline at end of file From 4108ec36d7b9cc75e176337f1b19f1af35951f07 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Mon, 22 Aug 2016 13:29:38 -0600 Subject: [PATCH 4/8] Upgrade fix and message changes --- GBM/Managers/mgrBackup.vb | 2 +- GBM/Managers/mgrManifest.vb | 123 +++++++++------------------ GBM/Managers/mgrSQLite.vb | 2 +- GBM/My Project/Resources.Designer.vb | 2 +- GBM/My Project/Resources.resx | 2 +- 5 files changed, 45 insertions(+), 86 deletions(-) diff --git a/GBM/Managers/mgrBackup.vb b/GBM/Managers/mgrBackup.vb index df1b449..0946e2f 100644 --- a/GBM/Managers/mgrBackup.vb +++ b/GBM/Managers/mgrBackup.vb @@ -129,7 +129,7 @@ Public Class mgrBackup If File.Exists(sOldBackup) Then mgrCommon.DeleteFile(sOldBackup) End If - RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupLimitExceeded, New String() {oGame.Name, oGame.BackupLimit, Path.GetFileName(sOldBackup)}), False, ToolTipIcon.Info, True) + RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupLimitExceeded, Path.GetFileName(sOldBackup)), False, ToolTipIcon.Info, True) Next End If End Sub diff --git a/GBM/Managers/mgrManifest.vb b/GBM/Managers/mgrManifest.vb index a7a15ee..4952af5 100644 --- a/GBM/Managers/mgrManifest.vb +++ b/GBM/Managers/mgrManifest.vb @@ -1,5 +1,36 @@ Public Class mgrManifest + 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 @@ -11,15 +42,7 @@ oData = oDatabase.ReadParamData(sSQL, New Hashtable) For Each dr As DataRow In oData.Tables(0).Rows - 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")) + oBackupItem = MapToObject(dr) slList.Add(oBackupItem.ID, oBackupItem) Next @@ -38,15 +61,7 @@ oData = oDatabase.ReadParamData(sSQL, New Hashtable) For Each dr As DataRow In oData.Tables(0).Rows - 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")) + oBackupItem = MapToObject(dr) slList.Add(oBackupItem.Name, oBackupItem) Next @@ -71,15 +86,7 @@ oData = oDatabase.ReadParamData(sSQL, hshParams) For Each dr As DataRow In oData.Tables(0).Rows - 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")) + oBackupItem = MapToObject(dr) oList.Add(oBackupItem) Next @@ -102,15 +109,7 @@ oData = oDatabase.ReadParamData(sSQL, hshParams) For Each dr As DataRow In oData.Tables(0).Rows - 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")) + oBackupItem = MapToObject(dr) Next Return oBackupItem @@ -186,18 +185,11 @@ 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 INTO manifest VALUES (@ID, @Name, @FileName, @Path, @AbsolutePath, @DateUpdated, @UpdatedBy, @CheckSum)" - 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) + hshParams = SetCoreParameters(oBackupItem) oDatabase.RunParamQuery(sSQL, hshParams) End Sub @@ -205,18 +197,12 @@ 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.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 = SetCoreParameters(oBackupItem) hshParams.Add("QueryName", oBackupItem.Name) oDatabase.RunParamQuery(sSQL, hshParams) @@ -225,18 +211,12 @@ 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 ManifestID = @QueryID" - 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) + hshParams = SetCoreParameters(oBackupItem) hshParams.Add("QueryID", oBackupItem.ID) oDatabase.RunParamQuery(sSQL, hshParams) @@ -268,27 +248,6 @@ oDatabase.RunParamQuery(sSQL, hshParams) End Sub - Public Shared Sub DoManifestNameUpdate(ByVal sOriginalName As String, 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 = "UPDATE manifest SET Name = @Name, FileName = @FileName, RestorePath = @Path, AbsolutePath = @AbsolutePath, " - sSQL &= "DateUpdated = @DateUpdated, UpdatedBy = @UpdatedBy, CheckSum = @CheckSum WHERE ManifestID = @QueryID" - - 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) - hshParams.Add("QueryName", sOriginalName) - - 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) diff --git a/GBM/Managers/mgrSQLite.vb b/GBM/Managers/mgrSQLite.vb index 843687e..d9c6b6f 100644 --- a/GBM/Managers/mgrSQLite.vb +++ b/GBM/Managers/mgrSQLite.vb @@ -589,7 +589,7 @@ Public Class mgrSQLite 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 2;" + sSQL = "ALTER TABLE monitorlist ADD COLUMN BackupLimit INTEGER NOT NULL DEFAULT 5;" sSQL &= "PRAGMA user_version=98" diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index cac209b..c553bbb 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -4385,7 +4385,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to [PARAM] backup limit ([PARAM]) exceeded. [PARAM] was automatically removed.. + ''' Looks up a localized string similar to [PARAM] was automatically removed.. ''' Friend ReadOnly Property mgrBackup_BackupLimitExceeded() As String Get diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 96d9992..4993a9d 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -1715,7 +1715,7 @@ Backup Limit - [PARAM] backup limit ([PARAM]) exceeded. [PARAM] was automatically removed. + [PARAM] was automatically removed. &All Files From 7a93fd799bf2920a0c5b6088b14c4223a0a10b95 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Mon, 22 Aug 2016 14:43:39 -0600 Subject: [PATCH 5/8] Database upgrade fix --- GBM/Managers/mgrSQLite.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GBM/Managers/mgrSQLite.vb b/GBM/Managers/mgrSQLite.vb index d9c6b6f..add2a4a 100644 --- a/GBM/Managers/mgrSQLite.vb +++ b/GBM/Managers/mgrSQLite.vb @@ -569,7 +569,7 @@ Public Class mgrSQLite 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 &= "ALTER TABLE monitorlist ADD COLUMN BackupLimit INTEGER NOT NULL DEFAULT 5;" sSQL &= "PRAGMA user_version=98" @@ -589,7 +589,7 @@ Public Class mgrSQLite 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 &= "ALTER TABLE monitorlist ADD COLUMN BackupLimit INTEGER NOT NULL DEFAULT 5;" sSQL &= "PRAGMA user_version=98" From 77b5efbe025325504735d00fa7daceb50aa38ba5 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Tue, 23 Aug 2016 10:14:12 -0600 Subject: [PATCH 6/8] Manifest Re-write (Clean-up, Pass 3) --- GBM/Forms/frmAddWizard.Designer.vb | 57 +- GBM/Forms/frmAddWizard.vb | 33 +- GBM/Forms/frmGameManager.vb | 3 +- GBM/Managers/mgrManifest.vb | 2 + GBM/Managers/mgrMonitorList.vb | 783 +++++++++++++-------------- GBM/Managers/mgrTags.vb | 42 +- GBM/Managers/mgrVariables.vb | 47 +- GBM/My Project/Resources.Designer.vb | 17 +- GBM/My Project/Resources.resx | 11 +- 9 files changed, 520 insertions(+), 475 deletions(-) diff --git a/GBM/Forms/frmAddWizard.Designer.vb b/GBM/Forms/frmAddWizard.Designer.vb index 61affdd..e17bada 100644 --- a/GBM/Forms/frmAddWizard.Designer.vb +++ b/GBM/Forms/frmAddWizard.Designer.vb @@ -66,6 +66,8 @@ Partial Class frmAddWizard Me.btnCancel = New System.Windows.Forms.Button() Me.btnNext = New System.Windows.Forms.Button() Me.btnBack = New System.Windows.Forms.Button() + Me.lblLimit = New System.Windows.Forms.Label() + Me.nudLimit = New System.Windows.Forms.NumericUpDown() Me.tabWizard.SuspendLayout() Me.tbPage1.SuspendLayout() Me.tbPage2.SuspendLayout() @@ -73,6 +75,7 @@ Partial Class frmAddWizard Me.tbPage3a.SuspendLayout() Me.tbPage4.SuspendLayout() Me.tbPage5.SuspendLayout() + CType(Me.nudLimit, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'tabWizard @@ -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" & _ - "ay drag and drop a shortcut here to complete this step, only Windows shortcuts a" & _ + 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" & "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) @@ -230,32 +235,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 " & _ - "is checked. You can also time stamp your backup files to make incremental backu" & _ - "ps." + Me.lblStep3Instructions.Text = "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." ' '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 +357,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 +439,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 @@ -516,6 +521,27 @@ Partial Class frmAddWizard Me.btnBack.Text = "&Back" Me.btnBack.UseVisualStyleBackColor = True ' + '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.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + Me.nudLimit.Value = New Decimal(New Integer() {2, 0, 0, 0}) + Me.nudLimit.Visible = False + ' 'frmAddWizard ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -545,6 +571,7 @@ Partial Class frmAddWizard Me.tbPage4.PerformLayout() Me.tbPage5.ResumeLayout(False) Me.tbPage5.PerformLayout() + CType(Me.nudLimit, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -591,4 +618,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 diff --git a/GBM/Forms/frmAddWizard.vb b/GBM/Forms/frmAddWizard.vb index a0ae70d..3cd6c95 100644 --- a/GBM/Forms/frmAddWizard.vb +++ b/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 @@ -86,6 +109,7 @@ Public Class frmAddWizard 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 @@ -117,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)} @@ -133,6 +157,7 @@ Public Class frmAddWizard oGame.FolderSave = bFolderBackup oGame.FileType = sFileType oGame.AppendTimeStamp = bTimeStamp + oGame.BackupLimit = iLimit oGame.ExcludeList = sExcludeList Return oGame @@ -501,6 +526,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) @@ -510,4 +539,6 @@ Public Class frmAddWizard OpenBuilder(frmAddWizard_Exclude, txtExcludeList) UpdateBuilderLabel(txtExcludeList.Text, lblExclude) End Sub + + End Class \ No newline at end of file diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index 667bdee..d3c4aa4 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -171,7 +171,7 @@ Public Class frmGameManager 'Local If mgrManifest.DoManifestNameCheck(oOriginalApp.Name, mgrSQLite.Database.Local) Then 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 @@ -1013,6 +1013,7 @@ Public Class frmGameManager If chkTimeStamp.Checked Then nudLimit.Visible = True lblLimit.Visible = True + nudLimit.Value = 5 Else nudLimit.Visible = False nudLimit.Value = nudLimit.Minimum diff --git a/GBM/Managers/mgrManifest.vb b/GBM/Managers/mgrManifest.vb index 4952af5..f9d182c 100644 --- a/GBM/Managers/mgrManifest.vb +++ b/GBM/Managers/mgrManifest.vb @@ -115,6 +115,7 @@ 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 @@ -140,6 +141,7 @@ 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 diff --git a/GBM/Managers/mgrMonitorList.vb b/GBM/Managers/mgrMonitorList.vb index a4c5633..8bfcaa9 100644 --- a/GBM/Managers/mgrMonitorList.vb +++ b/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) - Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Remote) - Dim iGameCount As Integer + Private Shared Function MapToObject(ByVal dr As DataRow) As clsGame + Dim oGame As New clsGame - '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() + 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")) + oGame.BackupLimit = CInt(dr("BackupLimit")) - 'See if the remote database is empty - iGameCount = mgrMonitorList.ReadList(eListTypes.FullList, mgrSQLite.Database.Remote).Count + Return oGame + End Function - '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 - mgrMonitorList.SyncMonitorLists(oSettings.SyncFields, False) - End If - Else - mgrMonitorList.SyncMonitorLists(oSettings.SyncFields) - End If + Private Shared Function SetCoreParameters(ByVal oGame As clsGame) As Hashtable + Dim hshParams As New Hashtable + + 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) + 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 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 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, BackupLimit=@BackupLimit WHERE MonitorID=@ID" + + 'Parameters + hshParams = SetCoreParameters(oGame) + + 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 = 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 - mgrMonitorList.SyncMonitorLists(oSettings.SyncFields) + Return False End If - End Sub - - Public Shared Sub ExportMonitorList(ByVal sLocation As String) - Dim oList As List(Of Game) - Dim bSuccess As Boolean = False - Dim oTagFilters As New List(Of clsTag) - Dim oStringFilters As New Hashtable - 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 + 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) @@ -260,73 +464,7 @@ Public Class mgrMonitorList Application.DoEvents() End Sub - Private Shared Sub ImportMonitorList(ByVal sLocation As String, Optional ByVal bWebRead As Boolean = False) - Dim hshCompareFrom As Hashtable - Dim hshCompareTo As Hashtable - Dim hshSyncItems As Hashtable - Dim oFromItem As clsGame - Dim oToItem As clsGame - - Cursor.Current = Cursors.WaitCursor - - 'Add / Update Sync - hshCompareFrom = mgrXML.ReadMonitorList(sLocation, bWebRead) - hshCompareTo = ReadList(eListTypes.FullList, mgrSQLite.Database.Local) - - hshSyncItems = hshCompareFrom.Clone - - For Each oFromItem In hshCompareFrom.Values - If hshCompareTo.Contains(oFromItem.CompoundKey) Then - oToItem = DirectCast(hshCompareTo(oFromItem.CompoundKey), clsGame) - If oFromItem.CoreEquals(oToItem) Then - hshSyncItems.Remove(oFromItem.CompoundKey) - End If - End If - Next - - Cursor.Current = Cursors.Default - - If hshSyncItems.Count > 0 Then - Dim frm As New frmAdvancedImport - frm.ImportData = hshSyncItems - If frm.ShowDialog() = DialogResult.OK Then - Cursor.Current = Cursors.WaitCursor - - DoListAddUpdateSync(frm.FinalData) - mgrTags.DoTagAddImport(frm.FinalData) - - Cursor.Current = Cursors.Default - mgrCommon.ShowMessage(mgrMonitorList_ImportComplete, MsgBoxStyle.Information) - End If - Else - mgrCommon.ShowMessage(mgrMonitorList_ImportNothing, MsgBoxStyle.Information) - End If - - Application.DoEvents() - End Sub - - 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 - + '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 @@ -403,24 +541,7 @@ Public Class mgrMonitorList 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")) - oGame.BackupLimit = CInt(dr("BackupLimit")) + oGame = MapToObject(dr) hshList.Add(oGame.ID, oGame) Next @@ -428,6 +549,8 @@ Public Class mgrMonitorList 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 @@ -458,294 +581,122 @@ Public Class mgrMonitorList 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")) - oGame.BackupLimit = CInt(dr("BackupLimit")) - - 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, @BackupLimit)" - - '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) - hshParams.Add("BackupLimit", oGame.BackupLimit) - - 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, BackupLimit=@BackupLimit 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) - hshParams.Add("BackupLimit", oGame.BackupLimit) - - 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")) - oGame.BackupLimit = CInt(dr("BackupLimit")) - 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")) - oGame.BackupLimit = CInt(dr("BackupLimit")) - 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 + 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 - Return False + 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 + Dim hshSyncItems As Hashtable + Dim oFromItem As clsGame + Dim oToItem As clsGame + + Cursor.Current = Cursors.WaitCursor + + 'Add / Update Sync + hshCompareFrom = mgrXML.ReadMonitorList(sLocation, bWebRead) + hshCompareTo = ReadList(eListTypes.FullList, mgrSQLite.Database.Local) + + hshSyncItems = hshCompareFrom.Clone + + For Each oFromItem In hshCompareFrom.Values + If hshCompareTo.Contains(oFromItem.CompoundKey) Then + oToItem = DirectCast(hshCompareTo(oFromItem.CompoundKey), clsGame) + If oFromItem.CoreEquals(oToItem) Then + hshSyncItems.Remove(oFromItem.CompoundKey) + End If + End If + Next + + Cursor.Current = Cursors.Default + + If hshSyncItems.Count > 0 Then + Dim frm As New frmAdvancedImport + frm.ImportData = hshSyncItems + If frm.ShowDialog() = DialogResult.OK Then + Cursor.Current = Cursors.WaitCursor + + DoListAddUpdateSync(frm.FinalData) + mgrTags.DoTagAddImport(frm.FinalData) + + Cursor.Current = Cursors.Default + mgrCommon.ShowMessage(mgrMonitorList_ImportComplete, MsgBoxStyle.Information) + End If + Else + mgrCommon.ShowMessage(mgrMonitorList_ImportNothing, MsgBoxStyle.Information) + End If + + Application.DoEvents() + End Sub + + Public Shared Sub ExportMonitorList(ByVal sLocation As String) + Dim oList As List(Of Game) + Dim bSuccess As Boolean = False + Dim oTagFilters As New List(Of clsTag) + Dim oStringFilters As New Hashtable + 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 + mgrMonitorList.SyncMonitorLists(oSettings.SyncFields, False) + End If + Else + mgrMonitorList.SyncMonitorLists(oSettings.SyncFields) + End If + Else + mgrMonitorList.SyncMonitorLists(oSettings.SyncFields) + End If + End Sub End Class diff --git a/GBM/Managers/mgrTags.vb b/GBM/Managers/mgrTags.vb index ff38d32..95c84fa 100644 --- a/GBM/Managers/mgrTags.vb +++ b/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.Add("ID", oTag.ID) + hshParams = SetCoreParameters(oTag) 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.ID = CStr(dr("TagID")) - oTag.Name = CStr(dr("Name")) + oTag = MapToObject(dr) 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.ID = CStr(dr("TagID")) - oTag.Name = CStr(dr("Name")) + oTag = MapToObject(dr) 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.ID = CStr(dr("TagID")) - oTag.Name = CStr(dr("Name")) + oTag = MapToObject(dr) hshList.Add(oTag.Name, oTag) Next diff --git a/GBM/Managers/mgrVariables.vb b/GBM/Managers/mgrVariables.vb index 16f0968..04613a9 100644 --- a/GBM/Managers/mgrVariables.vb +++ b/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.Add("Name", oCustomVariable.Name) - hshParams.Add("Path", oCustomVariable.Path) + hshParams = SetCoreParameters(oCustomVariable) 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.Add("Path", oCustomVariable.Path) - hshParams.Add("ID", oCustomVariable.ID) + hshParams = SetCoreParameters(oCustomVariable) 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.ID = CStr(dr("VariableID")) - oCustomVariable.Name = CStr(dr("Name")) - oCustomVariable.Path = CStr(dr("Path")) + oCustomVariable = MapToObject(dr) 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.ID = CStr(dr("VariableID")) - oCustomVariable.Name = CStr(dr("Name")) - oCustomVariable.Path = CStr(dr("Path")) + oCustomVariable = MapToObject(dr) 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.ID = CStr(dr("VariableID")) - oCustomVariable.Name = CStr(dr("Name")) - oCustomVariable.Path = CStr(dr("Path")) + oCustomVariable = MapToObject(dr) hshList.Add(oCustomVariable.Name, oCustomVariable) Next diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index c553bbb..1e362f6 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -259,7 +259,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Save Entire Folder. + ''' Looks up a localized string similar to Save entire folder. ''' Friend ReadOnly Property frmAddWizard_chkFolderSave() As String Get @@ -268,7 +268,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Time Stamp Backup. + ''' Looks up a localized string similar to Save multiple backups. ''' Friend ReadOnly Property frmAddWizard_chkTimeStamp() As String Get @@ -501,6 +501,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Backup Limit. + ''' + Friend ReadOnly Property frmAddWizard_lblLimit() As String + Get + Return ResourceManager.GetString("frmAddWizard_lblLimit", resourceCulture) + End Get + End Property + ''' ''' 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.. ''' @@ -574,7 +583,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to 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.. + ''' Looks up a localized string similar to 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.. ''' Friend ReadOnly Property frmAddWizard_lblStep3Instructions() As String Get @@ -709,7 +718,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Timestamp. + ''' Looks up a localized string similar to Multiple Backups. ''' Friend ReadOnly Property frmAddWizard_Summary_Timestamp() As String Get diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 4993a9d..a5d7a7a 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -701,10 +701,10 @@ ... - Save Entire Folder + Save entire folder - Time Stamp Backup + Save multiple backups Choose exe file that starts the game @@ -806,7 +806,7 @@ Choose Files to Backup - 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. + 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. Choose the location of your game's save files: @@ -851,7 +851,7 @@ Save Path - Timestamp + Multiple Backups &Cancel @@ -1726,4 +1726,7 @@ This will delete all backup files for [PARAM]. This cannot be undone. [BR][BR]Do you want to continue? + + Backup Limit + \ No newline at end of file From a092c1b44f4f18451313dbfd6227e19dabce4a78 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Tue, 23 Aug 2016 15:35:57 -0600 Subject: [PATCH 7/8] Fixed delete bug with sub-directories enabled --- GBM/Managers/mgrBackup.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GBM/Managers/mgrBackup.vb b/GBM/Managers/mgrBackup.vb index 0946e2f..7c625d1 100644 --- a/GBM/Managers/mgrBackup.vb +++ b/GBM/Managers/mgrBackup.vb @@ -107,7 +107,7 @@ Public Class mgrBackup Return True End Function - Private Sub CheckOldBackups(ByVal oGame As clsGame, ByVal sBackupPath As String) + 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 @@ -122,7 +122,7 @@ Public Class mgrBackup 'Delete the oldest backup(s) (Manifest entry and backup file) For i = 1 To iDelCount oGameBackup = oGameBackups(oGameBackups.Count - i) - sOldBackup = sBackupPath & Path.DirectorySeparatorChar & oGameBackup.FileName + sOldBackup = Settings.BackupFolder & Path.DirectorySeparatorChar & oGameBackup.FileName mgrManifest.DoManifestDeletebyID(oGameBackup, mgrSQLite.Database.Remote) mgrManifest.DoManifestDeletebyID(oGameBackup, mgrSQLite.Database.Local) @@ -171,7 +171,7 @@ Public Class mgrBackup End If If oGame.AppendTimeStamp Then - CheckOldBackups(oGame, sBackupFile) + CheckOldBackups(oGame) sBackupFile = sBackupFile & Path.DirectorySeparatorChar & oGame.Name & sTimeStamp & ".7z" Else sBackupFile = sBackupFile & Path.DirectorySeparatorChar & oGame.Name & ".7z" From d46bc38bdc1d22a477aadeb7081ac43ec830518c Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Wed, 24 Aug 2016 20:57:09 -0600 Subject: [PATCH 8/8] Minor string changes --- GBM/Forms/frmGameManager.Designer.vb | 6 +++--- GBM/Forms/frmGameManager.vb | 12 ++++++++---- GBM/My Project/Resources.Designer.vb | 15 ++++++++++++--- GBM/My Project/Resources.resx | 7 +++++-- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/GBM/Forms/frmGameManager.Designer.vb b/GBM/Forms/frmGameManager.Designer.vb index f06a0ee..291581f 100644 --- a/GBM/Forms/frmGameManager.Designer.vb +++ b/GBM/Forms/frmGameManager.Designer.vb @@ -794,18 +794,18 @@ Partial Class frmGameManager 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(128, 70) + Me.cmsDeleteBackup.Size = New System.Drawing.Size(115, 48) ' 'cmsDeleteOne ' Me.cmsDeleteOne.Name = "cmsDeleteOne" - Me.cmsDeleteOne.Size = New System.Drawing.Size(127, 22) + 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(127, 22) + Me.cmsDeleteAll.Size = New System.Drawing.Size(114, 22) Me.cmsDeleteAll.Text = "&All Files" ' 'frmGameManager diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index d3c4aa4..7ae3a73 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -573,12 +573,15 @@ Public Class frmGameManager 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 @@ -603,7 +606,7 @@ Public Class frmGameManager mgrRestore.DoPathOverride(CurrentBackupItem, oApp) lblRestorePathData.Text = CurrentBackupItem.RestorePath Else - oComboItems.Add(New KeyValuePair(Of String, String)(String.Empty, frmGameManager_Never)) + oComboItems.Add(New KeyValuePair(Of String, String)(String.Empty, frmGameManager_None)) lblBackupFileData.Text = String.Empty lblRestorePathData.Text = String.Empty btnOpenBackupFile.Enabled = False @@ -615,16 +618,17 @@ Public Class frmGameManager cboRemoteBackup.DataSource = oComboItems If oLocalBackupData.Contains(oApp.Name) Then + bLocalData = True oBackupInfo = DirectCast(oLocalBackupData(oApp.Name), clsBackup) lblLocalBackupData.Text = mgrCommon.FormatString(frmGameManager_BackupTimeAndName, New String() {oBackupInfo.DateUpdated, oBackupInfo.UpdatedBy}) Else - lblLocalBackupData.Text = frmGameManager_Never + lblLocalBackupData.Text = frmGameManager_Unknown End If - If oComboItems(0).Value = frmGameManager_Never And lblLocalBackupData.Text = frmGameManager_Never Then + If Not bRemoteData And Not bLocalData Then btnMarkAsRestored.Enabled = False lblLocalBackupData.ForeColor = Color.Black - ElseIf oComboItems(0).Value = frmGameManager_Never And lblLocalBackupData.Text <> frmGameManager_Never Then + ElseIf Not bRemoteData And bLocalData Then btnMarkAsRestored.Enabled = False lblLocalBackupData.ForeColor = Color.Red ElseIf oComboItems(0).Value <> lblLocalBackupData.Text Then diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 1e362f6..bcd5682 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -1906,11 +1906,11 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Never. + ''' Looks up a localized string similar to None. ''' - 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 @@ -1959,6 +1959,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Unknown. + ''' + Friend ReadOnly Property frmGameManager_Unknown() As String + Get + Return ResourceManager.GetString("frmGameManager_Unknown", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Up to Date!. ''' diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index a5d7a7a..3a20f38 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -646,8 +646,8 @@ Version: - - Never + + None All @@ -1729,4 +1729,7 @@ Backup Limit + + Unknown + \ No newline at end of file