AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 18:15:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Http_GetCurrent only returns request ID

Browse Source
This commit is contained in:
UnknownShadow200 2020-09-05 17:18:23 +10:00
parent ddf7b10d91
commit 49f7160974
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Http.c
View File

@ -1054,24 +1054,19 @@ cc_bool Http_GetResult(int reqID, struct HttpRequest* item) {
return i >= 0; return i >= 0;
} }
cc_bool Http_GetCurrent(struct HttpRequest* request, int* progress) { cc_bool Http_GetCurrent(int* reqID, int* progress) {
Mutex_Lock(curRequestMutex); Mutex_Lock(curRequestMutex);
{ {
*request = http_curRequest; *reqID = http_curRequest.id;
*progress = http_curProgress; *progress = http_curProgress;
} }
Mutex_Unlock(curRequestMutex); Mutex_Unlock(curRequestMutex);
return request->id != 0; return *reqID != 0;
} }
int Http_CheckProgress(int reqID) { int Http_CheckProgress(int reqID) {
int curReqID, progress; int curReqID, progress;
Mutex_Lock(curRequestMutex); Http_GetCurrent(&curReqID, &progress);
{
curReqID = http_curRequest.id;
progress = http_curProgress;
}
Mutex_Unlock(curRequestMutex);
if (reqID != curReqID) progress = HTTP_PROGRESS_NOT_WORKING_ON; if (reqID != curReqID) progress = HTTP_PROGRESS_NOT_WORKING_ON;
return progress; return progress;

2
src/Http.h
View File

@ -72,7 +72,7 @@ cc_bool Http_DescribeError(cc_result res, String* dst);
/* (Data may still be non NULL even on error, e.g. on a http 404 error) */ /* (Data may still be non NULL even on error, e.g. on a http 404 error) */
cc_bool Http_GetResult(int reqID, struct HttpRequest* item); cc_bool Http_GetResult(int reqID, struct HttpRequest* item);
/* Retrieves information about the request currently being processed. */ /* Retrieves information about the request currently being processed. */
cc_bool Http_GetCurrent(struct HttpRequest* request, int* progress); cc_bool Http_GetCurrent(int* reqID, int* progress);
/* Retrieves information about the download progress of the given request. */ /* Retrieves information about the download progress of the given request. */
/* NOTE: This may return HTTP_PROGRESS_NOT_WORKING_ON if download has finished. */ /* NOTE: This may return HTTP_PROGRESS_NOT_WORKING_ON if download has finished. */
/* As such, this method should always be paired with a call to Http_GetResult. */ /* As such, this method should always be paired with a call to Http_GetResult. */

11
src/LScreens.c
View File

@ -1098,13 +1098,13 @@ static void ResourcesScreen_SetStatus(const String* str) {
LWidget_Draw(w); LWidget_Draw(w);
} }
static void ResourcesScreen_UpdateStatus(struct HttpRequest* req) { static void ResourcesScreen_UpdateStatus(int reqID) {
String str; char strBuffer[STRING_SIZE]; String str; char strBuffer[STRING_SIZE];
const char* name; const char* name;
struct LLabel* w = &ResourcesScreen_Instance.lblStatus; struct LLabel* w = &ResourcesScreen_Instance.lblStatus;
int count; int count;
name = Fetcher_RequestName(req->id); name = Fetcher_RequestName(reqID);
if (!name) return; if (!name) return;
String_InitArray(str, strBuffer); String_InitArray(str, strBuffer);
@ -1116,11 +1116,10 @@ static void ResourcesScreen_UpdateStatus(struct HttpRequest* req) {
} }
static void ResourcesScreen_UpdateProgress(struct ResourcesScreen* s) { static void ResourcesScreen_UpdateProgress(struct ResourcesScreen* s) {
struct HttpRequest req; int reqID, progress;
int progress;
if (!Http_GetCurrent(&req, &progress)) return; if (!Http_GetCurrent(&reqID, &progress)) return;
ResourcesScreen_UpdateStatus(&req); ResourcesScreen_UpdateStatus(reqID);
/* making request still, haven't started download yet */ /* making request still, haven't started download yet */
if (progress < 0 || progress > 100) return; if (progress < 0 || progress > 100) return;