diff --git a/main.cpp b/main.cpp index 740c5a1..9133966 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,8 @@ #include "svg.h" #include "histogram_internal.h" #include +#include +#include using namespace std; @@ -33,26 +35,44 @@ input_data(istream &tin, bool prompt){ cerr << "Input bin count: "; tin >> in.bin_count; 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; } -int main(int argc, char* argv[]) { - if (argc > 1){ - CURL* curl = curl_easy_init(); - if(curl) { - CURLcode res; - curl_easy_setopt(curl, CURLOPT_URL, "https://example.com"); - res = curl_easy_perform(curl); - if(res != CURLE_OK){ - fprintf(stderr, "curl_easy_perform() failed: %s\n", - curl_easy_strerror(res)); - exit(1); - } - curl_easy_cleanup(curl); + +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_WRITEFUNCTION, write_data); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer); + res = curl_easy_perform(curl); + if (res != CURLE_OK) + { + fprintf(stderr, "curl_easy_perform() failed: %s\n",curl_easy_strerror(res)); + exit(1); } - return 0; + 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); } - curl_global_init(CURL_GLOBAL_ALL); - Input in = input_data(cin, false); - auto bins = make_histogram(in.numbers, in.bin_count); + const auto bins = make_histogram(input.numbers, input.bin_count); show_histogram_svg(bins); - return 0; }