Public-Mirror/gbe_fork
1
0
Fork 0
mirror of https://github.com/Detanup01/gbe_fork.git synced 2025-01-06 07:44:14 +08:00
Code Issues 1 Projects Releases Wiki Activity

* fix mod details struct access again!

Browse Source 
* fix querying mod tags count
* fix mod preview file URI
* copy missing mod min/max branches
* use different timing for mod update/create/add dates
This commit is contained in:
a 2024-11-26 21:52:59 +02:00
parent 30f1f56947
commit 1e23974c48
5 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dll/dll/steam_ugc.h
View File

@ -82,7 +82,7 @@ private:
std::optional<std::string> get_query_ugc_tag(UGCQueryHandle_t handle, uint32 index, uint32 indexTag);
std::optional<std::vector<std::string>> get_query_ugc_tags(UGCQueryHandle_t handle, uint32 index);
std::vector<std::string> get_query_ugc_tags(UGCQueryHandle_t handle, uint32 index);
void set_details(PublishedFileId_t id, SteamUGCDetails_t *pDetails, IUgcItfVersion ver);

2
dll/settings.cpp
View File

@ -220,6 +220,8 @@ void Settings::addModDetails(PublishedFileId_t id, const Mod_entry &details)
f->numChildren = details.numChildren;
f->previewURL = details.previewURL;
f->total_files_sizes = details.total_files_sizes;
f->min_game_branch = details.min_game_branch;
f->max_game_branch = details.max_game_branch;
}
}

16
dll/settings_parser.cpp
View File

