diff --git a/main_original.cpp b/main_original.cpp index c076ba9..b445710 100644 --- a/main_original.cpp +++ b/main_original.cpp @@ -3,7 +3,7 @@ #include "histogram.h" #include "text.h" #include "svg.h" - +#include #include @@ -26,18 +26,43 @@ Input input_data(istream& stream) { return in; } +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) { + stringstream buffer; + CURL* curl = curl_easy_init(); + if (curl) { + CURLcode res; + curl_easy_setopt(curl, CURLOPT_URL, address.c_str()); + curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer); + res = curl_easy_perform(curl); + if (res != CURLE_OK) { + cout << curl_easy_strerror(res); + exit(1); + } + auto data = curl_version_info(CURLVERSION_NOW)->protocols; + for (auto protocol = data; *protocol; ++protocol) { + cerr << *protocol << endl; + } curl_easy_cleanup(curl); + } + return input_data(buffer); +} + int main(int argc, char* argv[]) { + Input in; if (argc > 1) { - CURL* curl = curl_easy_init(); - auto res = curl_easy_perform(curl); - if (res != 0) { - cout << curl_easy_strerror(res); - exit(1); - } - curl_easy_cleanup(curl); - return 0; + in = download(argv[1]); + } else { + in = input_data(cin); } - Input in = input_data(cin); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins); return 0;