Merge pull request #317 from MikeMaximus/v141

V141
MikeMaximus · Jan 28, 2025 · 652822d · 652822d
2 parents 7377671 + 5ba8679
commit 652822d
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 33 deletions.
diff --git a/GBM/License/credits.txt b/GBM/License/credits.txt
@@ -4,10 +4,14 @@ Contributors:
 
 Michael J. Seiferling (MikeMaximus) - Design, Programming and Windows Game Configuration Maintainer.
 Sebastian Riedel (basxto) - Linux Packaging, Installation and Game Configuration Maintainer.
+Juijote - Simplified Chinese Translation
+Darren John de Lima (Darthagnon) - Offline Manual.
 
 Special Thanks:
 
 7-Zip - Igor Pavlov
+Dark-Mode-Forms - BlueMystical
 Sixpack Status Icons - JankoAtWarpSpeed.com
 Primo Icon Set - webdesignerdepot.com
-Sound Effects - Pixabay.com, UNIVERSFIELD(Pixabay)
+Sound Effects - Pixabay.com, UNIVERSFIELD(Pixabay)
+Thanks to everyone that has taken the time to report issues, and post suggestions and comments.
diff --git a/GBM/Managers/mgrBackup.vb b/GBM/Managers/mgrBackup.vb
@@ -256,7 +256,7 @@ Public Class mgrBackup
     End Sub
 
     Private Function BuildFileTimeStamp(ByVal dDate As Date) As String
-        Return " " & dDate.Month & "-" & dDate.Day & "-" & dDate.Year & "-" & dDate.Hour & "-" & dDate.Minute & "-" & dDate.Second
+        Return " " & dDate.ToString("yyyyMMdd") & "T" & dDate.ToString("HHmmss")
     End Function
 
     Private Function HandleSubFolder(ByVal oGame As clsGame, ByVal sPath As String) As Boolean
@@ -447,6 +447,8 @@ Public Class mgrBackup
                         Else
                             If Not mgrManifest.DoManifestDuplicateCheck(oBackup, mgrSQLite.Database.Remote) Then
                                 mgrManifest.DoManifestAdd(oBackup, mgrSQLite.Database.Remote)
+                            Else
+                                mgrManifest.DoManifestUpdateByManifestID(oBackup, mgrSQLite.Database.Remote)
                             End If
                         End If
                         iFilesImported += 1

diff --git a/GBM/Managers/mgrCommon.vb b/GBM/Managers/mgrCommon.vb
@@ -9,8 +9,8 @@ Imports DarkModeForms
 Public Class mgrCommon
 
     'These need to be updated when upgrading the packaged 7z utility
-    Private Shared sUtility64Hash As String = "2C39B62EDF81F576DCB1A80679B0EBFC67787761236E38C78466AF026C8A60FA" 'v24.08 7za.exe x64
-    Private Shared sUtility32Hash As String = "CF878BFBD9ED93DC551AC038AFF8A8BBA4C935DDF8D48E62122BDDFDB3E08567" 'v24.08 7za.exe x86
+    Private Shared sUtility64Hash As String = "FBB3DADCC29BCBC5460484D858C5F33F99E5317F5F6CD8D9C83F4DD8C39B3E30" 'v24.09 7za.exe x64
+    Private Shared sUtility32Hash As String = "223B873C50380FE9A39F1A22B6ABF8D46DB506E1C08D08312902F6F3CD1F7AC3" 'v24.09 7za.exe x86
     Private Shared sBlackList As String() = {"dosbox", "scummvm", "java", "python", "python.real", "python2.7", "mono", "wine"}
 
     Public Enum eSounds As Integer

diff --git a/GBM/My Project/AssemblyInfo.vb b/GBM/My Project/AssemblyInfo.vb
@@ -14,7 +14,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("Game Backup Monitor")> 
 <Assembly: AssemblyCompany("Michael J. Seiferling")> 
 <Assembly: AssemblyProduct("Game Backup Monitor")>
-<Assembly: AssemblyCopyright("© 2014 - 2024 Michael J. Seiferling and Game Backup Monitor contributors")>
+<Assembly: AssemblyCopyright("© 2014 - 2025 Michael J. Seiferling and Game Backup Monitor contributors")>
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)> 
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.4.0.*")>
-<Assembly: AssemblyFileVersion("1.4.0.0")>
+<Assembly: AssemblyVersion("1.4.1.*")>
+<Assembly: AssemblyFileVersion("1.4.1.0")>
 
 <Assembly: NeutralResourcesLanguageAttribute("en")> 
diff --git a/GBM/Utilities/x64/7za.exe b/GBM/Utilities/x64/7za.exe
diff --git a/GBM/Utilities/x86/7za.exe b/GBM/Utilities/x86/7za.exe
diff --git a/GBM/readme.txt b/GBM/readme.txt
@@ -1,37 +1,21 @@
-Game Backup Monitor v1.4.0 Readme
+Game Backup Monitor v1.4.1 Readme
 https://mikemaximus.github.io/gbm-web/
 [email protected]
 
-October 30, 2024
+January 17, 2025
 
-New in 1.4.0
-
-Windows:
-
-- Game Backup Monitor now has support for dark mode in Windows 10 & 11.
-    - Dark mode is automatically applied based on your operating system theme, it cannot be toggled manually.
-    - GBM needs to be restarted to fully apply or remove dark mode after changing themes.
-- Installers now detect and close GBM automatically if it's running.
-- Installers will no longer look blurry with High DPI scaling.
-- Installers now automatically set the optimal High DPI compatibility mode for GBM on Windows 10 or later.
-    - This prevents GBM from looking blurry with High DPI scaling.
-    - This can be modified in the compatibility settings for GBM.exe if another scaling mode is preferred.
-- Updated YamlDotNet to 16.1.3.
-- Updated SQLite to 3.47.0.
-- Updated 7-Zip to 24.08.
+New in 1.4.1
 
 General:
 
-- Changed list icons on the "Import Game Configurations" form to be more appropriate for both light and dark modes.
+- The date/time format used in backup filenames has been improved.
+    - The new format is based on ISO 8601. 
+        - Ex: Grim Dawn 20250106T074903.7z
+    - This change only affects newly created backup files.
+- Fixed an issue with importing backup files that have been renamed.
 
-Known Issues:
-
-- Dark mode is not applied to the date controls on the "Session Viewer" form.
-- Some Windows dialogs may not have dark mode applied.
-
-Notes:
+Windows:
 
-- Dark Mode was made possible by the Dark-Mode-Forms (https://github.com/BlueMystical/Dark-Mode-Forms) project.
-- GBM uses a custom version of this project available at https://github.com/MikeMaximus/DarkModeForms.
+- Updated 7-Zip to 24.09.
 
 The entire version history of GBM releases is available at http://mikemaximus.github.io/gbm-web/versionhistory.html