Qt: show time of day in 'last played' game info, log current time whe…

…n RPCS3 boots
RPCS3 · Dec 2, 2021 · ebe91eb · ebe91eb
1 parent 0ab36ef
commit ebe91eb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp
@@ -2,6 +2,8 @@
 // by Sacha Refshauge, Megamouse and flash-fire
 
 #include <iostream>
+#include <chrono>
+#include <sstream>
 
 #include <QApplication>
 #include <QCommandLineParser>
@@ -359,6 +361,14 @@ void log_q_debug(QtMsgType type, const QMessageLogContext& context, const QStrin
 	}
 }
 
+template <>
+void fmt_class_string<std::chrono::sys_time<typename std::chrono::system_clock::duration>>::format(std::string& out, u64 arg)
+{
+	std::ostringstream ss;
+	ss << get_object(arg);
+	out += ss.str();
+}
+
 
 
 int main(int argc, char** argv)
@@ -471,7 +481,10 @@ int main(int argc, char** argv)
 		logs::stored_message qt{(strcmp(QT_VERSION_STR, qVersion()) != 0) ? sys_log.error : sys_log.notice};
 		qt.text  = fmt::format("Qt version: Compiled against Qt %s | Run-time uses Qt %s", QT_VERSION_STR, qVersion());
 
-		logs::set_init({std::move(ver), std::move(sys), std::move(os), std::move(qt)});
+		logs::stored_message time{sys_log.always()};
+		time.text  = fmt::format("Current Time: %s", std::chrono::system_clock::now());
+
+		logs::set_init({std::move(ver), std::move(sys), std::move(os), std::move(qt), std::move(time)});
 	}
 
 #ifdef _WIN32

diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp
@@ -2370,16 +2370,16 @@ void game_list_frame::PopulateGameList()
 		const quint64 elapsed_ms = m_persistent_settings->GetPlaytime(serial);
 
 		// Last played (support outdated values)
-		QDate last_played;
+		QDateTime last_played;
 		const QString last_played_str = GetLastPlayedBySerial(serial);
 
 		if (!last_played_str.isEmpty())
 		{
-			last_played = QDate::fromString(last_played_str, gui::persistent::last_played_date_format);
+			last_played = QDateTime::fromString(last_played_str, gui::persistent::last_played_date_format);
 
 			if (!last_played.isValid())
 			{
-				last_played = QDate::fromString(last_played_str, gui::persistent::last_played_date_format_old);
+				last_played = QDateTime::fromString(last_played_str, gui::persistent::last_played_date_format_old);
 			}
 		}
 
@@ -2394,7 +2394,7 @@ void game_list_frame::PopulateGameList()
 		m_game_list->setItem(row, gui::column_resolution, new custom_table_widget_item(GetStringFromU32(game->info.resolution, localized.resolution.mode, true)));
 		m_game_list->setItem(row, gui::column_sound,      new custom_table_widget_item(GetStringFromU32(game->info.sound_format, localized.sound.format, true)));
 		m_game_list->setItem(row, gui::column_parental,   new custom_table_widget_item(GetStringFromU32(game->info.parental_lvl, localized.parental.level), Qt::UserRole, game->info.parental_lvl));
-		m_game_list->setItem(row, gui::column_last_play,  new custom_table_widget_item(locale.toString(last_played, gui::persistent::last_played_date_format_new), Qt::UserRole, last_played));
+		m_game_list->setItem(row, gui::column_last_play,  new custom_table_widget_item(locale.toString(last_played, last_played >= QDateTime::currentDateTime().addDays(-7) ? gui::persistent::last_played_date_with_time_of_day_format : gui::persistent::last_played_date_format_new), Qt::UserRole, last_played));
 		m_game_list->setItem(row, gui::column_playtime,   new custom_table_widget_item(elapsed_ms == 0 ? tr("Never played") : localized.GetVerboseTimeByMs(elapsed_ms), Qt::UserRole, elapsed_ms));
 		m_game_list->setItem(row, gui::column_compat,     compat_item);
 

diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp
@@ -435,7 +435,7 @@ void gui_application::StartPlaytime(bool start_playtime = true)
 		return;
 	}
 
-	m_persistent_settings->SetLastPlayed(serial, QDate::currentDate().toString(gui::persistent::last_played_date_format));
+	m_persistent_settings->SetLastPlayed(serial, QDateTime::currentDateTime().toString(gui::persistent::last_played_date_format));
 	m_timer_playtime.start();
 	m_timer.start(10000); // Update every 10 seconds in case the emulation crashes
 }
@@ -457,7 +457,7 @@ void gui_application::UpdatePlaytime()
 	}
 
 	m_persistent_settings->AddPlaytime(serial, m_timer_playtime.restart());
-	m_persistent_settings->SetLastPlayed(serial, QDate::currentDate().toString(gui::persistent::last_played_date_format));
+	m_persistent_settings->SetLastPlayed(serial, QDateTime::currentDateTime().toString(gui::persistent::last_played_date_format));
 }
 
 void gui_application::StopPlaytime()
@@ -475,7 +475,7 @@ void gui_application::StopPlaytime()
 	}
 
 	m_persistent_settings->AddPlaytime(serial, m_timer_playtime.restart());
-	m_persistent_settings->SetLastPlayed(serial, QDate::currentDate().toString(gui::persistent::last_played_date_format));
+	m_persistent_settings->SetLastPlayed(serial, QDateTime::currentDateTime().toString(gui::persistent::last_played_date_format));
 	m_timer_playtime.invalidate();
 }
 

diff --git a/rpcs3/rpcs3qt/persistent_settings.h b/rpcs3/rpcs3qt/persistent_settings.h
@@ -16,9 +16,10 @@ namespace gui
 		const QString titles      = "Titles";
 
 		// Date format
-		const QString last_played_date_format_old    = "MMMM d yyyy";
-		const QString last_played_date_format_new    = "MMMM d, yyyy";
-		const Qt::DateFormat last_played_date_format = Qt::DateFormat::ISODate;
+		const QString last_played_date_format_old                  = "MMMM d yyyy";
+		const QString last_played_date_format_new                  = "MMMM d, yyyy";
+		const QString last_played_date_with_time_of_day_format     = "MMMM d, yyyy HH:mm";
+		const Qt::DateFormat last_played_date_format               = Qt::DateFormat::ISODate;
 
 		// GUI Saves
 		const gui_save save_notes  = gui_save(savedata, "notes",       QVariantMap());