diff --git a/main.cpp b/main.cpp index 08dd8ac..39229ea 100644 --- a/main.cpp +++ b/main.cpp @@ -4,6 +4,8 @@ #include "text.h" #include "svg.h" #include +#include +#include using namespace std; struct Input { @@ -17,39 +19,60 @@ Input input_data(istream& in, bool prompt) { if (prompt){ cerr << "Enter number count: "; } - cin >> number_count; + in >> number_count; inp.numbers.resize(number_count); if (prompt){ cerr << "Enter numbers: "; } for (size_t i = 0; i < number_count; i++) { - cin >> inp.numbers[i]; + in >> inp.numbers[i]; } if (prompt) { cerr << "Enter bin count: "; } - cin >> inp.bin_count; + in >> inp.bin_count; return inp; } -int main(int argc, char* argv[]) { - curl_global_init(CURL_GLOBAL_ALL); - if (argc > 1) { - CURL* curl = curl_easy_init(); - if(curl) { - CURLcode res; - curl_easy_setopt(curl, CURLOPT_URL, argv[1]); - res = curl_easy_perform(curl); +size_t +write_data(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& adress){ + stringstream buffer; + CURL* curl = curl_easy_init(); + if(curl) { + + CURLcode res; + curl_easy_setopt(curl, CURLOPT_URL, adress.c_str()); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer); + res = curl_easy_perform(curl); if (res != CURLE_OK){ - cerr << curl_easy_strerror(res); - exit(1); - } - curl_easy_cleanup(curl); + cerr << curl_easy_strerror(res); + exit(1); } + curl_easy_cleanup(curl); + } + + return input_data(buffer, false); +} +int main(int argc, char* argv[]) { + Input input; + if (argc > 1) { + input = download(argv[1]); + } else { + input = input_data(cin, true); } - auto in = input_data(cin, true); - auto bins = make_histogram(in.numbers, in.bin_count); + + auto bins = make_histogram(input.numbers, input.bin_count); show_histogram_svg(bins); return 0; } +