diff --git a/main.cpp b/main.cpp index ba3a8f9..6109359 100644 --- a/main.cpp +++ b/main.cpp @@ -1,4 +1,6 @@ #include +#include +#include #include #include #include "histogram.h" @@ -46,25 +48,44 @@ Input input_data(istream& in, bool promt) } } +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; +} + +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 != 0){ + cout << curl_easy_strerror(res); + exit(1); + } + curl_easy_cleanup(curl); + } + return input_data(buffer,false); +} + + int main(int argc, char* argv[]) { + Input input; if (argc > 1){ - CURL* curl = curl_easy_init(); - if(curl) { - CURLcode res; - curl_easy_setopt(curl, CURLOPT_URL, "//uit.mpei.ru/study/courses/cs/lab03/marks.txt"); - res = curl_easy_perform(curl); - if (res != '0'){ - cout << curl_easy_strerror(res); - exit(1); - } - curl_easy_cleanup(curl); - } - return 0; + input = download(argv[1]); + } + else{ + input = input_data(cin,true); } - curl_global_init(CURL_GLOBAL_ALL); - 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); return 0; }