finish

main.cpp

@@ -1,5 +1,6 @@
 #include <curl/curl.h>
-
+#include <sstream>
+#include <string>
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
@@ -23,29 +24,38 @@ Input input_data(istream& in, bool promt = false) {
     in >> lin.korz;
     return lin;
 }
+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;
+}
 
-int main(int argc, char* argv[]) {
-    if (argc > 1) {
+Input download(const string& address){
+    stringstream buffer;
     CURL* curl = curl_easy_init();
     if (curl) {
-            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);
         CURLcode res = curl_easy_perform(curl);
+        curl_easy_cleanup(curl);
         if (res != CURLE_OK) {
             cerr << "cURL error: " << curl_easy_strerror(res) << endl;
             exit(1);
         }
-
-            curl_easy_cleanup(curl);
-        } else {
-            cerr << "curl_easy_init() failed" << endl;
+    return input_data(buffer, false);
 }
-        return 0;
 }
-
-
-    auto in = input_data(cin);
-    auto bins = make_histogram(in.korz, in.vec);
+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.korz, input.vec);
     show_histogram_svg(bins);
     return 0;
 }