diff --git a/main.cpp b/main.cpp index 9bcf119..bdbd7e3 100644 --- a/main.cpp +++ b/main.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include "histogram.h" #include "text.h" #include "svg.h" @@ -35,25 +36,46 @@ Input input_data(istream& stream, bool prompt) return in; } -int main(int argc, char* argv[]) -{ - if (argc > 1){ +size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx) { + size_t data_size = item_count * item_size; + stringstream* buffer = reinterpret_cast(ctx); + char *item = reinterpret_cast(items); + buffer->write(item, data_size); + + return data_size; +} + + +Input download(const string& address) { + stringstream buffer; curl_global_init(CURL_GLOBAL_ALL); CURL *curl = curl_easy_init(); - if(curl) { + if(curl) + { CURLcode res; - curl_easy_setopt(curl, CURLOPT_URL, argv[1]); + 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){ + if (res != CURLE_OK) + { cerr << curl_easy_strerror(res); exit(1); } curl_easy_cleanup(curl); } - return 0; + 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); } - bool prompt = true; - auto in = input_data(cin, prompt); - auto bins = make_histogram(in.numbers, in.bin_count); + + const auto bins = make_histogram(input.numbers, input.bin_count); show_histogram_svg(bins); }