code: буфер

main.cpp

@@ -3,6 +3,8 @@
 #include "histogram.h"
 #include "svg.h"
 #include <curl/curl.h>
+#include <sstream>
+#include <string>
 using namespace std;
 
 struct Input {
@@ -11,51 +13,69 @@ struct Input {
 };
 
 Input
-input_data(istream& _cin){
+input_data(istream& in, bool prompt) {
-    bool prompt = true;
     size_t number_count;
-    if (prompt){
+    if (prompt) {
-        cerr << "Enter number count:" << endl;
+            cerr << "Enter number count: ";
     }
-    _cin >> number_count;
+    in >> number_count;
-    Input in;
+    Input inn;
-    in.numbers.resize(number_count);
+    inn.numbers.resize(number_count);
-    vector<double> numbers(number_count);
+    if (prompt) {
-    if (prompt){
+            cerr << "Enter numbers: ";
-        cerr << "Enter numbers:" << endl;
     }
     for (size_t i = 0; i < number_count; i++) {
-        _cin >> in.numbers[i];
+        in >> inn.numbers[i];
     }
-    if (prompt){
+    if (prompt) {
-        cerr << "Enter bin count:" << endl;
+            cerr << "Enter bin count: ";
     }
-    _cin >> in.bin_count;
+    in >> inn.bin_count;
-    return in;
+    return inn;
 }
 
+static 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);
+    buffer->write(reinterpret_cast<const char*>(items), data_size);
+    return data_size;
+}
 
-int
+Input
-main(int argc, char* argv[]) {
+download(const string& address){
-    if (argc > 1) {
+    stringstream buffer;
-            CURL *curl = curl_easy_init();
+    CURL *curl = curl_easy_init();
-    if(curl) {
+        if(curl) {
             CURLcode res;
-            curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
+            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);
-            curl_easy_cleanup(curl);
             if (res != CURLE_OK) {
                 curl_easy_strerror(res);
                 exit(1);
             }
+            curl_easy_cleanup(curl);
         }
-        return 0;
+    return input_data(buffer, false);
-    }
-    curl_global_init(CURL_GLOBAL_ALL);
-    auto in = input_data(cin);
-    auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_svg(bins);
-    return 0;
 }
 
+int
+main(int argc, char* argv[]) {
+    curl_global_init(CURL_GLOBAL_ALL);
+    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);
+
+    }
+
+