From 68604d9c90ea36a17cc5e5524f4b9ed0418cfa0d Mon Sep 17 00:00:00 2001 From: ArtyushinaVV Date: Fri, 2 Jun 2023 18:52:17 +0300 Subject: [PATCH] =?UTF-8?q?code:=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?= =?UTF-8?q?=20=D0=B8=D0=B7=20=D1=81=D0=B5=D1=82=D0=B8=20=D0=B2=20=D0=B1?= =?UTF-8?q?=D1=83=D1=84=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.cpp | 44 ++++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/main.cpp b/main.cpp index 1a43c4f..049dd8d 100644 --- a/main.cpp +++ b/main.cpp @@ -1,3 +1,5 @@ +#include +#include #include #include #include @@ -17,6 +19,17 @@ struct Input size_t bin_count{}; }; +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 input_data(istream& in, bool prompt) { @@ -28,7 +41,7 @@ input_data(istream& in, bool prompt) Input rez; if(prompt) - cerr << "bin_count= "; + cerr << "numbers= "; rez.numbers.resize(number_count); for (size_t i = 0; i < number_count; i++) @@ -41,32 +54,39 @@ input_data(istream& in, bool prompt) return rez; } +Input +download(const string& address) { + stringstream buffer; -int main(int argc, char* argv[]) -{ - if (argc > 1) - { 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()); res = curl_easy_perform(curl); if (res != 0) { cout << curl_easy_strerror(res); exit(1); } + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &buffer); + curl_easy_cleanup(curl); } - return 0; - } + return input_data(buffer, false); +} - curl_global_init(CURL_GLOBAL_ALL); - bool prompt = true; - auto in = input_data(cin, prompt); - auto bins = make_histogram(in.numbers, in.bin_count); +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); return 0; }