diff --git a/cs-project3.cpp b/cs-project3.cpp index 027e8ff..7250a2e 100644 --- a/cs-project3.cpp +++ b/cs-project3.cpp @@ -5,6 +5,8 @@ #include "histogram_internal.h" #include "svg.h" #include +#include +#include using namespace std; @@ -31,27 +33,53 @@ input_data(istream& inn, bool promt) { return in; } +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; +} -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]); - res = curl_easy_perform(curl); - curl_easy_cleanup(curl); - if (res != CURLE_OK) { - cout << curl_easy_strerror(res); - exit(1); - } +Input +download(const string& address, const string& argument) { + stringstream buffer; + CURL* curl = curl_easy_init(); + if ((argument != "") && (address != "-verbose") && (argument != "-verbose")) { + cout << "Wrong argument, use correct input -verbose or leave input empty" << endl; + exit(2); + } + if (curl) { + CURLcode res; + curl_easy_setopt(curl, CURLOPT_URL, argument == "-verbose" || argument == "" ? address.c_str() : argument.c_str()); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer); + if (address == "-verbose" || argument == "-verbose") { + curl_easy_setopt(curl, CURLOPT_VERBOSE, argument == "-verbose" ? argument.c_str() : address.c_str()); } + res = curl_easy_perform(curl); curl_easy_cleanup(curl); - return 0; + if (res != CURLE_OK) { + cout << curl_easy_strerror(res); + exit(1); + } + } + curl_easy_cleanup(curl); + return input_data(buffer, false); +} + +int main(int argc, char* argv[]) { + Input input; + if (argc > 2) { + input = download(argv[1], argv[2]); + } + else if (argc == 2){ + input = download(argv[1], ""); + } + else { + input = input_data(cin, true); } - curl_global_init(CURL_GLOBAL_ALL); - bool promt = true; - Input in = input_data(cin, promt); - auto bins = make_histogram(in.numbers, in.bin_count); + auto bins = make_histogram(input.numbers, input.bin_count); show_histogram_svg(bins); return 0; } \ No newline at end of file