@ -940,6 +940,12 @@ static void parse_installed_app_Ids(class Settings *settings_client, class Setti
static const auto one_week_ago_epoch = std::chrono::duration_cast<std::chrono::seconds>(
( startup_time - std::chrono::hours(24 * 7) ).time_since_epoch()
).count();
static const auto two_week_ago_epoch = std::chrono::duration_cast<std::chrono::seconds>(
( startup_time - std::chrono::hours(24 * 7 * 2) ).time_since_epoch()
).count();
static const auto three_week_ago_epoch = std::chrono::duration_cast<std::chrono::seconds>(
( startup_time - std::chrono::hours(24 * 7 * 3) ).time_since_epoch()
).count();
static size_t get_file_size_safe(const std::string &filepath, const std::string &basepath, int32 default_val = 0)
{
@ -963,7 +969,7 @@ static std::string get_mod_preview_url(const std::string &previewFileName, const
} else {
auto settings_folder = std::string(Local_Storage::get_game_settings_path());
std::replace(settings_folder.begin(), settings_folder.end(), '\\', '/');
return "file://" + settings_folder + "mod_images/" + mod_id + "/" + previewFileName;
return "file:///" + settings_folder + "mod_images/" + mod_id + "/" + previewFileName;
}
}
@ -993,8 +999,8 @@ static void try_parse_mods_file(class Settings *settings_client, Settings *setti
newMod.description = mod.value().value("description", std::string(""));
newMod.steamIDOwner = mod.value().value("steam_id_owner", settings_client->get_local_steam_id().ConvertToUint64());
newMod.timeCreated = mod.value().value("time_created", (uint32)one_week_ago_epoch);
newMod.timeUpdated = mod.value().value("time_updated", (uint32)one_week_ago_epoch);
newMod.timeAddedToUserList = mod.value().value("time_added", (uint32)one_week_ago_epoch);
newMod.timeUpdated = mod.value().value("time_updated", (uint32)two_week_ago_epoch);
newMod.timeAddedToUserList = mod.value().value("time_added", (uint32)three_week_ago_epoch);
newMod.visibility = k_ERemoteStoragePublishedFileVisibilityPublic;
newMod.banned = false;
newMod.acceptedForUse = true;
@ -1077,8 +1083,8 @@ static void try_detect_mods_folder(class Settings *settings_client, Settings *se
newMod.description = "mod #" + mod_folder;
newMod.steamIDOwner = settings_client->get_local_steam_id().ConvertToUint64();
newMod.timeCreated = (uint32)one_week_ago_epoch;
newMod.timeUpdated = (uint32)one_week_ago_epoch;
newMod.timeAddedToUserList = (uint32)one_week_ago_epoch;
newMod.timeUpdated = (uint32)two_week_ago_epoch;
newMod.timeAddedToUserList = (uint32)three_week_ago_epoch;
newMod.visibility = k_ERemoteStoragePublishedFileVisibilityPublic;
newMod.banned = false;
newMod.acceptedForUse = true;

4
dll/steam_remote_storage.cpp
View File

@ -446,7 +446,6 @@ SteamAPICall_t Steam_Remote_Storage::UGCDownload( UGCHandle_t hContent, uint32 u
data.m_eResult = k_EResultOK;
data.m_ulSteamIDOwner = mod.steamIDOwner;
data.m_nSizeInBytes = mod_size;
data.m_ulSteamIDOwner = mod.steamIDOwner;
mod_name.copy(data.m_pchFileName, sizeof(data.m_pchFileName) - 1);
PRINT_DEBUG(" QueryUGCRequest data.m_pchFileName = '%s'", data.m_pchFileName);
@ -497,7 +496,7 @@ bool Steam_Remote_Storage::GetUGCDetails( UGCHandle_t hContent, AppId_t *pnAppID
{
PRINT_DEBUG_ENTRY();
std::lock_guard<std::recursive_mutex> lock(global_mutex);
return false;
}
@ -1157,7 +1156,6 @@ SteamAPICall_t Steam_Remote_Storage::UGCDownloadToLocation( UGCHandle_t hContent
data.m_nAppID = settings->get_local_game_id().AppID();
data.m_ulSteamIDOwner = mod.steamIDOwner;
data.m_nSizeInBytes = mod_size;
data.m_ulSteamIDOwner = mod.steamIDOwner;
mod_name.copy(data.m_pchFileName, sizeof(data.m_pchFileName) - 1);

57
dll/steam_ugc.cpp
View File

@ -48,19 +48,25 @@ std::optional<Mod_entry> Steam_UGC::get_query_ugc(UGCQueryHandle_t handle, uint3
return settings->getMod(file_id);
}
std::optional<std::vector<std::string>> Steam_UGC::get_query_ugc_tags(UGCQueryHandle_t handle, uint32 index)
std::vector<std::string> Steam_UGC::get_query_ugc_tags(UGCQueryHandle_t handle, uint32 index)
{
auto res = get_query_ugc(handle, index);
if (!res.has_value()) return std::nullopt;
std::string tmp = res.value().tags;
auto tags_tokens = std::vector<std::string>{};
std::stringstream ss(res.value().tags);
std::string tmp{};
while(ss >> tmp) {
if (tmp.back() == ',') tmp = tmp.substr(0, tmp.size() - 1);
tags_tokens.push_back(tmp);
size_t start = 0;
while (true) {
auto end = tmp.find(',', start);
if (end == std::string::npos) break;
tags_tokens.push_back(tmp.substr(start, end - start));
start = end + 1;
}
tags_tokens.push_back(tmp.substr(start));
return tags_tokens;
}
@ -68,8 +74,6 @@ std::optional<std::vector<std::string>> Steam_UGC::get_query_ugc_tags(UGCQueryHa
void Steam_UGC::set_details(PublishedFileId_t id, SteamUGCDetails_t *pDetails, IUgcItfVersion ver)
{
if (pDetails) {
memset(pDetails, 0, sizeof(SteamUGCDetails_t));
pDetails->m_nPublishedFileId = id;
if (settings->isModInstalled(id)) {
@ -90,18 +94,29 @@ void Steam_UGC::set_details(PublishedFileId_t id, SteamUGCDetails_t *pDetails, I
pDetails->m_nPreviewFileSize = mod.previewFileSize;
pDetails->m_rtimeCreated = mod.timeCreated;
pDetails->m_rtimeUpdated = mod.timeUpdated;
pDetails->m_ulSteamIDOwner = settings->get_local_steam_id().ConvertToUint64();
pDetails->m_ulSteamIDOwner = mod.steamIDOwner;
pDetails->m_rtimeAddedToUserList = mod.timeAddedToUserList;
pDetails->m_unVotesUp = mod.votesUp;
pDetails->m_unVotesDown = mod.votesDown;
pDetails->m_flScore = mod.score;
mod.primaryFileName.copy(pDetails->m_pchFileName, sizeof(pDetails->m_pchFileName) - 1);
mod.description.copy(pDetails->m_rgchDescription, sizeof(pDetails->m_rgchDescription) - 1);
mod.tags.copy(pDetails->m_rgchTags, sizeof(pDetails->m_rgchTags) - 1);
mod.title.copy(pDetails->m_rgchTitle, sizeof(pDetails->m_rgchTitle) - 1);
mod.workshopItemURL.copy(pDetails->m_rgchURL, sizeof(pDetails->m_rgchURL) - 1);
// real steamclient64.dll may set this to null! (ex: item id 3366485326)
auto copied_chars = mod.primaryFileName.copy(pDetails->m_pchFileName, sizeof(pDetails->m_pchFileName) - 1);
pDetails->m_pchFileName[copied_chars] = 0;
copied_chars = mod.description.copy(pDetails->m_rgchDescription, sizeof(pDetails->m_rgchDescription) - 1);
pDetails->m_rgchDescription[copied_chars] = 0;
copied_chars = mod.tags.copy(pDetails->m_rgchTags, sizeof(pDetails->m_rgchTags) - 1);
pDetails->m_rgchTags[copied_chars] = 0;
copied_chars = mod.title.copy(pDetails->m_rgchTitle, sizeof(pDetails->m_rgchTitle) - 1);
pDetails->m_rgchTitle[copied_chars] = 0;
// real steamclient64.dll may set this to null! (ex: item id 3366485326)
copied_chars = mod.workshopItemURL.copy(pDetails->m_rgchURL, sizeof(pDetails->m_rgchURL) - 1);
pDetails->m_rgchURL[copied_chars] = 0;
// TODO should we enable this?
// pDetails->m_unNumChildren = mod.numChildren;
@ -362,10 +377,10 @@ bool Steam_UGC::GetQueryUGCResult_old( UGCQueryHandle_t handle, uint32 index, St
std::optional<std::string> Steam_UGC::get_query_ugc_tag(UGCQueryHandle_t handle, uint32 index, uint32 indexTag)
{
auto res = get_query_ugc_tags(handle, index);
if (!res.has_value()) return std::nullopt;
if (indexTag >= res.value().size()) return std::nullopt;
if (res.empty()) return std::nullopt;
if (indexTag >= res.size()) return std::nullopt;
std::string tmp = res.value()[indexTag];
std::string tmp = res[indexTag];
if (tmp.back() == ',') {
tmp = tmp.substr(0, tmp.size() - 1);
}
@ -380,7 +395,7 @@ uint32 Steam_UGC::GetQueryUGCNumTags( UGCQueryHandle_t handle, uint32 index )
if (handle == k_UGCQueryHandleInvalid) return 0;
auto res = get_query_ugc_tags(handle, index);
return res.has_value() ? static_cast<uint32>(res.value().size()) : 0;
return static_cast<uint32>(res.size());
}
bool Steam_UGC::GetQueryUGCTag( UGCQueryHandle_t handle, uint32 index, uint32 indexTag, STEAM_OUT_STRING_COUNT( cchValueSize ) char* pchValue, uint32 cchValueSize )
@ -994,9 +1009,7 @@ bool Steam_UGC::SetItemVisibility( UGCUpdateHandle_t handle, ERemoteStoragePubli
bool Steam_UGC::SetItemTags( UGCUpdateHandle_t updateHandle, const SteamParamStringArray_t *pTags )
{
PRINT_DEBUG("old");
std::lock_guard<std::recursive_mutex> lock(global_mutex);
return false;
return SetItemTags(updateHandle, pTags, false);
}
bool Steam_UGC::SetItemTags( UGCUpdateHandle_t updateHandle, const SteamParamStringArray_t *pTags, bool bAllowAdminTags )
@ -1368,7 +1381,7 @@ bool Steam_UGC::GetItemInstallInfo( PublishedFileId_t nPublishedFileID, uint64 *
}
if (punSizeOnDisk) *punSizeOnDisk = mod.primaryFileSize;
if (punTimeStamp) *punTimeStamp = mod.timeUpdated;
if (punTimeStamp) *punTimeStamp = mod.timeAddedToUserList;
if (pchFolder && cchFolderSize) {
// human fall flat doesn't send a nulled buffer, and won't recognize the proper mod path because of that
memset(pchFolder, 0, cchFolderSize);