code: final

main.cpp

@@ -4,6 +4,8 @@
 #include "text.h"
 #include "svg.h"
 #include <curl/curl.h>
+#include <sstream>
+#include <string>
 
 
 using namespace std;
@@ -36,31 +38,53 @@ Input input_data(istream& in1, bool prompt) {
     return in;
 }
 
+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;
+}
+
+Input download(const string& address) {
+    stringstream buffer;
+    CURL* curl = curl_easy_init();
+    if(curl)
+    {
+        CURLcode res;
+        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 != 0)
+        {
+        cerr << curl_easy_strerror(res);
+        exit(1);
+        }
+    }
+
+    return input_data(buffer, false);
+}
 
 int main(int argc, char* argv[])
 {
     curl_global_init(CURL_GLOBAL_ALL);
+    Input in;
     if (argc > 1)
     {
-        CURL* curl = curl_easy_init();
+        in = download(argv[1]);
-        if(curl)
+    }
-        {
+    else
-            CURLcode res;
+    {
-            curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
+        in = input_data(cin, true);
-            res = curl_easy_perform(curl);
-            curl_easy_cleanup(curl);
-            if(res != 0)
-            {
-            cerr << curl_easy_strerror(res);
-            exit(1);
-            }
-        }
     }
-    bool prompt = true;
+
-    auto in = input_data(cin, prompt);
+    const auto bins = make_histogram(in.numbers, in.bin_count);
-    auto bins = make_histogram(in.numbers, in.bin_count);
+    //show_histogram_text(bins, in.bin_count);
-    show_histogram_text(bins, in.bin_count);
+    show_histogram_svg(bins);
-    //show_histogram_svg(bins);
     return 0;
 }
+
+
+//show_histogram_text(bins, in.bin_count);