code: фулл

lab04.cbp

@@ -13,7 +13,12 @@
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
+					<Add directory="curl/include" />
 				</Compiler>
+				<Linker>
+					<Add library="libcurl.dll.a" />
+					<Add directory="curl/lib" />
+				</Linker>
 			</Target>
 			<Target title="Release">
 				<Option output="bin/Release/lab04" prefix_auto="1" extension_auto="1" />

main.cpp

@@ -4,6 +4,10 @@
 #include "text.h"
 #include "svg.h"
 #include <curl/curl.h>
+#include <sstream>
+#include <string>
+
+
 
 using namespace std;
 struct Input
@@ -12,71 +16,81 @@ struct Input
     size_t bin_count{};
 };
 
-Input
+Input input_data(istream& inx, bool prompt)
-input_data(istream& inn)
 {
-    bool prompt;
-    int value;
-    cerr << "Show messages? (0 - no \ 1- yes)";
-    inn >> value;
-    prompt = value;
-
-    Input in;
     size_t number_count;
     if (prompt) cerr << "Enter number count: ";
-    inn >> number_count;
+    inx >> number_count;
+
 
+    Input in;
     in.numbers.resize(number_count);
-    vector<double> numbers(number_count);
 
-    for (size_t i = 0; i < number_count; i++)
+    vector<double> numbers(number_count);
+    if (prompt) cerr << "Enter numbers: ";
+    for (int i = 0; i < number_count; i++)
     {
-        if (prompt) cerr << "Enter numbers: ";
+        inx >> in.numbers[i];
-        inn >> in.numbers[i];
     }
-    size_t bin_count;
+
     if (prompt) cerr << "Enter bin count: ";
-    inn >> in.bin_count;
+    inx >> in.bin_count;
     return in;
 }
-size_t write_data(void* ptr, size_t size, size_t nmemb, void* stream)
-{
-    size_t written = fwrite(ptr, size, nmemb, stdout);
-    return written;
-}
 
 
+size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx)
+{
+    // TODO: äîïèñûâàòü äàííûå ê áóôåðó.
+    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[])
+Input
+download(const string& address)
 {
-    if (argc > 1)
+    stringstream buffer;
+    CURL* curl = curl_easy_init();
+    if (curl)
     {
-        CURL* curl = curl_easy_init();
+        curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
-        if (curl)
-        {
-            curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
-            curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
 
-            CURLcode res = curl_easy_perform(curl);
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
-            if (res != CURLE_OK)
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
-            {
-                cerr << "cURL error: " << curl_easy_strerror(res) << endl;
-            }
 
-            curl_easy_cleanup(curl);
+        CURLcode res = curl_easy_perform(curl);
-        }
+        if (res != CURLE_OK)
-        else
         {
-            cerr << "curl_easy_init() failed" << endl;
+            cerr << "cURL error: " << curl_easy_strerror(res) << endl;
+            curl_easy_cleanup(curl);
+            exit(1);
         }
-        return 0;
+        curl_easy_cleanup(curl);
+    }
+    else
+    {
+        cerr << "curl_easy_init() failed" << endl;
+        exit(1);
     }
-    curl_global_init(CURL_GLOBAL_ALL);
-    auto in = input_data(cin);
 
-    auto bins = make_histogram(in.numbers, in.bin_count);
+    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);
+    }
+    auto bins = make_histogram(input.numbers, input.bin_count);
     //show_histogram_text(bins, in.bin_count, bin_size);
     show_histogram_svg(bins);
-    return 0;
 }