code: datastream

labor01.cpp

@@ -5,6 +5,8 @@
 #include "text.h"
 #include "svg.h"
 #include <curl/curl.h>
+#include <sstream>
+#include <string>
 
 using namespace std;
 struct Input {
@@ -40,14 +42,13 @@ input_data(istream& inn, bool promt) {
     return in;
 }
 
-
-
-int main(int argc, char* argv[1]) {
-    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());
         res = curl_easy_perform(curl);
         if (res != CURLE_OK) {
             cerr << curl_easy_strerror(res);
@@ -55,11 +56,18 @@ int main(int argc, char* argv[1]) {
         }
         curl_easy_cleanup(curl);
     }
-        return 0;
+    return input_data(buffer, false);
+}
+
+
+int main(int argc, char* argv[]) {
+    Input input;
+    if (argc > 1) {
+        input = download(argv[1]);
+    }
+    else {
+        input = input_data(cin, true);
     }
-    bool promt = true;
-    auto in = input_data(cin, promt);
-    auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_svg(bins, in.colors);
-    return 0;
+    const auto bins = make_histogram(input.numbers, input.bin_count);
+    show_histogram_svg(bins);
 }