Skip to content
This repository has been archived by the owner on Sep 21, 2022. It is now read-only.

Commit

Permalink
Merge pull request #105 from Turupawn/devel
Browse files Browse the repository at this point in the history 
Road to v0.12 2
  • Loading branch information
@Turupawn
Turupawn committed Nov 12, 2019
2 parents 2c313d2 + ae97358 commit 3fc34d4
Show file tree
Hide file tree
Showing 18 changed files with 223 additions and 48 deletions.
1 change: 1 addition & 0 deletions examples/code-samples/c/02_BrowseMods.c
View file
Expand Up @@ -37,6 +37,7 @@ int main(void)
ModioFilterCreator filter;
modioInitFilter(&filter);
modioSetFilterLimit(&filter, 3);
modioSetFilterSort(&filter, "popular", false);

printf("Getting mods...\n");

Expand Down
1 change: 1 addition & 0 deletions include/Globals.h
View file
Expand Up @@ -8,6 +8,7 @@

namespace modio
{
extern std::string VERSION;
extern std::string API_KEY;
extern std::string ACCESS_TOKEN;
extern bool IS_LOGGED_IN;
Expand Down
1 change: 1 addition & 0 deletions include/Utility.h
View file
Expand Up @@ -99,6 +99,7 @@ void removeFile(const std::string &filename);
double getFileSize(const std::string &file_path);
void createPath(const std::string &strPathAndFile);
std::vector<std::string> getHeaders();
std::vector<std::string> getHeadersNoToken();
std::vector<std::string> getUrlEncodedHeaders();
std::string base64Encode(unsigned char const* bytes_to_encode, unsigned int in_len);
} // namespace modio
Expand Down
2 changes: 1 addition & 1 deletion include/c/ModioC.h
View file
Expand Up @@ -684,7 +684,7 @@ extern "C"
void MODIO_DLL modioGetModDownloadQueue(ModioQueuedModDownload* download_queue);
u32 MODIO_DLL modioGetModfileUploadQueueCount(void);
void MODIO_DLL modioGetModfileUploadQueue(ModioQueuedModfileUpload* upload_queue);
void MODIO_DLL modioGetInstalledMod(u32 mod_id, ModioInstalledMod *installed_mods);
void MODIO_DLL modioGetInstalledMod(u32 mod_id, ModioInstalledMod *installed_mod);
u32 MODIO_DLL modioGetAllInstalledModsCount(void);
void MODIO_DLL modioGetAllInstalledMods(ModioInstalledMod* installed_mods);
u32 MODIO_DLL modioGetAllDownloadedModsCount(void);
Expand Down
2 changes: 2 additions & 0 deletions include/wrappers/CurlUtility.h
View file
Expand Up @@ -87,6 +87,8 @@ class CurrentModfileUpload
CURL *curl_handle;
struct curl_slist *slist;
struct curl_httppost *httppost;
bool is_temporary_zip_modfile;
std::string zip_modfile_path;

CurrentModfileUpload();
~CurrentModfileUpload();
Expand Down
1 change: 1 addition & 0 deletions src/Globals.cpp
View file
Expand Up @@ -2,6 +2,7 @@

