Сравнить коммиты

...

8 Коммитов

Автор SHA1 Сообщение Дата
b2ec2b1bd9 code:final 2025-06-06 12:05:42 +03:00
6ebc5ea258 code:write_data 2025-06-04 15:05:35 +03:00
75c4b02d7f code:funcDownload 2025-06-04 14:40:12 +03:00
23703c408c code:checkMistakesFromCurl 2025-06-04 13:58:56 +03:00
beeb53983e code:curlWriteFromLink 2025-06-04 13:52:07 +03:00
960722ab48 libcurlx64 2025-05-30 11:51:01 +03:00
328a9f28bb first commit 2025-05-29 20:43:08 +03:00
ad6006ab90 first commit 2025-05-29 20:30:23 +03:00
3 изменённых файлов: 58 добавлений и 11 удалений

1
.gitignore поставляемый
Просмотреть файл

@@ -1,2 +1,3 @@
/bin /bin
/obj /obj
/curl

Просмотреть файл

@@ -14,9 +14,12 @@
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add directory="include" /> <Add directory="include" />
<Add directory="curl/include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-static-libstdc++" /> <Add option="-static-libstdc++" />
<Add library="curl/lib/libcurl.dll.a" />
<Add directory="curl/lib" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release"> <Target title="Release">
@@ -36,7 +39,14 @@
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-fexceptions" /> <Add option="-fexceptions" />
<Add directory="D:/Projects_Code_Blocks/2_halfYear/Lab4/Lab1/curl/include" />
</Compiler> </Compiler>
<Linker>
<Add option="-static-libstdc++" />
<Add option="-static-libgcc" />
<Add library="curl/lib/libcurl.dll.a" />
<Add directory="D:/Projects_Code_Blocks/2_halfYear/Lab4/Lab1/curl/lib" />
</Linker>
<Unit filename="histogram.cpp"> <Unit filename="histogram.cpp">
<Option target="Debug" /> <Option target="Debug" />
</Unit> </Unit>
@@ -47,8 +57,6 @@
<Option target="&lt;{~None~}&gt;" /> <Option target="&lt;{~None~}&gt;" />
</Unit> </Unit>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Unit filename="prot.cpp" />
<Unit filename="prot.h" />
<Unit filename="svg.cpp" /> <Unit filename="svg.cpp" />
<Unit filename="svg.h" /> <Unit filename="svg.h" />
<Unit filename="text.cpp"> <Unit filename="text.cpp">

Просмотреть файл

@@ -1,9 +1,11 @@
#include <curl/curl.h>
using namespace std; using namespace std;
#include "histogram.h" #include "histogram.h"
#include "text.h" #include "text.h"
#include "svg.h" #include "svg.h"
#include <sstream>
#include <string>
struct Input { struct Input {
std::vector<double> numbers; std::vector<double> numbers;
@@ -11,37 +13,73 @@ struct Input {
}; };
Input input_data(istream& in, bool promt); Input input_data(istream& in, bool promt);
Input download(const string& address);
int main() int main(int argc, char* argv[])
{ {
curl_global_init(CURL_GLOBAL_ALL);
Input input;
if(argc > 1 ){
input = download(argv[1]);
}else{
input = input_data(cin,true);
}
Input in = input_data(cin);
std::vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
std::vector<size_t> bins = make_histogram(input.numbers, input.bin_count);
show_histogram_svg(bins); show_histogram_svg(bins);
return 0; return 0;
} }
Input
download(const string& address) {
stringstream buffer;
CURL* curl = curl_easy_init();
if(curl) {
CURLcode res;
curl_easy_setopt(curl, CURLOPT_URL, address);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, input_data);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
res = curl_easy_perform(curl);
if(res!=0){
cout << curl_easy_strerror(res) << endl;
exit(1);
}
curl_easy_cleanup(curl);
}
return input_data(buffer, false);
}
size_t
write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
size_t data_size = item_size * item_count;
stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
buffer->write(reinterpret_cast<char*>(items), data_size);
return data_size;
}
Input input_data(istream& in, bool promt) { Input input_data(istream& in, bool promt) {
Input input_struct; Input input_struct;
size_t countOfNumbers; size_t countOfNumbers;
if(promt){cerr << "Input your count of numbers:\n";} if(promt){cerr << "Input your count of numbers:\n";}
cin >> countOfNumbers; in >> countOfNumbers;
input_struct.numbers.resize(countOfNumbers); input_struct.numbers.resize(countOfNumbers);
if(promt){cerr << "Input numbers:\n";} if(promt){cerr << "Input numbers:\n";}
for (int i = 0; i < countOfNumbers; i++) { for (int i = 0; i < countOfNumbers; i++) {
if(promt){cerr << i << ":" << endl;} if(promt){cerr << i << ":" << endl;}
cin >> input_struct.numbers[i]; in >> input_struct.numbers[i];
} }
if(promt){ if(promt){
cerr << endl; cerr << endl;
cerr << "Input bin count:\n"; cerr << "Input bin count:\n";
} }
cin >> input_struct.bin_count; in >> input_struct.bin_count;