mirror of
				https://git.tardis.systems/mirrors/yuzu
				synced 2025-10-31 18:54:14 +01:00 
			
		
		
		
	
						commit
						85d99f873f
					
				| @ -18,6 +18,7 @@ | ||||
| #define LOAD_DIR "load" | ||||
| #define LOG_DIR "log" | ||||
| #define NAND_DIR "nand" | ||||
| #define PLAY_TIME_DIR "play_time" | ||||
| #define SCREENSHOTS_DIR "screenshots" | ||||
| #define SDMC_DIR "sdmc" | ||||
| #define SHADER_DIR "shader" | ||||
|  | ||||
| @ -124,6 +124,7 @@ public: | ||||
|         GenerateYuzuPath(YuzuPath::LoadDir, yuzu_path / LOAD_DIR); | ||||
|         GenerateYuzuPath(YuzuPath::LogDir, yuzu_path / LOG_DIR); | ||||
|         GenerateYuzuPath(YuzuPath::NANDDir, yuzu_path / NAND_DIR); | ||||
|         GenerateYuzuPath(YuzuPath::PlayTimeDir, yuzu_path / PLAY_TIME_DIR); | ||||
|         GenerateYuzuPath(YuzuPath::ScreenshotsDir, yuzu_path / SCREENSHOTS_DIR); | ||||
|         GenerateYuzuPath(YuzuPath::SDMCDir, yuzu_path / SDMC_DIR); | ||||
|         GenerateYuzuPath(YuzuPath::ShaderDir, yuzu_path / SHADER_DIR); | ||||
|  | ||||
| @ -20,6 +20,7 @@ enum class YuzuPath { | ||||
|     LoadDir,        // Where cheat/mod files are stored.
 | ||||
|     LogDir,         // Where log files are stored.
 | ||||
|     NANDDir,        // Where the emulated NAND is stored.
 | ||||
|     PlayTimeDir,    // Where play time data is stored.
 | ||||
|     ScreenshotsDir, // Where yuzu screenshots are stored.
 | ||||
|     SDMCDir,        // Where the emulated SDMC is stored.
 | ||||
|     ShaderDir,      // Where shaders are stored.
 | ||||
|  | ||||
| @ -195,6 +195,8 @@ add_executable(yuzu | ||||
|     multiplayer/state.cpp | ||||
|     multiplayer/state.h | ||||
|     multiplayer/validation.h | ||||
|     play_time_manager.cpp | ||||
|     play_time_manager.h | ||||
|     precompiled_headers.h | ||||
|     qt_common.cpp | ||||
|     qt_common.h | ||||
|  | ||||
| @ -123,6 +123,8 @@ ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent) | ||||
|     connect(ui->show_compat, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate); | ||||
|     connect(ui->show_size, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate); | ||||
|     connect(ui->show_types, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate); | ||||
|     connect(ui->show_play_time, &QCheckBox::stateChanged, this, | ||||
|             &ConfigureUi::RequestGameListUpdate); | ||||
|     connect(ui->game_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, | ||||
|             &ConfigureUi::RequestGameListUpdate); | ||||
|     connect(ui->folder_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), | ||||
| @ -167,6 +169,7 @@ void ConfigureUi::ApplyConfiguration() { | ||||
|     UISettings::values.show_compat = ui->show_compat->isChecked(); | ||||
|     UISettings::values.show_size = ui->show_size->isChecked(); | ||||
|     UISettings::values.show_types = ui->show_types->isChecked(); | ||||
|     UISettings::values.show_play_time = ui->show_play_time->isChecked(); | ||||
|     UISettings::values.game_icon_size = ui->game_icon_size_combobox->currentData().toUInt(); | ||||
|     UISettings::values.folder_icon_size = ui->folder_icon_size_combobox->currentData().toUInt(); | ||||
|     UISettings::values.row_1_text_id = ui->row_1_text_combobox->currentData().toUInt(); | ||||
| @ -179,6 +182,7 @@ void ConfigureUi::ApplyConfiguration() { | ||||
|     const u32 height = ScreenshotDimensionToInt(ui->screenshot_height->currentText()); | ||||
|     UISettings::values.screenshot_height.SetValue(height); | ||||
| 
 | ||||
|     RequestGameListUpdate(); | ||||
|     system.ApplySettings(); | ||||
| } | ||||
| 
 | ||||
| @ -194,6 +198,7 @@ void ConfigureUi::SetConfiguration() { | ||||
|     ui->show_compat->setChecked(UISettings::values.show_compat.GetValue()); | ||||
|     ui->show_size->setChecked(UISettings::values.show_size.GetValue()); | ||||
|     ui->show_types->setChecked(UISettings::values.show_types.GetValue()); | ||||
|     ui->show_play_time->setChecked(UISettings::values.show_play_time.GetValue()); | ||||
|     ui->game_icon_size_combobox->setCurrentIndex( | ||||
|         ui->game_icon_size_combobox->findData(UISettings::values.game_icon_size.GetValue())); | ||||
|     ui->folder_icon_size_combobox->setCurrentIndex( | ||||
|  | ||||
| @ -104,6 +104,13 @@ | ||||
|           </property> | ||||
|          </widget> | ||||
|         </item> | ||||
|         <item> | ||||
|          <widget class="QCheckBox" name="show_play_time"> | ||||
|           <property name="text"> | ||||
|            <string>Show Play Time Column</string> | ||||
|           </property> | ||||
|          </widget> | ||||
|         </item> | ||||
|         <item> | ||||
|          <layout class="QHBoxLayout" name="game_icon_size_qhbox_layout_2"> | ||||
|           <item> | ||||
|  | ||||
| @ -312,8 +312,10 @@ void GameList::OnFilterCloseClicked() { | ||||
| } | ||||
| 
 | ||||
| GameList::GameList(FileSys::VirtualFilesystem vfs_, FileSys::ManualContentProvider* provider_, | ||||
|                    Core::System& system_, GMainWindow* parent) | ||||
|     : QWidget{parent}, vfs{std::move(vfs_)}, provider{provider_}, system{system_} { | ||||
|                    PlayTime::PlayTimeManager& play_time_manager_, Core::System& system_, | ||||
|                    GMainWindow* parent) | ||||
|     : QWidget{parent}, vfs{std::move(vfs_)}, provider{provider_}, | ||||
|       play_time_manager{play_time_manager_}, system{system_} { | ||||
|     watcher = new QFileSystemWatcher(this); | ||||
|     connect(watcher, &QFileSystemWatcher::directoryChanged, this, &GameList::RefreshGameDirectory); | ||||
| 
 | ||||
| @ -340,6 +342,7 @@ GameList::GameList(FileSys::VirtualFilesystem vfs_, FileSys::ManualContentProvid | ||||
| 
 | ||||
|     tree_view->setColumnHidden(COLUMN_ADD_ONS, !UISettings::values.show_add_ons); | ||||
|     tree_view->setColumnHidden(COLUMN_COMPATIBILITY, !UISettings::values.show_compat); | ||||
|     tree_view->setColumnHidden(COLUMN_PLAY_TIME, !UISettings::values.show_play_time); | ||||
|     item_model->setSortRole(GameListItemPath::SortRole); | ||||
| 
 | ||||
|     connect(main_window, &GMainWindow::UpdateThemedIcons, this, &GameList::OnUpdateThemedIcons); | ||||
| @ -548,6 +551,7 @@ void GameList::AddGamePopup(QMenu& context_menu, u64 program_id, const std::stri | ||||
|     QAction* remove_update = remove_menu->addAction(tr("Remove Installed Update")); | ||||
|     QAction* remove_dlc = remove_menu->addAction(tr("Remove All Installed DLC")); | ||||
|     QAction* remove_custom_config = remove_menu->addAction(tr("Remove Custom Configuration")); | ||||
|     QAction* remove_play_time_data = remove_menu->addAction(tr("Remove Play Time Data")); | ||||
|     QAction* remove_cache_storage = remove_menu->addAction(tr("Remove Cache Storage")); | ||||
|     QAction* remove_gl_shader_cache = remove_menu->addAction(tr("Remove OpenGL Pipeline Cache")); | ||||
|     QAction* remove_vk_shader_cache = remove_menu->addAction(tr("Remove Vulkan Pipeline Cache")); | ||||
| @ -622,6 +626,8 @@ void GameList::AddGamePopup(QMenu& context_menu, u64 program_id, const std::stri | ||||
|     connect(remove_custom_config, &QAction::triggered, [this, program_id, path]() { | ||||
|         emit RemoveFileRequested(program_id, GameListRemoveTarget::CustomConfiguration, path); | ||||
|     }); | ||||
|     connect(remove_play_time_data, &QAction::triggered, | ||||
|             [this, program_id]() { emit RemovePlayTimeRequested(program_id); }); | ||||
|     connect(remove_cache_storage, &QAction::triggered, [this, program_id, path] { | ||||
|         emit RemoveFileRequested(program_id, GameListRemoveTarget::CacheStorage, path); | ||||
|     }); | ||||
| @ -790,6 +796,7 @@ void GameList::RetranslateUI() { | ||||
|     item_model->setHeaderData(COLUMN_ADD_ONS, Qt::Horizontal, tr("Add-ons")); | ||||
|     item_model->setHeaderData(COLUMN_FILE_TYPE, Qt::Horizontal, tr("File type")); | ||||
|     item_model->setHeaderData(COLUMN_SIZE, Qt::Horizontal, tr("Size")); | ||||
|     item_model->setHeaderData(COLUMN_PLAY_TIME, Qt::Horizontal, tr("Play time")); | ||||
| } | ||||
| 
 | ||||
| void GameListSearchField::changeEvent(QEvent* event) { | ||||
| @ -817,6 +824,7 @@ void GameList::PopulateAsync(QVector<UISettings::GameDir>& game_dirs) { | ||||
|     tree_view->setColumnHidden(COLUMN_COMPATIBILITY, !UISettings::values.show_compat); | ||||
|     tree_view->setColumnHidden(COLUMN_FILE_TYPE, !UISettings::values.show_types); | ||||
|     tree_view->setColumnHidden(COLUMN_SIZE, !UISettings::values.show_size); | ||||
|     tree_view->setColumnHidden(COLUMN_PLAY_TIME, !UISettings::values.show_play_time); | ||||
| 
 | ||||
|     // Delete any rows that might already exist if we're repopulating
 | ||||
|     item_model->removeRows(0, item_model->rowCount()); | ||||
| @ -825,7 +833,7 @@ void GameList::PopulateAsync(QVector<UISettings::GameDir>& game_dirs) { | ||||
|     emit ShouldCancelWorker(); | ||||
| 
 | ||||
|     GameListWorker* worker = | ||||
|         new GameListWorker(vfs, provider, game_dirs, compatibility_list, system); | ||||
|         new GameListWorker(vfs, provider, game_dirs, compatibility_list, play_time_manager, system); | ||||
| 
 | ||||
|     connect(worker, &GameListWorker::EntryReady, this, &GameList::AddEntry, Qt::QueuedConnection); | ||||
|     connect(worker, &GameListWorker::DirEntryReady, this, &GameList::AddDirEntry, | ||||
|  | ||||
| @ -18,6 +18,7 @@ | ||||
| #include "core/core.h" | ||||
| #include "uisettings.h" | ||||
| #include "yuzu/compatibility_list.h" | ||||
| #include "yuzu/play_time_manager.h" | ||||
| 
 | ||||
| namespace Core { | ||||
| class System; | ||||
| @ -75,11 +76,13 @@ public: | ||||
|         COLUMN_ADD_ONS, | ||||
|         COLUMN_FILE_TYPE, | ||||
|         COLUMN_SIZE, | ||||
|         COLUMN_PLAY_TIME, | ||||
|         COLUMN_COUNT, // Number of columns
 | ||||
|     }; | ||||
| 
 | ||||
|     explicit GameList(std::shared_ptr<FileSys::VfsFilesystem> vfs_, | ||||
|                       FileSys::ManualContentProvider* provider_, Core::System& system_, | ||||
|                       FileSys::ManualContentProvider* provider_, | ||||
|                       PlayTime::PlayTimeManager& play_time_manager_, Core::System& system_, | ||||
|                       GMainWindow* parent = nullptr); | ||||
|     ~GameList() override; | ||||
| 
 | ||||
| @ -113,6 +116,7 @@ signals: | ||||
|     void RemoveInstalledEntryRequested(u64 program_id, InstalledEntryType type); | ||||
|     void RemoveFileRequested(u64 program_id, GameListRemoveTarget target, | ||||
|                              const std::string& game_path); | ||||
|     void RemovePlayTimeRequested(u64 program_id); | ||||
|     void DumpRomFSRequested(u64 program_id, const std::string& game_path, DumpRomFSTarget target); | ||||
|     void VerifyIntegrityRequested(const std::string& game_path); | ||||
|     void CopyTIDRequested(u64 program_id); | ||||
| @ -168,6 +172,7 @@ private: | ||||
| 
 | ||||
|     friend class GameListSearchField; | ||||
| 
 | ||||
|     const PlayTime::PlayTimeManager& play_time_manager; | ||||
|     Core::System& system; | ||||
| }; | ||||
| 
 | ||||
|  | ||||
| @ -18,6 +18,7 @@ | ||||
| #include "common/common_types.h" | ||||
| #include "common/logging/log.h" | ||||
| #include "common/string_util.h" | ||||
| #include "yuzu/play_time_manager.h" | ||||
| #include "yuzu/uisettings.h" | ||||
| #include "yuzu/util/util.h" | ||||
| 
 | ||||
| @ -221,6 +222,31 @@ public: | ||||
|     } | ||||
| }; | ||||
| 
 | ||||
| /**
 | ||||
|  * GameListItem for Play Time values. | ||||
|  * This object stores the play time of a game in seconds, and its readable | ||||
|  * representation in minutes/hours | ||||
|  */ | ||||
| class GameListItemPlayTime : public GameListItem { | ||||
| public: | ||||
|     static constexpr int PlayTimeRole = SortRole; | ||||
| 
 | ||||
|     GameListItemPlayTime() = default; | ||||
|     explicit GameListItemPlayTime(const qulonglong time_seconds) { | ||||
|         setData(time_seconds, PlayTimeRole); | ||||
|     } | ||||
| 
 | ||||
|     void setData(const QVariant& value, int role) override { | ||||
|         qulonglong time_seconds = value.toULongLong(); | ||||
|         GameListItem::setData(PlayTime::ReadablePlayTime(time_seconds), Qt::DisplayRole); | ||||
|         GameListItem::setData(value, PlayTimeRole); | ||||
|     } | ||||
| 
 | ||||
|     bool operator<(const QStandardItem& other) const override { | ||||
|         return data(PlayTimeRole).toULongLong() < other.data(PlayTimeRole).toULongLong(); | ||||
|     } | ||||
| }; | ||||
| 
 | ||||
| class GameListDir : public GameListItem { | ||||
| public: | ||||
|     static constexpr int GameDirRole = Qt::UserRole + 2; | ||||
|  | ||||
| @ -194,6 +194,7 @@ QList<QStandardItem*> MakeGameListEntry(const std::string& path, const std::stri | ||||
|                                         const std::size_t size, const std::vector<u8>& icon, | ||||
|                                         Loader::AppLoader& loader, u64 program_id, | ||||
|                                         const CompatibilityList& compatibility_list, | ||||
|                                         const PlayTime::PlayTimeManager& play_time_manager, | ||||
|                                         const FileSys::PatchManager& patch) { | ||||
|     const auto it = FindMatchingCompatibilityEntry(compatibility_list, program_id); | ||||
| 
 | ||||
| @ -212,6 +213,7 @@ QList<QStandardItem*> MakeGameListEntry(const std::string& path, const std::stri | ||||
|         new GameListItemCompat(compatibility), | ||||
|         new GameListItem(file_type_string), | ||||
|         new GameListItemSize(size), | ||||
|         new GameListItemPlayTime(play_time_manager.GetPlayTime(program_id)), | ||||
|     }; | ||||
| 
 | ||||
|     const auto patch_versions = GetGameListCachedObject( | ||||
| @ -227,9 +229,12 @@ QList<QStandardItem*> MakeGameListEntry(const std::string& path, const std::stri | ||||
| GameListWorker::GameListWorker(FileSys::VirtualFilesystem vfs_, | ||||
|                                FileSys::ManualContentProvider* provider_, | ||||
|                                QVector<UISettings::GameDir>& game_dirs_, | ||||
|                                const CompatibilityList& compatibility_list_, Core::System& system_) | ||||
|                                const CompatibilityList& compatibility_list_, | ||||
|                                const PlayTime::PlayTimeManager& play_time_manager_, | ||||
|                                Core::System& system_) | ||||
|     : vfs{std::move(vfs_)}, provider{provider_}, game_dirs{game_dirs_}, | ||||
|       compatibility_list{compatibility_list_}, system{system_} {} | ||||
|       compatibility_list{compatibility_list_}, | ||||
|       play_time_manager{play_time_manager_}, system{system_} {} | ||||
| 
 | ||||
| GameListWorker::~GameListWorker() = default; | ||||
| 
 | ||||
| @ -280,7 +285,7 @@ void GameListWorker::AddTitlesToGameList(GameListDir* parent_dir) { | ||||
|         } | ||||
| 
 | ||||
|         emit EntryReady(MakeGameListEntry(file->GetFullPath(), name, file->GetSize(), icon, *loader, | ||||
|                                           program_id, compatibility_list, patch), | ||||
|                                           program_id, compatibility_list, play_time_manager, patch), | ||||
|                         parent_dir); | ||||
|     } | ||||
| } | ||||
| @ -357,7 +362,8 @@ void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_pa | ||||
| 
 | ||||
|                         emit EntryReady(MakeGameListEntry(physical_name, name, | ||||
|                                                           Common::FS::GetSize(physical_name), icon, | ||||
|                                                           *loader, id, compatibility_list, patch), | ||||
|                                                           *loader, id, compatibility_list, | ||||
|                                                           play_time_manager, patch), | ||||
|                                         parent_dir); | ||||
|                     } | ||||
|                 } else { | ||||
| @ -370,10 +376,11 @@ void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_pa | ||||
|                     const FileSys::PatchManager patch{program_id, system.GetFileSystemController(), | ||||
|                                                       system.GetContentProvider()}; | ||||
| 
 | ||||
|                     emit EntryReady( | ||||
|                         MakeGameListEntry(physical_name, name, Common::FS::GetSize(physical_name), | ||||
|                                           icon, *loader, program_id, compatibility_list, patch), | ||||
|                         parent_dir); | ||||
|                     emit EntryReady(MakeGameListEntry(physical_name, name, | ||||
|                                                       Common::FS::GetSize(physical_name), icon, | ||||
|                                                       *loader, program_id, compatibility_list, | ||||
|                                                       play_time_manager, patch), | ||||
|                                     parent_dir); | ||||
|                 } | ||||
|             } | ||||
|         } else if (is_dir) { | ||||
|  | ||||
| @ -13,6 +13,7 @@ | ||||
| #include <QString> | ||||
| 
 | ||||
| #include "yuzu/compatibility_list.h" | ||||
| #include "yuzu/play_time_manager.h" | ||||
| 
 | ||||
| namespace Core { | ||||
| class System; | ||||
| @ -36,7 +37,9 @@ public: | ||||
|     explicit GameListWorker(std::shared_ptr<FileSys::VfsFilesystem> vfs_, | ||||
|                             FileSys::ManualContentProvider* provider_, | ||||
|                             QVector<UISettings::GameDir>& game_dirs_, | ||||
|                             const CompatibilityList& compatibility_list_, Core::System& system_); | ||||
|                             const CompatibilityList& compatibility_list_, | ||||
|                             const PlayTime::PlayTimeManager& play_time_manager_, | ||||
|                             Core::System& system_); | ||||
|     ~GameListWorker() override; | ||||
| 
 | ||||
|     /// Starts the processing of directory tree information.
 | ||||
| @ -76,6 +79,7 @@ private: | ||||
|     FileSys::ManualContentProvider* provider; | ||||
|     QVector<UISettings::GameDir>& game_dirs; | ||||
|     const CompatibilityList& compatibility_list; | ||||
|     const PlayTime::PlayTimeManager& play_time_manager; | ||||
| 
 | ||||
|     QStringList watch_list; | ||||
|     std::atomic_bool stop_processing; | ||||
|  | ||||
| @ -150,6 +150,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual | ||||
| #include "yuzu/install_dialog.h" | ||||
| #include "yuzu/loading_screen.h" | ||||
| #include "yuzu/main.h" | ||||
| #include "yuzu/play_time_manager.h" | ||||
| #include "yuzu/startup_checks.h" | ||||
| #include "yuzu/uisettings.h" | ||||
| #include "yuzu/util/clickable_label.h" | ||||
| @ -338,6 +339,8 @@ GMainWindow::GMainWindow(std::unique_ptr<Config> config_, bool has_broken_vulkan | ||||
|     SetDiscordEnabled(UISettings::values.enable_discord_presence.GetValue()); | ||||
|     discord_rpc->Update(); | ||||
| 
 | ||||
|     play_time_manager = std::make_unique<PlayTime::PlayTimeManager>(); | ||||
| 
 | ||||
|     system->GetRoomNetwork().Init(); | ||||
| 
 | ||||
|     RegisterMetaTypes(); | ||||
| @ -986,7 +989,7 @@ void GMainWindow::InitializeWidgets() { | ||||
|     render_window = new GRenderWindow(this, emu_thread.get(), input_subsystem, *system); | ||||
|     render_window->hide(); | ||||
| 
 | ||||
|     game_list = new GameList(vfs, provider.get(), *system, this); | ||||
|     game_list = new GameList(vfs, provider.get(), *play_time_manager, *system, this); | ||||
|     ui->horizontalLayout->addWidget(game_list); | ||||
| 
 | ||||
|     game_list_placeholder = new GameListPlaceholder(this); | ||||
| @ -1461,6 +1464,8 @@ void GMainWindow::ConnectWidgetEvents() { | ||||
|     connect(game_list, &GameList::RemoveInstalledEntryRequested, this, | ||||
|             &GMainWindow::OnGameListRemoveInstalledEntry); | ||||
|     connect(game_list, &GameList::RemoveFileRequested, this, &GMainWindow::OnGameListRemoveFile); | ||||
|     connect(game_list, &GameList::RemovePlayTimeRequested, this, | ||||
|             &GMainWindow::OnGameListRemovePlayTimeData); | ||||
|     connect(game_list, &GameList::DumpRomFSRequested, this, &GMainWindow::OnGameListDumpRomFS); | ||||
|     connect(game_list, &GameList::VerifyIntegrityRequested, this, | ||||
|             &GMainWindow::OnGameListVerifyIntegrity); | ||||
| @ -2535,6 +2540,17 @@ void GMainWindow::OnGameListRemoveFile(u64 program_id, GameListRemoveTarget targ | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| void GMainWindow::OnGameListRemovePlayTimeData(u64 program_id) { | ||||
|     if (QMessageBox::question(this, tr("Remove Play Time Data"), tr("Reset play time?"), | ||||
|                               QMessageBox::Yes | QMessageBox::No, | ||||
|                               QMessageBox::No) != QMessageBox::Yes) { | ||||
|         return; | ||||
|     } | ||||
| 
 | ||||
|     play_time_manager->ResetProgramPlayTime(program_id); | ||||
|     game_list->PopulateAsync(UISettings::values.game_dirs); | ||||
| } | ||||
| 
 | ||||
| void GMainWindow::RemoveTransferableShaderCache(u64 program_id, GameListRemoveTarget target) { | ||||
|     const auto target_file_name = [target] { | ||||
|         switch (target) { | ||||
| @ -3358,6 +3374,9 @@ void GMainWindow::OnStartGame() { | ||||
|     UpdateMenuState(); | ||||
|     OnTasStateChanged(); | ||||
| 
 | ||||
|     play_time_manager->SetProgramId(system->GetApplicationProcessProgramID()); | ||||
|     play_time_manager->Start(); | ||||
| 
 | ||||
|     discord_rpc->Update(); | ||||
| } | ||||
| 
 | ||||
| @ -3373,6 +3392,7 @@ void GMainWindow::OnRestartGame() { | ||||
| 
 | ||||
| void GMainWindow::OnPauseGame() { | ||||
|     emu_thread->SetRunning(false); | ||||
|     play_time_manager->Stop(); | ||||
|     UpdateMenuState(); | ||||
|     AllowOSSleep(); | ||||
| } | ||||
| @ -3393,6 +3413,9 @@ void GMainWindow::OnStopGame() { | ||||
|         return; | ||||
|     } | ||||
| 
 | ||||
|     play_time_manager->Stop(); | ||||
|     // Update game list to show new play time
 | ||||
|     game_list->PopulateAsync(UISettings::values.game_dirs); | ||||
|     if (OnShutdownBegin()) { | ||||
|         OnShutdownBeginDialog(); | ||||
|     } else { | ||||
|  | ||||
| @ -81,6 +81,10 @@ namespace DiscordRPC { | ||||
| class DiscordInterface; | ||||
| } | ||||
| 
 | ||||
| namespace PlayTime { | ||||
| class PlayTimeManager; | ||||
| } | ||||
| 
 | ||||
| namespace FileSys { | ||||
| class ContentProvider; | ||||
| class ManualContentProvider; | ||||
| @ -323,6 +327,7 @@ private slots: | ||||
|     void OnGameListRemoveInstalledEntry(u64 program_id, InstalledEntryType type); | ||||
|     void OnGameListRemoveFile(u64 program_id, GameListRemoveTarget target, | ||||
|                               const std::string& game_path); | ||||
|     void OnGameListRemovePlayTimeData(u64 program_id); | ||||
|     void OnGameListDumpRomFS(u64 program_id, const std::string& game_path, DumpRomFSTarget target); | ||||
|     void OnGameListVerifyIntegrity(const std::string& game_path); | ||||
|     void OnGameListCopyTID(u64 program_id); | ||||
| @ -389,6 +394,7 @@ private: | ||||
|     void RemoveVulkanDriverPipelineCache(u64 program_id); | ||||
|     void RemoveAllTransferableShaderCaches(u64 program_id); | ||||
|     void RemoveCustomConfiguration(u64 program_id, const std::string& game_path); | ||||
|     void RemovePlayTimeData(u64 program_id); | ||||
|     void RemoveCacheStorage(u64 program_id); | ||||
|     bool SelectRomFSDumpTarget(const FileSys::ContentProvider&, u64 program_id, | ||||
|                                u64* selected_title_id, u8* selected_content_record_type); | ||||
| @ -428,6 +434,7 @@ private: | ||||
| 
 | ||||
|     std::unique_ptr<Core::System> system; | ||||
|     std::unique_ptr<DiscordRPC::DiscordInterface> discord_rpc; | ||||
|     std::unique_ptr<PlayTime::PlayTimeManager> play_time_manager; | ||||
|     std::shared_ptr<InputCommon::InputSubsystem> input_subsystem; | ||||
| 
 | ||||
|     MultiplayerState* multiplayer_state = nullptr; | ||||
|  | ||||
							
								
								
									
										179
									
								
								src/yuzu/play_time_manager.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										179
									
								
								src/yuzu/play_time_manager.cpp
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,179 @@ | ||||
| // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 | ||||
| // SPDX-License-Identifier: GPL-2.0-or-later
 | ||||
| 
 | ||||
| #include "common/alignment.h" | ||||
| #include "common/fs/file.h" | ||||
| #include "common/fs/fs.h" | ||||
| #include "common/fs/path_util.h" | ||||
| #include "common/logging/log.h" | ||||
| #include "common/settings.h" | ||||
| #include "common/thread.h" | ||||
| #include "core/hle/service/acc/profile_manager.h" | ||||
| #include "yuzu/play_time_manager.h" | ||||
| 
 | ||||
| namespace PlayTime { | ||||
| 
 | ||||
| namespace { | ||||
| 
 | ||||
| struct PlayTimeElement { | ||||
|     ProgramId program_id; | ||||
|     PlayTime play_time; | ||||
| }; | ||||
| 
 | ||||
| std::optional<std::filesystem::path> GetCurrentUserPlayTimePath() { | ||||
|     const Service::Account::ProfileManager manager; | ||||
|     const auto uuid = manager.GetUser(static_cast<s32>(Settings::values.current_user)); | ||||
|     if (!uuid.has_value()) { | ||||
|         return std::nullopt; | ||||
|     } | ||||
|     return Common::FS::GetYuzuPath(Common::FS::YuzuPath::PlayTimeDir) / | ||||
|            uuid->RawString().append(".bin"); | ||||
| } | ||||
| 
 | ||||
| [[nodiscard]] bool ReadPlayTimeFile(PlayTimeDatabase& out_play_time_db) { | ||||
|     const auto filename = GetCurrentUserPlayTimePath(); | ||||
| 
 | ||||
|     if (!filename.has_value()) { | ||||
|         LOG_ERROR(Frontend, "Failed to get current user path"); | ||||
|         return false; | ||||
|     } | ||||
| 
 | ||||
|     out_play_time_db.clear(); | ||||
| 
 | ||||
|     if (Common::FS::Exists(filename.value())) { | ||||
|         Common::FS::IOFile file{filename.value(), Common::FS::FileAccessMode::Read, | ||||
|                                 Common::FS::FileType::BinaryFile}; | ||||
|         if (!file.IsOpen()) { | ||||
|             LOG_ERROR(Frontend, "Failed to open play time file: {}", | ||||
|                       Common::FS::PathToUTF8String(filename.value())); | ||||
|             return false; | ||||
|         } | ||||
| 
 | ||||
|         const size_t num_elements = file.GetSize() / sizeof(PlayTimeElement); | ||||
|         std::vector<PlayTimeElement> elements(num_elements); | ||||
| 
 | ||||
|         if (file.ReadSpan<PlayTimeElement>(elements) != num_elements) { | ||||
|             return false; | ||||
|         } | ||||
| 
 | ||||
|         for (const auto& [program_id, play_time] : elements) { | ||||
|             if (program_id != 0) { | ||||
|                 out_play_time_db[program_id] = play_time; | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     return true; | ||||
| } | ||||
| 
 | ||||
| [[nodiscard]] bool WritePlayTimeFile(const PlayTimeDatabase& play_time_db) { | ||||
|     const auto filename = GetCurrentUserPlayTimePath(); | ||||
| 
 | ||||
|     if (!filename.has_value()) { | ||||
|         LOG_ERROR(Frontend, "Failed to get current user path"); | ||||
|         return false; | ||||
|     } | ||||
| 
 | ||||
|     Common::FS::IOFile file{filename.value(), Common::FS::FileAccessMode::Write, | ||||
|                             Common::FS::FileType::BinaryFile}; | ||||
|     if (!file.IsOpen()) { | ||||
|         LOG_ERROR(Frontend, "Failed to open play time file: {}", | ||||
|                   Common::FS::PathToUTF8String(filename.value())); | ||||
|         return false; | ||||
|     } | ||||
| 
 | ||||
|     std::vector<PlayTimeElement> elements; | ||||
|     elements.reserve(play_time_db.size()); | ||||
| 
 | ||||
|     for (auto& [program_id, play_time] : play_time_db) { | ||||
|         if (program_id != 0) { | ||||
|             elements.push_back(PlayTimeElement{program_id, play_time}); | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     return file.WriteSpan<PlayTimeElement>(elements) == elements.size(); | ||||
| } | ||||
| 
 | ||||
| } // namespace
 | ||||
| 
 | ||||
| PlayTimeManager::PlayTimeManager() { | ||||
|     if (!ReadPlayTimeFile(database)) { | ||||
|         LOG_ERROR(Frontend, "Failed to read play time database! Resetting to default."); | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| PlayTimeManager::~PlayTimeManager() { | ||||
|     Save(); | ||||
| } | ||||
| 
 | ||||
| void PlayTimeManager::SetProgramId(u64 program_id) { | ||||
|     running_program_id = program_id; | ||||
| } | ||||
| 
 | ||||
| void PlayTimeManager::Start() { | ||||
|     play_time_thread = std::jthread([&](std::stop_token stop_token) { AutoTimestamp(stop_token); }); | ||||
| } | ||||
| 
 | ||||
| void PlayTimeManager::Stop() { | ||||
|     play_time_thread = {}; | ||||
| } | ||||
| 
 | ||||
| void PlayTimeManager::AutoTimestamp(std::stop_token stop_token) { | ||||
|     Common::SetCurrentThreadName("PlayTimeReport"); | ||||
| 
 | ||||
|     using namespace std::literals::chrono_literals; | ||||
|     using std::chrono::seconds; | ||||
|     using std::chrono::steady_clock; | ||||
| 
 | ||||
|     auto timestamp = steady_clock::now(); | ||||
| 
 | ||||
|     const auto GetDuration = [&]() -> u64 { | ||||
|         const auto last_timestamp = std::exchange(timestamp, steady_clock::now()); | ||||
|         const auto duration = std::chrono::duration_cast<seconds>(timestamp - last_timestamp); | ||||
|         return static_cast<u64>(duration.count()); | ||||
|     }; | ||||
| 
 | ||||
|     while (!stop_token.stop_requested()) { | ||||
|         Common::StoppableTimedWait(stop_token, 30s); | ||||
| 
 | ||||
|         database[running_program_id] += GetDuration(); | ||||
|         Save(); | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| void PlayTimeManager::Save() { | ||||
|     if (!WritePlayTimeFile(database)) { | ||||
|         LOG_ERROR(Frontend, "Failed to update play time database!"); | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| u64 PlayTimeManager::GetPlayTime(u64 program_id) const { | ||||
|     auto it = database.find(program_id); | ||||
|     if (it != database.end()) { | ||||
|         return it->second; | ||||
|     } else { | ||||
|         return 0; | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| void PlayTimeManager::ResetProgramPlayTime(u64 program_id) { | ||||
|     database.erase(program_id); | ||||
|     Save(); | ||||
| } | ||||
| 
 | ||||
| QString ReadablePlayTime(qulonglong time_seconds) { | ||||
|     if (time_seconds == 0) { | ||||
|         return {}; | ||||
|     } | ||||
|     const auto time_minutes = std::max(static_cast<double>(time_seconds) / 60, 1.0); | ||||
|     const auto time_hours = static_cast<double>(time_seconds) / 3600; | ||||
|     const bool is_minutes = time_minutes < 60; | ||||
|     const char* unit = is_minutes ? "m" : "h"; | ||||
|     const auto value = is_minutes ? time_minutes : time_hours; | ||||
| 
 | ||||
|     return QStringLiteral("%L1 %2") | ||||
|         .arg(value, 0, 'f', !is_minutes && time_seconds % 60 != 0) | ||||
|         .arg(QString::fromUtf8(unit)); | ||||
| } | ||||
| 
 | ||||
| } // namespace PlayTime
 | ||||
							
								
								
									
										44
									
								
								src/yuzu/play_time_manager.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										44
									
								
								src/yuzu/play_time_manager.h
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,44 @@ | ||||
| // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 | ||||
| // SPDX-License-Identifier: GPL-2.0-or-later
 | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #include <QString> | ||||
| 
 | ||||
| #include <map> | ||||
| 
 | ||||
| #include "common/common_funcs.h" | ||||
| #include "common/common_types.h" | ||||
| #include "common/polyfill_thread.h" | ||||
| 
 | ||||
| namespace PlayTime { | ||||
| 
 | ||||
| using ProgramId = u64; | ||||
| using PlayTime = u64; | ||||
| using PlayTimeDatabase = std::map<ProgramId, PlayTime>; | ||||
| 
 | ||||
| class PlayTimeManager { | ||||
| public: | ||||
|     explicit PlayTimeManager(); | ||||
|     ~PlayTimeManager(); | ||||
| 
 | ||||
|     YUZU_NON_COPYABLE(PlayTimeManager); | ||||
|     YUZU_NON_MOVEABLE(PlayTimeManager); | ||||
| 
 | ||||
|     u64 GetPlayTime(u64 program_id) const; | ||||
|     void ResetProgramPlayTime(u64 program_id); | ||||
|     void SetProgramId(u64 program_id); | ||||
|     void Start(); | ||||
|     void Stop(); | ||||
| 
 | ||||
| private: | ||||
|     PlayTimeDatabase database; | ||||
|     u64 running_program_id; | ||||
|     std::jthread play_time_thread; | ||||
|     void AutoTimestamp(std::stop_token stop_token); | ||||
|     void Save(); | ||||
| }; | ||||
| 
 | ||||
| QString ReadablePlayTime(qulonglong time_seconds); | ||||
| 
 | ||||
| } // namespace PlayTime
 | ||||
| @ -183,6 +183,9 @@ struct Values { | ||||
|     Setting<bool> show_size{linkage, true, "show_size", Category::UiGameList}; | ||||
|     Setting<bool> show_types{linkage, true, "show_types", Category::UiGameList}; | ||||
| 
 | ||||
|     // Play time
 | ||||
|     Setting<bool> show_play_time{linkage, true, "show_play_time", Category::UiGameList}; | ||||
| 
 | ||||
|     bool configuration_applied; | ||||
|     bool reset_to_defaults; | ||||
|     bool shortcut_already_warned{false}; | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user