Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

More http code cleanup

Browse Source
This commit is contained in:
Henrik Rydgård committed 2025-01-23 10:16:51 +01:00
1 parent 12adad0494
commit 493367c89f
2 files changed
+20 -36
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Common/Net/HTTPRequest.cpp
+15 -29
View File
@@ -35,21 +35,24 @@ Request::Request(RequestMethod method, std::string_view url, std::string_view na
};
}
bool RequestManager::IsHttpsUrl(const std::string &url) {
static bool IsHttpsUrl(std::string_view url) {
return startsWith(url, "https:");
}
std::shared_ptr<Request> RequestManager::StartDownload(const std::string &url, const Path &outfile, ProgressBarMode mode, const char *acceptMime) {
std::shared_ptr<Request> dl;
std::shared_ptr<Request> CreateRequest(RequestMethod method, std::string_view url, std::string_view postdata, std::string_view postMime, const Path &outfile, ProgressBarMode mode, std::string_view name) {
if (IsHttpsUrl(url) && System_GetPropertyBool(SYSPROP_SUPPORTS_HTTPS)) {
#ifndef HTTPS_NOT_AVAILABLE
dl.reset(new HTTPSRequest(RequestMethod::GET, url, "", "", outfile, mode));
return std::shared_ptr<Request>(new HTTPSRequest(method, url, postdata, postMime, outfile, mode, name));
#else
return std::shared_ptr<Request>();
#endif
} else {
dl.reset(new HTTPRequest(RequestMethod::GET, url, "", "", outfile, mode));
return std::shared_ptr<Request>(new HTTPRequest(method, url, postdata, postMime, outfile, mode, name));
}
}
std::shared_ptr<Request> RequestManager::StartDownload(std::string_view url, const Path &outfile, ProgressBarMode mode, const char *acceptMime) {
std::shared_ptr<Request> dl = CreateRequest(RequestMethod::GET, url, "", "", outfile, mode, "");
if (!userAgent_.empty())
dl->SetUserAgent(userAgent_);
@@ -61,22 +64,14 @@ std::shared_ptr<Request> RequestManager::StartDownload(const std::string &url, c
}
std::shared_ptr<Request> RequestManager::StartDownloadWithCallback(
const std::string &url,
std::string_view url,
const Path &outfile,
ProgressBarMode mode,
std::function<void(Request &)> callback,
std::string_view name,
const char *acceptMime) {
std::shared_ptr<Request> dl;
if (IsHttpsUrl(url) && System_GetPropertyBool(SYSPROP_SUPPORTS_HTTPS)) {
#ifndef HTTPS_NOT_AVAILABLE
dl.reset(new HTTPSRequest(RequestMethod::GET, url, "", "", outfile, mode, name));
#else
return std::shared_ptr<Request>();
#endif
} else {
dl.reset(new HTTPRequest(RequestMethod::GET, url, "", "", outfile, mode, name));
}
std::shared_ptr<Request> dl = CreateRequest(RequestMethod::GET, url, "", "", outfile, mode, name);
if (!userAgent_.empty())
dl->SetUserAgent(userAgent_);
if (acceptMime)
@@ -88,22 +83,13 @@ std::shared_ptr<Request> RequestManager::StartDownloadWithCallback(
}
std::shared_ptr<Request> RequestManager::AsyncPostWithCallback(
const std::string &url,
const std::string &postData,
const std::string &postMime,
std::string_view url,
std::string_view postData,
std::string_view postMime,
ProgressBarMode mode,
std::function<void(Request &)> callback,
std::string_view name) {
std::shared_ptr<Request> dl;
if (IsHttpsUrl(url) && System_GetPropertyBool(SYSPROP_SUPPORTS_HTTPS)) {
#ifndef HTTPS_NOT_AVAILABLE
dl.reset(new HTTPSRequest(RequestMethod::POST, url, postData, postMime, Path(), mode, name));
#else
return std::shared_ptr<Request>();
#endif
} else {
dl.reset(new HTTPRequest(RequestMethod::POST, url, postData, postMime, Path(), mode, name));
}
std::shared_ptr<Request> dl = CreateRequest(RequestMethod::POST, url, postData, postMime, Path(), mode, name);
if (!userAgent_.empty())
dl->SetUserAgent(userAgent_);
dl->SetCallback(callback);
Common/Net/HTTPRequest.h
+5 -7
View File
@@ -95,10 +95,10 @@ public:
CancelAll();
}
std::shared_ptr<Request> StartDownload(const std::string &url, const Path &outfile, ProgressBarMode mode, const char *acceptMime = nullptr);
std::shared_ptr<Request> StartDownload(std::string_view url, const Path &outfile, ProgressBarMode mode, const char *acceptMime = nullptr);
std::shared_ptr<Request> StartDownloadWithCallback(
const std::string &url,
std::string_view url,
const Path &outfile,
ProgressBarMode mode,
std::function<void(Request &)> callback,
@@ -106,9 +106,9 @@ public:
const char *acceptMime = nullptr);
std::shared_ptr<Request> AsyncPostWithCallback(
const std::string &url,
const std::string &postData,
const std::string &postMime, // Use postMime = "application/x-www-form-urlencoded" for standard form-style posts, such as used by retroachievements. For encoding form data manually we have MultipartFormDataEncoder.
std::string_view url,
std::string_view postData,
std::string_view postMime, // Use postMime = "application/x-www-form-urlencoded" for standard form-style posts, such as used by retroachievements. For encoding form data manually we have MultipartFormDataEncoder.
ProgressBarMode mode,
std::function<void(Request &)> callback,
std::string_view name = "");
@@ -122,8 +122,6 @@ public:
}
private:
static bool IsHttpsUrl(const std::string &url);
std::vector<std::shared_ptr<Request>> downloads_;
// These get copied to downloads_ in Update(). It's so that callbacks can add new downloads
// while running.