diff --git a/main.cpp b/main.cpp index 9c1e2ea..e564a47 100644 --- a/main.cpp +++ b/main.cpp @@ -4,6 +4,8 @@ #include "text.h" #include "svg.h" #include +#include +#include using namespace std; @@ -43,19 +45,28 @@ Input input_data(istream& stream, bool prompt) { 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); + auto text = reinterpret_cast(items); + buffer->write(text, data_size); + return data_size; +} +Input download(const string& address) { + stringstream buffer; -int main(int argc, char* argv[]){ - - if (argc > 1){ + curl_global_init(CURL_GLOBAL_ALL); CURL* curl = curl_easy_init(); 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) { @@ -64,14 +75,21 @@ int main(int argc, char* argv[]){ } curl_easy_cleanup(curl); } - return 0; - } + return input_data(buffer, false); +} - curl_global_init(CURL_GLOBAL_ALL); - bool prompt= true; - Input in = input_data(cin, prompt); + +int main(int argc, char* argv[]){ + + Input in; + if (argc > 1) { + in = download(argv[1]); + } else { + in = input_data(cin, true); + } + auto bins = make_histogram(in.numbers, in.bin_count);