diff --git a/CommonVar.cpp b/CommonVar.cpp index 1b93163..92f1974 100644 --- a/CommonVar.cpp +++ b/CommonVar.cpp @@ -5,6 +5,7 @@ #include "text.h" #include "svg.h" #include +#include using namespace std; @@ -21,14 +22,14 @@ InputData(istream& in, bool prompt) { cerr << "Enter number count: "; } in >> NumberCount; - if (prompt) { - cerr << "Enter bin count: "; - } - in >> inp.BinCount; inp.Numbers.resize(NumberCount); for (int i = 0; i < NumberCount; i++) { in >> inp.Numbers[i]; } + if (prompt) { + cerr << "Enter bin count: "; + } + in >> inp.BinCount; return inp; } @@ -38,22 +39,47 @@ vector MakeHistogram(vector Numbers, size_t BinCount, double& Ma void ShowHistogrammText(vector Bins); -int main(int argc, char* argv[]) { - curl_global_init(CURL_GLOBAL_ALL); - if (argc > 1) { - CURL* curl = curl_easy_init(); +size_t +WriteData(void* items, size_t item_size, size_t item_count, void* ctx) { + stringstream* buffer = reinterpret_cast(ctx); + size_t data_size = item_size * item_count; + buffer->write(reinterpret_cast(items), data_size); + return data_size; +} + +Input +Download(const string& address) { + stringstream buffer; + + CURL* curl = curl_easy_init(); + if (curl) { CURLcode res; - curl_easy_setopt(curl, CURLOPT_URL, argv[1]); + curl_easy_setopt(curl, CURLOPT_URL, address.c_str()); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteData); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer); res = curl_easy_perform(curl); - if (res != 0) { + if (res != CURLE_OK) { cout << curl_easy_strerror(res); exit(1); } curl_easy_cleanup(curl); - return 0; } + + + return InputData(buffer, false); +} + + + +int main(int argc, char* argv[]) { double MaxCount = 0; - Input in = InputData(cin, true); + Input in; + if (argc > 1) { + in = Download(argv[1]); + } + else { + in = InputData(cin, true); + } vector Bins(in.BinCount); Bins = MakeHistogram(in.Numbers, in.BinCount, MaxCount); ShowHistogramSvg(Bins);