code: общее задание 4

1st try.cbp

@@ -33,12 +33,12 @@
 			<Add option="-fexceptions" />
 		</Compiler>
 		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram.h" />
 		<Unit filename="main.cpp" />
 		<Unit filename="svg.cpp" />
-		<Unit filename="svg.h">
+		<Unit filename="svg.h" />
-			<Option target="&lt;{~None~}&gt;" />
-		</Unit>
 		<Unit filename="text.cpp" />
+		<Unit filename="text.h" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

main.cpp

@@ -1,4 +1,7 @@
+#include <curl/curl.h>
 #include <vector>
+#include <sstream>
+#include <string>
 #include <iostream>
 #include <string>
 #include "histogram.h"
@@ -11,31 +14,64 @@ struct Input {
 };
 
 Input
-input_data() {
+input_data(istream& in, bool prompt) {
     size_t number_count;
-    cerr << "Enter number count: ";
+    if (prompt) {cerr << "Enter number count: ";};
-    cin >> number_count;
+    in >> number_count;
 
-    Input in;
+    Input in1;
-    in.numbers.resize(number_count);
+    in1.numbers.resize(number_count);
-    cerr << "Enter numbers: ";
+    if (prompt) {cerr << "Enter numbers: ";};
     for (size_t i = 0; i < number_count; i++) {
-        cin >> in.numbers[i];
+        in >> in1.numbers[i];
     }
 
-    cerr << "Enter bin count: ";
-    cin >> in.bin_count;
 
-    return in;
+    if (prompt) {cerr << "Enter bin count: ";};
+    in >> in1.bin_count;
+
+    return in1;
 }
 
-int main()
+static 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);
+            if (res != CURLE_OK) {
+                fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
+                exit(1);
+            }
+            curl_easy_cleanup(curl);
+        }
+    return input_data(buffer, false);
+}
+
+int
+main(int argc, char* argv[])
 {
-    const size_t SCREEN_WIDTH = 80;
+    #include <curl/curl.h>
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    curl_global_init(CURL_GLOBAL_ALL);
-
+    Input input;
-    auto in = input_data();
+    if (argc > 1) {
-    auto bins = make_histogram(in.numbers, in.bin_count);
+        input = download(argv[1]);
-    show_histogram_svg(bins);
+    } else {
-    return 0;
+        input = input_data(cin, true);
+    }
+
+    const auto bins = make_histogram(input.numbers, input.bin_count);
+    show_histogram_svg(bins);
 }

unittest.cbp

@@ -31,7 +31,7 @@
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
-		<Unit filename="histogram.cpp" />
+		<Unit filename="doctest.h" />
 		<Unit filename="unittest.cpp" />
 		<Extensions>
 			<lib_finder disable_auto="1" />