diff --git a/project/main.cpp b/project/main.cpp index 8595a39..bc0d574 100644 --- a/project/main.cpp +++ b/project/main.cpp @@ -5,6 +5,8 @@ #include "text.h" #include "svg.h" #include "emptiness.h" +#include +#include using namespace std; struct Input { @@ -30,31 +32,52 @@ input_data(istream& tin, bool prompt) tin >> in.bin_count; return in; } -int main(int argc, char* argv[]) + +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(ctx); + buffer->write(reinterpret_cast(items), data_size); + return data_size; +} + +Input +download(const string& address) { - if(argc > 1) + stringstream buffer; + CURL *curl = curl_easy_init(); + if(curl) { - CURL *curl = curl_easy_init(); - if(curl) + CURLcode res; + curl_easy_setopt(curl, CURLOPT_URL, address.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) { - CURLcode res; - curl_easy_setopt(curl, CURLOPT_URL, argv[1]); - res = curl_easy_perform(curl); - curl_easy_cleanup(curl); - if(res != CURLE_OK) - { - fprintf(stderr, "curl_easy_perform() failed: %s\n", - curl_easy_strerror(res)); - exit(1); - } - cerr << res; + fprintf(stderr, "curl_easy_perform() failed: %s\n",curl_easy_strerror(res)); + exit(1); } - return 0; + curl_easy_cleanup(curl); + } - curl_global_init(CURL_GLOBAL_ALL); - Input in = input_data(cin,true); - auto bins = make_histogram(in.numbers, in.bin_count); + 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); + } + + const auto bins = make_histogram(input.numbers, input.bin_count); show_histogram_svg(bins); - getch(); - return 0; } +