diff --git a/main.cpp b/main.cpp index 5406219..18d84e4 100644 --- a/main.cpp +++ b/main.cpp @@ -4,6 +4,8 @@ #include "histogram.h" #include "text.h" #include "svg.h" +#include +#include using namespace std; @@ -38,6 +40,35 @@ input_data(istream& in, bool prompt) { return local; }; +Input +download (const string& address) { + stringstream buffer; + 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) { + cerr << curl_easy_strerror(res); + exit(1); + } + + 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; + stringstream* buffer = reinterpret_cast(ctx); + buffer->write(static_cast(items), data_size); + return data_size; +} + int main(int argc, char* argv[]) { std::string fill = "red"; @@ -45,25 +76,14 @@ int main(int argc, char* argv[]) { curl_global_init(CURL_GLOBAL_ALL); + Input input; 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); - - if (res != CURLE_OK) { - cerr << curl_easy_strerror(res); - exit(1); - } - - curl_easy_cleanup(curl); - } - return 0; + 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); + const auto bins = make_histogram(input.numbers, input.bin_count); show_histogram_svg(bins, fill, stroke); return 0; }