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,18 +38,23 @@ 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;
+}
 
-int main(int argc, char* argv[])
-{
-    curl_global_init(CURL_GLOBAL_ALL);
-    if (argc > 1)
-    {
+Input download(const string& address) {
+    stringstream buffer;
     CURL* curl = curl_easy_init();
     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 != 0)
@@ -56,11 +63,28 @@ int main(int argc, char* argv[])
         exit(1);
         }
     }
+
+    return input_data(buffer, false);
+}
+
+int main(int argc, char* argv[])
+{
+    curl_global_init(CURL_GLOBAL_ALL);
+    Input in;
+    if (argc > 1)
+    {
+        in = download(argv[1]);
+    }
+    else
+    {
+        in = input_data(cin, true);
     }
-    bool prompt = true;
-    auto in = input_data(cin, prompt);
-    auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins, in.bin_count);
-    //show_histogram_svg(bins);
+
+    const auto bins = make_histogram(in.numbers, in.bin_count);
+    //show_histogram_text(bins, in.bin_count);
+    show_histogram_svg(bins);
     return 0;
 }
+
+
+//show_histogram_text(bins, in.bin_count);