Revised remote manifest updates

GBM/Managers/mgrBackup.vb

@@ -48,10 +48,12 @@ Public Class mgrBackup
         oItem.CheckSum = sCheckSum
 
         'Save Remote Manifest
-        If mgrManifest.DoSpecificManifestCheck(oItem, mgrSQLite.Database.Remote) Then
+        If Not oGameInfo.AppendTimeStamp Then
-            mgrManifest.DoManifestUpdateByManifestID(oItem, mgrSQLite.Database.Remote)
+            If Not mgrManifest.DoUpdateLatestManifest(oItem, mgrSQLite.Database.Remote) Then
+                mgrManifest.DoManifestAdd(oItem, mgrSQLite.Database.Remote)
+            End If
         Else
-            mgrManifest.DoManifestAdd(oItem, mgrSQLite.Database.Remote)
+                mgrManifest.DoManifestAdd(oItem, mgrSQLite.Database.Remote)
         End If
 
         'Save Local Manifest

GBM/Managers/mgrManifest.vb

@@ -114,25 +114,22 @@
         Return oBackupItem
     End Function
 
-    'This should only be used to update specific entries in the remote manifest
+    Public Shared Function DoUpdateLatestManifest(ByRef oItem As clsBackup, 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 oData As Object
         Dim sSQL As String
         Dim hshParams As New Hashtable
 
-        sSQL = "SELECT * FROM manifest NATURAL JOIN monitorlist "
+        sSQL = "SELECT ManifestID FROM manifest NATURAL JOIN monitorlist "
-        sSQL &= "WHERE MonitorID = @MonitorID AND FileName = @FileName"
+        sSQL &= "WHERE MonitorID = @MonitorID ORDER BY DateUpdated DESC LIMIT 1"
 
         hshParams.Add("MonitorID", oItem.MonitorID)
-        hshParams.Add("FileName", oItem.FileName)
 
-        oData = oDatabase.ReadParamData(sSQL, hshParams)
+        oData = oDatabase.ReadSingleValue(sSQL, hshParams)
 
-        If oData.Tables(0).Rows.Count > 0 Then
+        If Not oData Is Nothing Then
-            For Each dr As DataRow In oData.Tables(0).Rows
+            oItem.ManifestID = CStr(oData)
-                oItem.ManifestID = CStr(dr("ManifestID"))
+            DoManifestUpdateByManifestID(oItem, mgrSQLite.Database.Remote)
-            Next
             Return True
         Else
             Return False

GBM/readme.txt

@@ -43,9 +43,4 @@ Linux Only:
 	- Mono style notifications will be displayed if notify-send is not available.
 	- The GBM icon will be displayed on notifications if it's been installed to the correct location (via makefile or deb).
 	
-Known Issues:
-
-- After upgrading to v1.1.0, backup manifest entries and files created with prior versions are not overwritten when a new backup is created.
-
-	
 The entire version history of GBM releases is available at http://mikemaximus.github.io/gbm-web/versionhistory.html