namespace modio
{
std::string VERSION = "v0.12.4 DEV";
std::string API_KEY;
std::string ACCESS_TOKEN = "";
bool IS_LOGGED_IN = false;
Expand Down
150 changes: 140 additions & 10 deletions src/ModioUtility.cpp
View file
@@ -1,4 +1,5 @@
#include "ModioUtility.h"
#include "c/creators/ModioFilterCreator.h"

namespace modio
{
Expand All @@ -16,10 +17,12 @@ void onUpdateCurrentUser(void *object, ModioResponse response, ModioUser user)

void onUpdateCurrentUserRatings(void *object, ModioResponse response, ModioRating *ratings_array, u32 ratings_array_size)
{
modio::current_user_ratings.clear();
if(response.result_offset == 0) /* Clear only if is first result page */
modio::current_user_ratings.clear();

if (response.code >= 200 && response.code < 300)
{
modio::writeLogLine("Current user ratings updated sucessfully.", MODIO_DEBUGLEVEL_LOG);
modio::writeLogLine("Current user ratings retrieved sucessfully.", MODIO_DEBUGLEVEL_LOG);
for(u32 i=0; i<ratings_array_size; i++)
{
if(ratings_array[i].rating == 1)
Expand All @@ -29,6 +32,16 @@ void onUpdateCurrentUserRatings(void *object, ModioResponse response, ModioRatin
else
modio::current_user_ratings[ratings_array[i].mod_id] = MODIO_RATING_UNDEFINED;
}

if(response.result_offset + response.result_count < response.result_total)
{
modio::writeLogLine("Paginated response, retrieving next page...", MODIO_DEBUGLEVEL_LOG);
ModioFilterCreator filter;
modioInitFilter(&filter);
modioSetFilterOffset(&filter, response.result_offset + response.result_count);
modioGetUserRatings(NULL, filter, &modio::onUpdateCurrentUserRatings);
modioFreeFilter(&filter);
}
}
else
{
Expand All @@ -38,13 +51,30 @@ void onUpdateCurrentUserRatings(void *object, ModioResponse response, ModioRatin

void onUpdateCurrentUserSubscriptions(void* object, ModioResponse response, ModioMod *mods, u32 mods_size)
{
modio::current_user_subscriptions.clear();
if(response.result_offset == 0) /* Clear only if is first result page */
modio::current_user_subscriptions.clear();

if (response.code >= 200 && response.code < 300)
{
modio::writeLogLine("Current user subscriptions updated sucessfully.", MODIO_DEBUGLEVEL_LOG);
modio::writeLogLine("Current user subscriptions retrieved sucessfully.", MODIO_DEBUGLEVEL_LOG);

std::string subscription_logs = "";
for(u32 i=0; i<mods_size; i++)
{
modio::current_user_subscriptions.insert(mods[i].id);
subscription_logs += modio::toString(mods[i].id) + ",";
}

modio::writeLogLine("You are subscribed to the following mods: " + subscription_logs, MODIO_DEBUGLEVEL_LOG);

if(response.result_offset + response.result_count < response.result_total)
{
modio::writeLogLine("Paginated response, retrieving next page...", MODIO_DEBUGLEVEL_LOG);
ModioFilterCreator filter;
modioInitFilter(&filter);
modioSetFilterOffset(&filter, response.result_offset + response.result_count);
modioGetUserSubscriptions(NULL, filter, &modio::onUpdateCurrentUserSubscriptions);
modioFreeFilter(&filter);
}
}
else
Expand All @@ -55,19 +85,45 @@ void onUpdateCurrentUserSubscriptions(void* object, ModioResponse response, Modi

static void onAddModsToDownloadQueue(void *object, ModioResponse response, ModioMod *mods, u32 mods_size)
{
std::vector<int>* ptr_mod_ids = (std::vector<int>*)object;
if (response.code == 200)
{
modio::writeLogLine("Mod queue data retrived successfully", MODIO_DEBUGLEVEL_LOG);

for (u32 i = 0; i < mods_size; i++)
{
modio::curlwrapper::queueModDownload(mods[i]);
}

if(response.result_offset + response.result_count < response.result_total)
{
modio::writeLogLine("Paginated response, retrieving next page...", MODIO_DEBUGLEVEL_LOG);
ModioFilterCreator filter;
modioInitFilter(&filter);
for (auto &mod_id : *ptr_mod_ids)
{
modioAddFilterInField(&filter, "id", modio::toString(mod_id).c_str());
}
modioSetFilterOffset(&filter, response.result_offset + response.result_count);
modioGetAllMods(ptr_mod_ids, filter, &modio::onAddModsToDownloadQueue);
modioFreeFilter(&filter);
}else
{
delete ptr_mod_ids;
}
}else
{
modio::writeLogLine("Error retrieving mod queue data", MODIO_DEBUGLEVEL_ERROR);
delete ptr_mod_ids;
}
}

static void onModsUpdateEvent(void *object, ModioResponse response, ModioMod *mods, u32 mods_size)
{
std::vector<int>* ptr_mod_ids = (std::vector<int>*)object;
if (response.code == 200)
{
modio::writeLogLine("Updated mods data retrived successfully", MODIO_DEBUGLEVEL_LOG);
for (u32 i = 0; i < mods_size; i++)
{
modio::Mod mod;
Expand All @@ -76,35 +132,67 @@ static void onModsUpdateEvent(void *object, ModioResponse response, ModioMod *mo
modio::writeJson(mod_path_str, modio::toJson(mod));
modio::writeLogLine("Mod updated", MODIO_DEBUGLEVEL_LOG);
}

if(response.result_offset + response.result_count < response.result_total)
{
modio::writeLogLine("Paginated response, retrieving next page...", MODIO_DEBUGLEVEL_LOG);
ModioFilterCreator filter;
modioInitFilter(&filter);
for (auto &mod_id : *ptr_mod_ids)
{
modioAddFilterInField(&filter, "id", modio::toString(mod_id).c_str());
}
modioSetFilterOffset(&filter, response.result_offset + response.result_count);
modioGetAllMods(ptr_mod_ids, filter, &onModsUpdateEvent);
modioFreeFilter(&filter);
}else
{
delete ptr_mod_ids;
}
}else
{
modio::writeLogLine("Could not retrive updated mods data", MODIO_DEBUGLEVEL_ERROR);
delete ptr_mod_ids;
}
}

void updateModsCache(std::vector<u32> mod_ids)
{
ModioFilterCreator filter;
modioInitFilter(&filter);

std::vector<int>* ptr_mod_ids = new std::vector<int>();

for (auto &mod_id : mod_ids)
{
modioAddFilterInField(&filter, "id", modio::toString(mod_id).c_str());
ptr_mod_ids->push_back(mod_id);
}
modioGetAllMods(NULL, filter, &onModsUpdateEvent);

modioGetAllMods(ptr_mod_ids, filter, &onModsUpdateEvent);
modioFreeFilter(&filter);
}

void addModsToDownloadQueue(std::vector<u32> mod_ids)
{
ModioFilterCreator filter;
modioInitFilter(&filter);

std::vector<int>* ptr_mod_ids = new std::vector<int>();

for (auto &mod_id : mod_ids)
{
modioAddFilterInField(&filter, "id", modio::toString(mod_id).c_str());
ptr_mod_ids->push_back(mod_id);
}
modioGetAllMods(NULL, filter, &modio::onAddModsToDownloadQueue);

modioGetAllMods(ptr_mod_ids, filter, &modio::onAddModsToDownloadQueue);
modioFreeFilter(&filter);
}

static void onGetAllEventsPoll(void *object, ModioResponse response, ModioModEvent *events_array, u32 events_array_size)
{
u32* last_mod_event_poll_id_ptr = (u32*)object;
if (response.code == 200)
{
modio::writeLogLine("Mod events polled", MODIO_DEBUGLEVEL_LOG);
Expand Down Expand Up @@ -175,15 +263,37 @@ static void onGetAllEventsPoll(void *object, ModioResponse response, ModioModEve
modio::writeLogLine("Triggering user callback listener", MODIO_DEBUGLEVEL_LOG);
modio::event_listener_callback(response, events_array, events_array_size);
}

if(response.result_offset + response.result_count < response.result_total)
{
modio::writeLogLine("Paginated response, retrieving next page...", MODIO_DEBUGLEVEL_LOG);
ModioFilterCreator filter;
modioInitFilter(&filter);
modioAddFilterGreaterThanField(&filter, "id", modio::toString(*last_mod_event_poll_id_ptr).c_str());

for (auto installed_mod : modio::installed_mods)
{
if (modio::hasKey(installed_mod, "mod_id"))
modioAddFilterInField(&filter, "mod_id", modio::toString((u32)installed_mod["mod_id"]).c_str());
}
modioSetFilterOffset(&filter, response.result_offset + response.result_count);
modioGetAllEvents(last_mod_event_poll_id_ptr, filter, &onGetAllEventsPoll);
modioFreeFilter(&filter);
}else
{
delete last_mod_event_poll_id_ptr;
}
}
else
{
modio::writeLogLine("Could not poll mod events. Error code: " + modio::toString(response.code), MODIO_DEBUGLEVEL_ERROR);
delete last_mod_event_poll_id_ptr;
}
}

static void onGetUserEventsPoll(void *object, ModioResponse response, ModioUserEvent *events_array, u32 events_array_size)
{
u32* last_user_event_poll_id_ptr = (u32*)object;
if (response.code == 200)
{
modio::writeLogLine("User events polled ", MODIO_DEBUGLEVEL_LOG);
Expand Down Expand Up @@ -261,10 +371,26 @@ static void onGetUserEventsPoll(void *object, ModioResponse response, ModioUserE
}
delete[] mod_events_array;
}

if(response.result_offset + response.result_count < response.result_total)
{
modio::writeLogLine("Paginated response, retrieving next pagee...", MODIO_DEBUGLEVEL_LOG);
ModioFilterCreator filter;
modio::writeLogLine("Last id: " + modio::toString(*last_user_event_poll_id_ptr), MODIO_DEBUGLEVEL_LOG);
modioInitFilter(&filter);
modioAddFilterGreaterThanField(&filter, "id", modio::toString(*last_user_event_poll_id_ptr).c_str());
modioSetFilterOffset(&filter, response.result_offset + response.result_count);
modioGetUserEvents(last_user_event_poll_id_ptr, filter, &onGetUserEventsPoll);
modioFreeFilter(&filter);
}else
{
delete last_user_event_poll_id_ptr;
}
}
else
{
modio::writeLogLine("Could not poll user events. Error code: " + modio::toString(response.code), MODIO_DEBUGLEVEL_ERROR);
delete last_user_event_poll_id_ptr;
}
}

Expand All @@ -281,16 +407,17 @@ void pollEvents()
ModioFilterCreator filter;
modioInitFilter(&filter);
modioAddFilterGreaterThanField(&filter, "id", modio::toString(modio::LAST_MOD_EVENT_POLL_ID).c_str());
//modioAddFilterMinField(&filter, "date_added", modio::toString(modio::LAST_MOD_EVENT_POLL).c_str());
//modioAddFilterSmallerThanField(&filter, "date_added", modio::toString(current_time).c_str());

for (auto installed_mod : modio::installed_mods)
{
if (modio::hasKey(installed_mod, "mod_id"))
modioAddFilterInField(&filter, "mod_id", modio::toString((u32)installed_mod["mod_id"]).c_str());
}

modioGetAllEvents(NULL, filter, &onGetAllEventsPoll);
u32* last_mod_event_poll_id_ptr = new u32;
*last_mod_event_poll_id_ptr = modio::LAST_MOD_EVENT_POLL_ID;

modioGetAllEvents(last_mod_event_poll_id_ptr, filter, &onGetAllEventsPoll);
modioFreeFilter(&filter);

modio::LAST_MOD_EVENT_POLL_TIME = current_time;
Expand All @@ -313,7 +440,10 @@ void pollEvents()
//modioAddFilterMinField(&filter, "date_added", modio::toString(modio::LAST_USER_EVENT_POLL).c_str());
modioAddFilterGreaterThanField(&filter, "id", modio::toString(modio::LAST_USER_EVENT_POLL_ID).c_str());

modioGetUserEvents(NULL, filter, &onGetUserEventsPoll);
u32 *last_user_event_poll_id_ptr = new u32;
*last_user_event_poll_id_ptr = (u32)modio::LAST_USER_EVENT_POLL_ID;

modioGetUserEvents(last_user_event_poll_id_ptr, filter, &onGetUserEventsPoll);
modioFreeFilter(&filter);

modio::LAST_USER_EVENT_POLL_TIME = current_time;
Expand Down
13 changes: 11 additions & 2 deletions src/Utility.cpp
View file
Expand Up @@ -90,7 +90,7 @@ void writeLogLine(const std::string &text, u32 debug_level)
if (DEBUG_LEVEL < debug_level)
return;

std::ofstream log_file(getModIODirectory() + "log", std::ios::app);
std::ofstream log_file(getModIODirectory() + "log.txt", std::ios::app);
log_file << "[" << modio::getCurrentTimeSeconds() << "] ";
if (debug_level == MODIO_DEBUGLEVEL_ERROR)
{
Expand All @@ -110,7 +110,7 @@ void writeLogLine(const std::string &text, u32 debug_level)

void clearLog()
{
std::ofstream log_file(getModIODirectory() + "log");
std::ofstream log_file(getModIODirectory() + "log.txt");
log_file.close();
}

Expand Down Expand Up @@ -530,14 +530,23 @@ void createPath(const std::string &path)
std::vector<std::string> getHeaders()
{
std::vector<std::string> headers;
headers.push_back("User-Agent: Modio-SDK-" + modio::VERSION);
if (modio::ACCESS_TOKEN != "")
headers.push_back("Authorization: Bearer " + modio::ACCESS_TOKEN);
return headers;
}

std::vector<std::string> getHeadersNoToken()
{
std::vector<std::string> headers;
headers.push_back("User-Agent: Modio-SDK-" + modio::VERSION);
return headers;
}

std::vector<std::string> getUrlEncodedHeaders()
{
std::vector<std::string> headers;
headers.push_back("User-Agent: Modio-SDK-" + modio::VERSION);
if (modio::ACCESS_TOKEN != "")
headers.push_back("Authorization: Bearer " + modio::ACCESS_TOKEN);
headers.push_back("Content-Type: application/x-www-form-urlencoded");
Expand Down
9 changes: 8 additions & 1 deletion src/c/creators/ModioFilterCreator.cpp
View file
Expand Up @@ -74,12 +74,19 @@ extern "C"
filter->cache_max_age_seconds = 1;
}

bool shouldAppendMinusToSort(std::string field, bool ascending)
{
if(field == "popular" || field == "downloads" || field == "rating" || field == "subscribers")
return ascending;
return !ascending;
}

void modioSetFilterSort(ModioFilterCreator* filter, char const* field, bool ascending)
{
if(filter->sort)
delete[] filter->sort;
std::string ascending_str = "";
if(!ascending)
if(shouldAppendMinusToSort(field, ascending))
ascending_str = "-";
std::string sort_str = std::string("_sort=") + ascending_str + field;
filter->sort = new char[sort_str.size() + 1];
Expand Down

0 comments on commit 3fc34d4

Please sign in to comment.