code: добавлен мой вариант
Этот коммит содержится в:
43
main.cpp
43
main.cpp
@@ -43,19 +43,20 @@ Input input_data(istream& stream, bool prompt)
|
||||
|
||||
}
|
||||
|
||||
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<stringstream*>(ctx);
|
||||
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<stringstream*>(ctx); //ñìåíà òèïà
|
||||
auto text = reinterpret_cast<const char*>(items);
|
||||
buffer->write(text, data_size);
|
||||
return data_size;
|
||||
}
|
||||
|
||||
Input download(const string& address) {
|
||||
Input download(const string& address, bool verbose) {
|
||||
stringstream buffer;
|
||||
|
||||
curl_global_init(CURL_GLOBAL_ALL);
|
||||
CURL * curl = curl_easy_init();
|
||||
CURL* curl = curl_easy_init();
|
||||
|
||||
if(curl)
|
||||
{
|
||||
@@ -63,8 +64,12 @@ Input download(const string& address) {
|
||||
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 (verbose){
|
||||
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
||||
}
|
||||
|
||||
res = curl_easy_perform(curl);
|
||||
if(res != CURLE_OK){
|
||||
curl_easy_strerror(res);
|
||||
exit(1);
|
||||
@@ -77,17 +82,31 @@ Input download(const string& address) {
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
bool verbose = false;
|
||||
string url;
|
||||
|
||||
for (int i = 1; i < argc; ++i) {
|
||||
string arg = argv[i];
|
||||
if (arg == "-verbose") {
|
||||
verbose = true;
|
||||
} else if (arg.find("http://") == 0 || arg.find("https://") == 0) {
|
||||
url = arg;
|
||||
} else {
|
||||
cerr << "Invalid argument: " << arg << endl;
|
||||
cerr << "Usage: " << argv[0] << " [-verbose] [URL]" << endl;
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
Input input;
|
||||
if (argc > 1) {
|
||||
input = download(argv[1]);
|
||||
|
||||
if (!url.empty()) {
|
||||
input = download(url, verbose);
|
||||
} else {
|
||||
input = input_data(cin, true);
|
||||
}
|
||||
|
||||
bool prompt = true;
|
||||
auto in = input_data(cin, prompt);
|
||||
|
||||
auto bins = make_histogram(in.numbers, in.bin_count);
|
||||
auto bins = make_histogram(input.numbers, input.bin_count);
|
||||
// show_histogram_svg_vertical(bins);
|
||||
show_histogram_svg(bins);
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user