mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-28 10:20:04 +02:00
Code Issues Projects Releases Wiki Activity

Add MotD when using a broken alternate update server

Browse Source
This commit is contained in:
jacob1
2019-03-23 11:01:21 -04:00
parent e07b133e5a
commit c7ae820f1c
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/client/Client.cpp
View File

@@ -656,7 +656,7 @@ RequestStatus Client::ParseServerReturn(ByteString &result, int status, bool jso
return RequestOkay; return RequestOkay;
if (status != 200) if (status != 200)
{ {
lastError = String::Build("HTTP Error ", status, ": ", ByteString(http::StatusText(status)).FromUtf8()); lastError = String::Build("HTTP Error ", status, ": ", http::StatusText(status));
return RequestFailure; return RequestFailure;
} }
@@ -686,7 +686,7 @@ RequestStatus Client::ParseServerReturn(ByteString &result, int status, bool jso
if (!strncmp(result.c_str(), "Error: ", 7)) if (!strncmp(result.c_str(), "Error: ", 7))
{ {
status = ByteString(result.begin() + 7, result.end()).ToNumber<int>(); status = ByteString(result.begin() + 7, result.end()).ToNumber<int>();
lastError = String::Build("HTTP Error ", status, ": ", ByteString(http::StatusText(status)).FromUtf8()); lastError = String::Build("HTTP Error ", status, ": ", http::StatusText(status));
return RequestFailure; return RequestFailure;
} }
lastError = "Could not read response: " + ByteString(e.what()).FromUtf8(); lastError = "Could not read response: " + ByteString(e.what()).FromUtf8();
@@ -729,6 +729,8 @@ bool Client::CheckUpdate(http::Request *updateRequest, bool checkSession)
if (status != 200) if (status != 200)
{ {
//free(data); //free(data);
if (usingAltUpdateServer && !checkSession)
this->messageOfTheDay = String::Build("HTTP Error ", status, " while checking for updates: ", http::StatusText(status));
} }
else if(data.size()) else if(data.size())
{ {
@@ -1475,7 +1477,7 @@ SaveInfo * Client::GetSave(int saveID, int saveDate)
} }
else else
{ {
lastError = ByteString(http::StatusText(dataStatus)).FromUtf8(); lastError = http::StatusText(dataStatus);
} }
return NULL; return NULL;
} }
@@ -1521,7 +1523,7 @@ std::vector<std::pair<ByteString, int> > * Client::GetTags(int start, int count,
} }
else else
{ {
lastError = ByteString(http::StatusText(dataStatus)).FromUtf8(); lastError = http::StatusText(dataStatus);
} }
return tagArray; return tagArray;
} }

2
src/client/http/Request.cpp
View File

@@ -274,7 +274,7 @@ namespace http
return request->Finish(status); return request->Finish(status);
} }
const char *StatusText(int ret) String StatusText(int ret)
{ {
switch (ret) switch (ret)
{ {

2
src/client/http/Request.h
View File

@@ -72,7 +72,7 @@ namespace http
static ByteString SimpleAuth(ByteString uri, int *status, ByteString ID, ByteString session, std::map<ByteString, ByteString> post_data = std::map<ByteString, ByteString>{}); static ByteString SimpleAuth(ByteString uri, int *status, ByteString ID, ByteString session, std::map<ByteString, ByteString> post_data = std::map<ByteString, ByteString>{});
}; };
const char *StatusText(int code); String StatusText(int code);
extern const long timeout; extern const long timeout;
extern ByteString proxy; extern ByteString proxy;

2
src/lua/LegacyLuaAPI.cpp
View File

@@ -1362,7 +1362,7 @@ int luatpt_getscript(lua_State* l)
} }
if (ret != 200) if (ret != 200)
{ {
return luaL_error(l, http::StatusText(ret)); return luaL_error(l, http::StatusText(ret).ToUtf8().c_str());
} }
if (!strcmp(scriptData.c_str(), "Invalid script ID\r\n")) if (!strcmp(scriptData.c_str(), "Invalid script ID\r\n"))