diff --git a/main.cpp b/main.cpp index c735fcb..d014b57 100644 --- a/main.cpp +++ b/main.cpp @@ -1,3 +1,5 @@ +#include +#include #include #include #include @@ -33,29 +35,46 @@ input_data(istream& in, bool prompt) return local; } -int main(int argc, char* argv[]) +Input +download(const string& address) { - curl_global_init(CURL_GLOBAL_ALL); - 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); + res = curl_easy_perform(curl); + if (res != CURLE_OK) { - CURLcode res; - curl_easy_setopt(curl, CURLOPT_URL, argv[1]); - 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); } - return 0; + 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; - auto in = input_data(cin, true); - auto bins = make_histogram(in.numbers, in.bin_count); + stringstream* buffer = reinterpret_cast(ctx); + buffer->write(reinterpret_cast(items), data_size); + return data_size; +} + + +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); - return 0; } +