финальная версия программы

main.cpp

@@ -4,23 +4,29 @@
 #include <conio.h>
 #include "histogram.h"
 #include "text.h"
+#include <stdio.h>
 #include "svg.h"
 #include <curl/curl.h>
+#include <sstream>
+#include <string>
 using namespace std;
 
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
 };
+
+
 Input
-input_data(istream& in, bool prompt){
+input_data(istream& inp, bool prompt){
     size_t number_count;
     if (prompt){
-	cerr << "Enter number count: ";
+        cerr << "Enter number count: ";
     }
-    cin >> number_count; //Êîë-âî ÷èñåë
+    inp >> number_count; //Êîë-âî ÷èñåë
-    Input inp;
+
-    inp.numbers.resize(number_count);
+    Input in;
+    in.numbers.resize(number_count);
 
     for (size_t i = 0; i < number_count; i++)
     {
@@ -28,32 +34,54 @@ input_data(istream& in, bool prompt){
                 cerr << "Enter Num[" << i << "]: ";
         }
 
-        cin >> inp.numbers[i]; //Ââîä ÷èñåë
+        inp >> in.numbers[i]; //Ââîä ÷èñåë
     }
     if (prompt) {
             cerr << "Enter bin count: ";
     }
-    cin >> inp.bin_count; //Êîë-âî êîðçèí
+    inp >> in.bin_count; //Êîë-âî êîðçèí
-    return inp;
+    return in;
+}
+size_t
+write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
+    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
+    size_t data_size = item_size * item_count;
+    (*buffer).write(reinterpret_cast<const char*>(items), data_size);
+    return data_size;
+}
+
+Input
+download(const string& adress){
+    stringstream buffer;
+    CURL* curl = curl_easy_init();
+    if(curl) {
+
+        CURLcode res;
+        curl_easy_setopt(curl, CURLOPT_URL, adress.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){
+            cerr << curl_easy_strerror(res);
+            exit(1);
+        }
+        curl_easy_cleanup(curl);
+    }
+
+    return input_data(buffer, false);
 }
 
+
 int main(int argc, char* argv[])
 {
     curl_global_init(CURL_GLOBAL_ALL);
-    if (argc > 1){
+     Input in;
-        CURL* curl = curl_easy_init();
+    if (argc > 1) {
-          if(curl) {
+        in = download(argv[1]);
-            CURLcode res;
+    } else {
-            curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
+        in = input_data(cin, true);
-            res = curl_easy_perform(curl);
-            if (res != CURLE_OK){
-                cerr << curl_easy_strerror(res);
-                exit(1);
-            }
-            curl_easy_cleanup(curl);
-        }
     }
-    auto in = input_data(cin, true);
+
     auto bins = make_histogram(in.numbers, in.bin_count);
     auto borders = make_borders(in.numbers, in.bin_count);
     show_histogram_svg(bins, borders, in.bin_count);