code:final

main.cpp

@@ -4,7 +4,8 @@ using namespace std;
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
-
+#include <sstream>
+#include <string>
 
 struct Input {
     std::vector<double> numbers;
@@ -12,53 +13,73 @@ struct Input {
 };
 
 Input input_data(istream& in, bool promt);
+Input download(const string& address);
 
 int main(int argc, char* argv[])
 {
+    curl_global_init(CURL_GLOBAL_ALL);
+    Input input;
     if(argc > 1 ){
-        curl_global_init(CURL_GLOBAL_ALL);
+        input = download(argv[1]);
-        CURL* curl = curl_easy_init();
+    }else{
-        if(curl) {
+        input = input_data(cin,true);
-            CURLcode res;
-            curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
-            res = curl_easy_perform(curl);
-            curl_easy_cleanup(curl);
-        }
-
-
-
-        return 0;
     }
 
 
 
-    Input in = input_data(cin,true);
+    std::vector<size_t> bins = make_histogram(input.numbers, input.bin_count);
-    std::vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
     show_histogram_svg(bins);
 
 
     return 0;
 }
+Input
+download(const string& address) {
+    stringstream buffer;
+    CURL* curl = curl_easy_init();
+    if(curl) {
+        CURLcode res;
+        curl_easy_setopt(curl, CURLOPT_URL, address);
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, input_data);
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
+        res = curl_easy_perform(curl);
+        if(res!=0){
+            cout << curl_easy_strerror(res) << endl;
+            exit(1);
+        }
+        curl_easy_cleanup(curl);
+    }
+    return input_data(buffer, false);
+}
+
+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<char*>(items), data_size);
+    return data_size;
+}
+
 Input input_data(istream& in, bool promt) {
 
     Input input_struct;
     size_t countOfNumbers;
     if(promt){cerr << "Input your count of numbers:\n";}
 
-    cin >> countOfNumbers;
+    in >> countOfNumbers;
 
     input_struct.numbers.resize(countOfNumbers);
     if(promt){cerr << "Input numbers:\n";}
     for (int i = 0; i < countOfNumbers; i++) {
         if(promt){cerr << i << ":" << endl;}
-        cin >> input_struct.numbers[i];
+        in >> input_struct.numbers[i];
     }
     if(promt){
         cerr << endl;
         cerr << "Input bin count:\n";
     }
 
-    cin >> input_struct.bin_count;
+    in >> input_struct.bin_count;