добавлены write_data, download

main.cpp

@@ -1,11 +1,13 @@
 #include <iostream>
 #include <vector>
 #include <curl/curl.h>
+#include <sstream>
+#include <string>
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
 struct Input {
-    vector<double> numbers;
+    std::vector<double> numbers;
     size_t bin_count{};
 };
 
@@ -37,25 +39,41 @@ Input input_data(std::istream& in, bool prompt)
     return data;
 }
 
-int main(int argc, char* argv[]){
+size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx){
-    curl_global_init(CURL_GLOBAL_ALL);
+    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
-    using namespace std;
+    size_t data_size = item_size * item_count;
-    if (argc > 1)
+    buffer->write(reinterpret_cast<const char*>(items), data_size);
-    {
+    return data_size;
-        const char *url = argv[1];
-
-        CURL *curl = curl_easy_init();
-        if (curl)
-        {
-            curl_easy_setopt(curl, CURLOPT_URL, url);
-            curl_easy_perform(curl);
-            curl_easy_cleanup(curl);
-            return 0;
-        }
-        return 0;
-    }
-    auto in = input_data(cin,true);
-    auto bins = make_histogram(in.bin_count, in.numbers);
-    show_histogram_svg(bins);
-    return 0;
 }
+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 argc, char* argv[]) {
+    curl_global_init(CURL_GLOBAL_ALL);
+    Input input;
+    if (argc > 1) {
+       input = download(argv[1]);
+    }else{
+        input = input_data(cin, true);
+    }
+    auto bins = make_histogram(input.bin_count, input.numbers);
+    show_histogram_svg(bins);
+}
+