diff --git a/main.cpp b/main.cpp index 47b66ca..8639950 100644 --- a/main.cpp +++ b/main.cpp @@ -1,57 +1,92 @@ #include - -#include -#include #include -#include +#include +#include +#include #include + #include "histogram.h" #include "text.h" -#include "svg01.h" +#include "svg.h" using namespace std; struct Input { vector numbers; - size_t bin_count{}; + size_t bin_count {}; }; Input input_data(istream& in, bool prompt){ - size_t number_count; if (prompt){ - cerr << "Enter number count: "; + cerr << "Enter number count: "; } in >> number_count; Input iinn; - iinn.numbers.resize(number_count); if (prompt){ - cerr << "Enter numbers: " << endl; - } - for (size_t i=0; i < number_count; i++) + cerr << "Enter numbers: ";} + for (size_t i = 0; i < number_count; i++) { in >> iinn.numbers[i]; - } if (prompt){ - cerr << "Enter bin count: "; - } + cerr << "Enter bin count: ";} in >> iinn.bin_count; return iinn; } -int main() +static 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 != CURLE_OK) { + fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res)); + exit(1); + } + if(!res) { + curl_off_t dl; + res = curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD_T, &dl); + if(!res) { + cerr<<"Downloaded "< curl_global_init(CURL_GLOBAL_ALL); + Input input; + if (argc > 1) { + input = download(argv[1]); + } else { + input = input_data(cin, true); + } - Input iinn = input_data(cin, true); - std::vector bins = make_histogram(iinn.numbers, iinn.bin_count); + const auto bins = make_histogram(input.numbers, input.bin_count); show_histogram_svg(bins); - return 0; }