diff --git a/vector.cpp b/vector.cpp index 924032d..7fbc45d 100644 --- a/vector.cpp +++ b/vector.cpp @@ -5,6 +5,8 @@ #include "text.h" #include "svg.h" #include +#include +#include const size_t SCREEN_WIDTH = 80; const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; using namespace std; @@ -51,6 +53,34 @@ Input input_data(istream& in,bool prompt) { in >> data.bin_count; return data; } +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 0; +} +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); + } + curl_easy_cleanup(curl); + } + + return input_data(buffer, false); +} + //int main() //{ // auto in = input_data(cin); @@ -58,25 +88,60 @@ Input input_data(istream& in,bool prompt) { // show_histogram_svg(bins, in.bin_count); //} -int main(int argc, char* argv[]) -{ +void usage() { + cout << "Usage: lab34.exe [-format {text|svg}] URL\n"; + exit(1); +} + +int main(int argc, char* argv[]) { + curl_global_init(CURL_GLOBAL_ALL); + if (argc > 1) { - CURL* curl = curl_easy_init(); - if (curl) { - CURLcode res; - curl_easy_setopt(curl, CURLOPT_URL, argv[1]); - res = curl_easy_perform(curl); - if (res != CURLE_OK) { - fprintf(stderr, "curl_easy_perform() failed: %s\n", - curl_easy_strerror(res)); - exit(1); + string format_option; + for (int i = 1; i < argc; ++i) { + if (argv[i][0] == '-') { + if (strcmp(argv[i], "--") == 0) { + break; + } + if (strlen(argv[i]) >= 9 && strcmp(argv[i] + 1, "format") == 0) { + format_option = argv[++i]; + break; + } + } + } + + if (!format_option.empty()) { + if (format_option != "text" && format_option != "svg") { + usage(); } - curl_easy_cleanup(curl); + } + + Input input; + if (argc > 2) { + input = download(argv[2]); + } + else { + input = input_data(cin, true); + } + + vector bins = make_histogram(input.numbers, input.bin_count); + + if (!format_option.empty()) { + if (format_option == "text") { + show_histogram_text(bins, input.bin_count); + } + else { + show_histogram_svg(bins, input.bin_count); + } + } + else { + show_histogram_svg(bins, input.bin_count); } } + else { + cerr << "No arguments provided." << endl; + usage(); + } + return 0; - curl_global_init(CURL_GLOBAL_ALL); - auto in = input_data(cin,false); - vector bins = make_histogram(in.numbers, in.bin_count); - show_histogram_svg(bins, in.bin_count); }