lab04

main.cpp

@@ -1,9 +1,10 @@
 #include <math.h>
 #include <vector>
 #include <iostream>
+#include <sstream>
 #include <string.h>
 #include <curl/curl.h>
-
+#include <string>
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
@@ -48,29 +49,42 @@ input_data(istream& in,bool prompt) {
     return on;
 }
 
+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;
+        res = curl_easy_perform(curl);
 
-int main(int argc, char* argv[])
-{
-    if (argc > 1) {
-        CURL *curl = curl_easy_init();
-        if(curl) {
+        curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
+
+        if(res != CURLE_OK){
+            cerr << curl_easy_strerror(res);
+            exit(1);}
+        curl_easy_cleanup(curl);}
+    return input_data(buffer, false);
+}
 
-            CURLcode res;
-            curl_easy_setopt(curl, CURLOPT_URL, argv[0]);
-            res = curl_easy_perform(curl);
-            if(res != CURLE_OK){
-                fprintf(stderr, "curl_easy_perform() failed: %s\n",
-                         curl_easy_strerror(res));
-                         exit(1);}
-            curl_easy_cleanup(curl);
-        }
-        return 0;}
 
-    curl_global_init(CURL_GLOBAL_ALL);
+int main(int argc, char* argv[]){
+    Input input;
+    if (argc > 1) {
+        input = download(argv[1]);}
+    else {
+        input = input_data(cin, true);}
 
-    auto in = input_data(cin,true);
-    auto bins = make_histogram(in.numbers, in.bin_count);
+    const auto bins = make_histogram(input.numbers, input.bin_count);
     show_histogram_svg(bins);
-    return 0;
+return 0;
 }