Workaround for an edge case causing two backups to overwrite if you'r…

…e doing a bacth backup and have a cartridge and an installed title of the same game.
BernardoGiordano · Oct 5, 2017 · e359d4d · e359d4d
1 parent 7cf6563
commit e359d4d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/include/datetime.h b/include/datetime.h
@@ -21,9 +21,8 @@
 
 #include "common.h"
 
-std::string getDate(void);
 std::string getTime(void);
-std::string getDateTime(void);
+std::string getCleanDateTime(void);
 std::string getPathDateTime(void);
 
 #endif
diff --git a/source/datetime.cpp b/source/datetime.cpp
@@ -18,33 +18,28 @@
 
 #include "datetime.h"
 
-std::string getDate(void)
+std::string getTime(void)
 {
 	char buf[80] = {0};
 	time_t unixTime = time(NULL);
 	struct tm* timeStruct = gmtime((const time_t*)&unixTime);
 
-	sprintf(buf, "%i-%i-%i", timeStruct->tm_mday, timeStruct->tm_mon + 1, timeStruct->tm_year + 1900);
+	sprintf(buf, "%02i:%02i:%02i", timeStruct->tm_hour, timeStruct->tm_min, timeStruct->tm_sec);
 
 	std::string ret(buf);
 	return ret;
 }
 
-std::string getTime(void)
+std::string getCleanDateTime(void)
 {
 	char buf[80] = {0};
 	time_t unixTime = time(NULL);
 	struct tm* timeStruct = gmtime((const time_t*)&unixTime);
 
-	sprintf(buf, "%02i:%02i:%02i", timeStruct->tm_hour, timeStruct->tm_min, timeStruct->tm_sec);
+	sprintf(buf, "%02i%02i%02i_%02i%02i%02i", timeStruct->tm_mday, timeStruct->tm_mon + 1, timeStruct->tm_year + 1900, timeStruct->tm_hour, timeStruct->tm_min, timeStruct->tm_sec);
 
 	std::string ret(buf);
-	return ret;
-}
-
-std::string getDateTime(void)
-{
-	return getDate() + " " + getTime();
+	return ret;	
 }
 
 std::string getPathDateTime(void)

diff --git a/source/fsstream.cpp b/source/fsstream.cpp
@@ -202,7 +202,7 @@ void backup(size_t index)
 
 		if (R_SUCCEEDED(res))
 		{
-			std::string suggestion = multipleSelectionEnabled() ? title.getShortDescription() + " - Autobackup" : getPathDateTime();
+			std::string suggestion = multipleSelectionEnabled() ? title.getShortDescription() + " - Autobackup " + getCleanDateTime() : getPathDateTime();
 
 			std::u16string customPath;
 			if (multipleSelectionEnabled())