Format automatic wallet backup file names in ISO 8601 basic format

Fuzzbawls · Fuzzbawls · commit 3331c25d1d54 · 2021-04-26T22:21:34.000-07:00
diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -76,6 +76,10 @@ The `addnode=`, `connect=`, `port=`, `bind=`, `rpcport=`, `rpcbind=`, and `walle
 The log timestamp format is now ISO 8601 (e.g. "2021-02-28T12:34:56Z").
 
 
+#### Automatic Backup File Naming
+
+The file extension applied to automatic backups is now in ISO 8601 basic notation (e.g. "20210228T123456Z"). The basic notation is used to prevent illegal `:` characters from appearing in the filename.
+
 *version* Change log
 ==============
 
diff --git a/src/init.cpp b/src/init.cpp
@@ -1288,7 +1288,7 @@ bool AppInitMain()
         if (nWalletBackups > 0) {
             if (fs::exists(backupDir)) {
                 // Create backup of the wallet
-                std::string dateTimeStr = DateTimeStrFormat(".%Y-%m-%d-%H-%M", GetTime());
+                std::string dateTimeStr = FormatISO8601DateTimeForBackup(GetTime());
                 std::string backupPathStr = backupDir.string();
                 backupPathStr += "/" + strWalletFile;
                 std::string sourcePathStr = GetDataDir().string();
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
@@ -101,6 +101,11 @@ BOOST_AUTO_TEST_CASE(util_FormatISO8601DateTime)
     BOOST_CHECK_EQUAL(FormatISO8601DateTime(1317425777), "2011-09-30T23:36:17Z");
 }
 
+BOOST_AUTO_TEST_CASE(util_FormatISO8601DateTimeForBackup)
+{
+    BOOST_CHECK_EQUAL(FormatISO8601DateTimeForBackup(1586310600), ".20200408T0150Z");
+}
+
 BOOST_AUTO_TEST_CASE(util_FormatISO8601Date)
 {
     BOOST_CHECK_EQUAL(FormatISO8601Date(1317425777), "2011-09-30");
diff --git a/src/utiltime.cpp b/src/utiltime.cpp
@@ -95,6 +95,10 @@ std::string FormatISO8601DateTime(int64_t nTime) {
     return DateTimeStrFormat("%Y-%m-%dT%H:%M:%SZ", nTime);
 }
 
+std::string FormatISO8601DateTimeForBackup(int64_t nTime) {
+    return DateTimeStrFormat(".%Y%m%dT%H%MZ", nTime);
+}
+
 std::string FormatISO8601Date(int64_t nTime) {
     return DateTimeStrFormat("%Y-%m-%d", nTime);
 }
diff --git a/src/utiltime.h b/src/utiltime.h
@@ -36,6 +36,7 @@ std::string DateTimeStrFormat(const char* pszFormat, int64_t nTime);
 std::string DurationToDHMS(int64_t nDurationTime);
 
 std::string FormatISO8601DateTime(int64_t nTime);
+std::string FormatISO8601DateTimeForBackup(int64_t nTime);
 std::string FormatISO8601Date(int64_t nTime);
 std::string FormatISO8601Time(int64_t nTime);
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4419,7 +4419,7 @@ bool CWalletTx::AcceptToMemoryPool(CValidationState& state, bool fLimitFree, boo
 
 std::string CWallet::GetUniqueWalletBackupName() const
 {
-    return strprintf("%s%s", (dbw ? dbw->GetName() : "null"), DateTimeStrFormat(".%Y-%m-%d-%H-%M", GetTime()));
+    return strprintf("%s%s", (dbw ? dbw->GetName() : "null"), FormatISO8601DateTimeForBackup(GetTime()));
 }
 
 CWallet::CWallet() : dbw(new CWalletDBWrapper())

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,11 @@ BOOST_AUTO_TEST_CASE(util_FormatISO8601DateTime)`
`101`	`101`	`BOOST_CHECK_EQUAL(FormatISO8601DateTime(1317425777), "2011-09-30T23:36:17Z");`
`102`	`102`	`}`
`103`	`103`
	`104`	`+BOOST_AUTO_TEST_CASE(util_FormatISO8601DateTimeForBackup)`
	`105`	`+{`
	`106`	`+ BOOST_CHECK_EQUAL(FormatISO8601DateTimeForBackup(1586310600), ".20200408T0150Z");`
	`107`	`+}`
	`108`	`+`
`104`	`109`	`BOOST_AUTO_TEST_CASE(util_FormatISO8601Date)`
`105`	`110`	`{`
`106`	`111`	`BOOST_CHECK_EQUAL(FormatISO8601Date(1317425777), "2011-09-30");`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,10 @@ std::string FormatISO8601DateTime(int64_t nTime) {`
`95`	`95`	`return DateTimeStrFormat("%Y-%m-%dT%H:%M:%SZ", nTime);`
`96`	`96`	`}`
`97`	`97`
	`98`	`+std::string FormatISO8601DateTimeForBackup(int64_t nTime) {`
	`99`	`+ return DateTimeStrFormat(".%Y%m%dT%H%MZ", nTime);`
	`100`	`+}`
	`101`	`+`
`98`	`102`	`std::string FormatISO8601Date(int64_t nTime) {`
`99`	`103`	`return DateTimeStrFormat("%Y-%m-%d", nTime);`
`100`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4419,7 +4419,7 @@ bool CWalletTx::AcceptToMemoryPool(CValidationState& state, bool fLimitFree, boo`
`4419`	`4419`
`4420`	`4420`	`std::string CWallet::GetUniqueWalletBackupName() const`
`4421`	`4421`	`{`
`4422`		`- return strprintf("%s%s", (dbw ? dbw->GetName() : "null"), DateTimeStrFormat(".%Y-%m-%d-%H-%M", GetTime()));`
	`4422`	`+ return strprintf("%s%s", (dbw ? dbw->GetName() : "null"), FormatISO8601DateTimeForBackup(GetTime()));`
`4423`	`4423`	`}`
`4424`	`4424`
`4425`	`4425`	`CWallet::CWallet() : dbw(new CWalletDBWrapper())`