BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2025-07-02 07:56:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanups

Browse Source
This commit is contained in:
Anonymous275 2020-05-05 08:36:48 +03:00
parent f78e3927a8
commit 3d3fe7f5a8
2 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
http.cpp
View File

@ -29,74 +29,56 @@ std::string HTTP_REQUEST(const std::string& IP,int port){
int nb_bar;
double last_progress, progress_bar_adv;
int progress_bar (void *bar, double t, double d)
{
if(last_progress != round(d/t*100))
{
nb_bar = 25;
progress_bar_adv = round(d/t*nb_bar);
std::cout<<"\r";
std::cout<<"Progress : [ ";
if(round(d/t*100) < 10)
{ std::cout<<"0"<<round(d/t*100)<<"% ]"; }
else
{ std::cout<<round(d/t*100)<<"% ] "; }
std::cout<<"[";
for(int i = 0 ; i <= progress_bar_adv ; i++)
{ std::cout<<"#"; }
for(int i = 0 ; i < nb_bar - progress_bar_adv; i++)
{ std::cout<<"."; }
if(t!=0)std::cout<<round(d/t*100);else std::cout<<0;
std::cout << "% ] [";
int i;
for(i = 0; i <= progress_bar_adv; i++)std::cout<<"#";
for(i = 0; i < nb_bar - progress_bar_adv; i++)std::cout<<".";
std::cout<<"]";
last_progress = round(d/t*100);
}
return 0;
}
struct FtpFile {
struct File {
const char *filename;
FILE *stream;
};
static size_t my_fwrite(void *buffer, size_t size, size_t nmemb,
void *stream)
static size_t my_fwrite(void *buffer,size_t size,size_t nmemb,void *stream)
{
auto *out = (struct FtpFile *)stream;
auto *out = (struct File*)stream;
if(!out->stream) {
fopen_s(&out->stream,out->filename,"wb");
if(!out->stream)
return -1;
if(!out->stream)return -1;
}
return fwrite(buffer, size, nmemb, out->stream);
}
void Download(const std::string& URL,const std::string& Path)
{
CURL *curl;
CURLcode res;
struct FtpFile ftpfile = {
struct File file = {
Path.c_str(),
nullptr
};
curl_global_init(CURL_GLOBAL_DEFAULT);
curl = curl_easy_init();
if(curl) {
curl_easy_setopt(curl, CURLOPT_URL,URL.c_str());
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, my_fwrite);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &ftpfile);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &file);
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, FALSE);
//progress_bar : the fonction for the progress bar
curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_bar);
curl_easy_setopt(curl, CURLOPT_USE_SSL, CURLUSESSL_ALL);
res = curl_easy_perform(curl);
curl_easy_cleanup(curl);
@ -104,7 +86,7 @@ void Download(const std::string& URL,const std::string& Path)
fprintf(stderr, "Failed to download! Code : %d\n", res);
}
}
if(ftpfile.stream)fclose(ftpfile.stream);
if(file.stream)fclose(file.stream);
curl_global_cleanup();
std::cout << std::endl;
}

4
proxy.cpp
View File

@ -38,7 +38,7 @@ void TCPSEND(const std::string&Data){
if (MPDEV)std::cout << "(Proxy) send failed with error: " << WSAGetLastError() << std::endl;
TCPTerminate = true;
} else {
if (MPDEV && Data.length() < 100) {
if (MPDEV && Data.length() > 1000) {
std::cout << "(Launcher->Game) Bytes sent: " << iSendResult << std::endl;
}
//std::cout << "(Launcher->Game) Bytes sent: " << iSendResult << " : " << Data << std::endl;
@ -56,6 +56,8 @@ void RUDPSEND(const std::string&Data,bool Rel){
<< " : "
<< Data.substr(0, 10)
<< Data.substr(Data.length() - 10) << std::endl;
}else if(Data.length() < 100){
std::cout << "(Game->Launcher) : " << Data << std::endl;
}
}
}