blackteay/fbi-i18n-zh
1
0
Fork 0
mirror of https://gitlab.com/Theopse/fbi-i18n-zh.git synced 2025-04-06 03:58:02 +08:00
Code Issues Projects Releases Wiki Activity

Refine cURL options (thanks @mariohackandglitch for the reference)

Browse Source
This commit is contained in:
Steveice10 2019-01-01 10:12:07 -08:00
parent 4c00b67169
commit 6a5f6adafa
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/core/http.c
View File

@ -368,10 +368,13 @@ Result http_download_callback(const char* url, u32 bufferSize, u64* contentLengt
curl_easy_setopt(curl, CURLOPT_URL, url); curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_USERAGENT, HTTP_USER_AGENT); curl_easy_setopt(curl, CURLOPT_USERAGENT, HTTP_USER_AGENT);
curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "gzip");
curl_easy_setopt(curl, CURLOPT_BUFFERSIZE, bufferSize); curl_easy_setopt(curl, CURLOPT_BUFFERSIZE, bufferSize);
curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, HTTP_TIMEOUT_SEC); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, HTTP_TIMEOUT_SEC);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, http_curl_write_callback); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, http_curl_write_callback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*) &curlData); curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*) &curlData);
curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, http_curl_header_callback); curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, http_curl_header_callback);
@ -391,6 +394,11 @@ Result http_download_callback(const char* url, u32 bufferSize, u64* contentLengt
if(ret != CURLE_OK) { if(ret != CURLE_OK) {
if(ret == CURLE_WRITE_ERROR) { if(ret == CURLE_WRITE_ERROR) {
res = curlData.res; res = curlData.res;
} else if(ret == CURLE_HTTP_RETURNED_ERROR) {
long responseCode = 0;
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &responseCode);
res = R_APP_HTTP_ERROR_BASE + responseCode;
} else { } else {
res = R_APP_CURL_ERROR_BASE + ret; res = R_APP_CURL_ERROR_BASE + ret;
} }

12
source/core/ui/ui.c
View File

@ -383,15 +383,15 @@ const char* ui_get_display_eta(u32 seconds) {
double ui_get_display_size(u64 size) { double ui_get_display_size(u64 size) {
double s = size; double s = size;
if(s > 1024) { if(s >= 1024) {
s /= 1024; s /= 1024;
} }
if(s > 1024) { if(s >= 1024) {
s /= 1024; s /= 1024;
} }
if(s > 1024) { if(s >= 1024) {
s /= 1024; s /= 1024;
} }
@ -399,15 +399,15 @@ double ui_get_display_size(u64 size) {
} }
const char* ui_get_display_size_units(u64 size) { const char* ui_get_display_size_units(u64 size) {
if(size > 1024 * 1024 * 1024) { if(size >= 1024 * 1024 * 1024) {
return "GiB"; return "GiB";
} }
if(size > 1024 * 1024) { if(size >= 1024 * 1024) {
return "MiB"; return "MiB";
} }
if(size > 1024) { if(size >= 1024) {
return "KiB"; return "KiB";
} }