diff --git a/main.cpp b/main.cpp index a23a9a5..b7ee051 100644 --- a/main.cpp +++ b/main.cpp @@ -4,6 +4,8 @@ #include "text.h" #include "svg.h" #include +#include +#include using namespace std; @@ -35,35 +37,47 @@ Input input_data(istream& inx, bool prompt) return in; } -size_t write_data(void* ptr, size_t size, size_t nmemb, void* stream) { - size_t written = fwrite(ptr, size, nmemb, stdout); - return written; +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) { - curl_easy_setopt(curl, CURLOPT_URL, argv[1]); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); +Input +download(const string& address) { + stringstream buffer; + CURL* curl = curl_easy_init(); + if (curl) { + curl_easy_setopt(curl, CURLOPT_URL, address.c_str()); - CURLcode res = curl_easy_perform(curl); - if (res != CURLE_OK) { - cerr << "cURL error: " << curl_easy_strerror(res) << endl; - } + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer); + CURLcode res = curl_easy_perform(curl); + if (res != CURLE_OK) { + cerr << "cURL error: " << curl_easy_strerror(res) << endl; curl_easy_cleanup(curl); - } else { - cerr << "curl_easy_init() failed" << endl; + exit(1); } - return 0; + curl_easy_cleanup(curl); + } else { + cerr << "curl_easy_init() failed" << endl; + exit(1); } - curl_global_init(CURL_GLOBAL_ALL); - auto in = input_data(cin, true); - auto bins = make_histogram(in.numbers, in.bin_count); - show_histogram_svg(bins); + return input_data(buffer, false); +} - return 0; +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); }