mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-03 01:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow to cancel dir size calculation (#13134)

Browse Source
This commit is contained in:
Elad Ashkenazi 2022-12-30 10:34:35 +02:00 committed by GitHub
parent eeda958f33
commit 382a27cb2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Utilities/File.cpp
View File

@ -1924,7 +1924,7 @@ bool fs::remove_all(const std::string& path, bool remove_root, bool is_no_dir_ok
return true; return true;
} }
u64 fs::get_dir_size(const std::string& path, u64 rounding_alignment) u64 fs::get_dir_size(const std::string& path, u64 rounding_alignment, atomic_t<bool>* cancel_flag)
{ {
u64 result = 0; u64 result = 0;
@ -1937,6 +1937,11 @@ u64 fs::get_dir_size(const std::string& path, u64 rounding_alignment)
for (const auto& entry : root_dir) for (const auto& entry : root_dir)
{ {
if (cancel_flag && *cancel_flag)
{
return umax;
}
if (entry.name == "." || entry.name == "..") if (entry.name == "." || entry.name == "..")
{ {
continue; continue;

2
Utilities/File.h
View File

@ -669,7 +669,7 @@ namespace fs
bool remove_all(const std::string& path, bool remove_root = true, bool is_no_dir_ok = false); bool remove_all(const std::string& path, bool remove_root = true, bool is_no_dir_ok = false);
// Get size of all files recursively // Get size of all files recursively
u64 get_dir_size(const std::string& path, u64 rounding_alignment = 1); u64 get_dir_size(const std::string& path, u64 rounding_alignment = 1, atomic_t<bool>* cancel_flag = nullptr);
enum class error : uint enum class error : uint
{ {

13
rpcs3/rpcs3qt/game_list_frame.cpp
View File

@ -156,6 +156,13 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> gui_settings, std
item->call_icon_func(); item->call_icon_func();
} }
}); });
connect(&m_size_watcher, &QFutureWatcher<void>::canceled, this, [this]()
{
if (m_size_watcher_cancel)
{
*m_size_watcher_cancel = true;
}
});
connect(&m_size_watcher, &QFutureWatcher<void>::finished, this, [this]() connect(&m_size_watcher, &QFutureWatcher<void>::finished, this, [this]()
{ {
Refresh(); Refresh();
@ -779,9 +786,11 @@ void game_list_frame::OnRefreshFinished()
Refresh(); Refresh();
m_size_watcher.setFuture(QtConcurrent::map(m_game_data, [this](const game_info& game) -> void m_size_watcher_cancel = std::make_shared<atomic_t<bool>>(false);
m_size_watcher.setFuture(QtConcurrent::map(m_game_data, [this, cancel = m_size_watcher_cancel](const game_info& game) -> void
{ {
if (game) game->info.size_on_disk = fs::get_dir_size(game->info.path); if (game) game->info.size_on_disk = fs::get_dir_size(game->info.path, 1, cancel.get());
})); }));
} }

1
rpcs3/rpcs3qt/game_list_frame.h
View File

@ -161,6 +161,7 @@ private:
QFutureWatcher<void> m_size_watcher; QFutureWatcher<void> m_size_watcher;
QFutureWatcher<void> m_refresh_watcher; QFutureWatcher<void> m_refresh_watcher;
QFutureWatcher<movie_item*> m_repaint_watcher; QFutureWatcher<movie_item*> m_repaint_watcher;
std::shared_ptr<atomic_t<bool>> m_size_watcher_cancel;
QSet<QString> m_hidden_list; QSet<QString> m_hidden_list;
bool m_show_hidden{false}; bool m_show_hidden{false};