diff --git a/main.cpp b/main.cpp index 479657b..d12d726 100644 --- a/main.cpp +++ b/main.cpp @@ -5,6 +5,8 @@ #include "text.h" #include "svg.h" #include +#include +#include using namespace std; @@ -29,10 +31,15 @@ inx >> number_count; Input in; in.numbers.resize(number_count); -if (prompt) cerr << "Input some numbers: "; -for (size_t i = 0; i < number_count; i++) { +if (prompt) + { + cerr << "Input some numbers: "; + } + +for (size_t i = 0; i < number_count; i++) + { inx >> in.numbers[i]; -} + } if (prompt) cerr << "Input amount of promejutkov: "; inx >> in.bin_count; @@ -48,35 +55,56 @@ for (size_t i = 0; i < in.bin_count; i++) return in; } +Input +download(const string& address) { + stringstream buffer; -int -main(int argc, char* argv[]) -{ - if (argc > 1) - { - CURL* curl = curl_easy_init(); + 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_WRITEDATA, &buffer); res = curl_easy_perform(curl); - if (res != 0) + if (res != CURLE_OK) { - cout << curl_easy_strerror(res); + fprintf(stderr, "curl_easy_perform() failed: %s\n", + curl_easy_strerror(res)); exit(1); } + + curl_easy_cleanup(curl); } - return 0; + return input_data(buffer); +} + +size_t +write_data(void* items, size_t item_size, size_t item_count, void* ctx) { + stringstream* buffer = reinterpret_cast(ctx); + size_t data_size = item_size * item_count; + buffer->write(reinterpret_cast(items), data_size); + return data_size; +} + +int +main(int argc, char* argv[]) +{ + + + Input input; + + if (argc > 1) { + input = download(argv[1]); + } else { + input = input_data(cin); } curl_global_init(CURL_GLOBAL_ALL); - auto in = input_data(cin); - - auto bins = make_histogram(in.numbers, in.bin_count); + auto bins = make_histogram(input.numbers, input.bin_count); - show_histogram_svg(bins, in.fill); + show_histogram_svg(bins, input.fill); return 0; }