diff --git a/bin/Debug/lab03.exe b/bin/Debug/lab03.exe index 146993c..24d9b03 100644 Binary files a/bin/Debug/lab03.exe and b/bin/Debug/lab03.exe differ diff --git a/main.cpp b/main.cpp index f9d61c7..5a5b7c0 100644 --- a/main.cpp +++ b/main.cpp @@ -1,27 +1,61 @@ #include +#include +#include #include "histogram.h" #include "text.h" #include "svg.h" + + struct Input { vector vec; size_t korz{}; }; -Input input_data() { - Input in; +Input input_data(istream& in, bool promt = false) { + Input lin; size_t n, korz; - - cerr << "Number of elem "; - cin >> n; - in.vec.resize(n); + if(promt) + cerr << "Number of elem "; + in >> n; + lin.vec.resize(n); for (size_t i = 0; i < n; i++) - cin >> in.vec[i]; - cerr << "Enter bin count: "; - cin >> in.korz; - return in; + in >> lin.vec[i]; + if(promt) + cerr << "Enter bin count: "; + in >> lin.korz; + return lin; +} +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; +} + +Input download(const string& address){ + stringstream buffer; + CURL* curl = curl_easy_init(); + if (curl) { + curl_easy_setopt(curl, CURLOPT_URL, address.c_str()); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer); + CURLcode res = curl_easy_perform(curl); + curl_easy_cleanup(curl); + if (res != CURLE_OK) { + cerr << "cURL error: " << curl_easy_strerror(res) << endl; + exit(1); + } + return input_data(buffer, false); +} } -int main() { +int main(int argc, char* argv[]) { curl_global_init(CURL_GLOBAL_ALL); - auto in = input_data(); - auto bins = make_histogram(in.korz, in.vec); + Input input; + if (argc > 1) { + input = download(argv[1]); + }else{ + input = input_data(cin, true); + } + auto bins = make_histogram(input.korz, input.vec); show_histogram_svg(bins); + return 0; } diff --git a/obj/Debug/main.o b/obj/Debug/main.o index 4033f28..e509c8b 100644 Binary files a/obj/Debug/main.o and b/obj/Debug/main.o differ