code: added error processing

main.cpp

@@ -4,93 +4,86 @@
 #include "svg.h"
 #include "text.h"
 #include <curl/curl.h>
-
+#include <sstream>
-
+#include <string>
 
 using namespace std;
 
-//const size_t SCREEN_WIDTH = 80;
-//const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
 struct Input
 {
     vector<double> numbers;
     size_t bin_count{};
-    size_t IMAGE_WIDTH{};
-
 };
 
-Input
+Input input_data(istream &in, bool promt)
-input_data(istream& in, bool promt)
 {
 
-    size_t number_count, bin_count, IMAGE_WIDTH;
+    size_t number_count, bin_count;
 
-    if (promt) cerr << "Enter number count: ";
+    if (promt)
+        cerr << "Enter number count: ";
     in >> number_count;
 
     Input input;
 
-
+    input.numbers.resize(number_count);
-
+    if (promt)
-    if (promt) cerr << " Input width of image, > 70 but not >800 : ";
+        cerr << "Enter numbers: ";
-    in >> input.IMAGE_WIDTH;
-    if(input.IMAGE_WIDTH < 70 || input.IMAGE_WIDTH > 800 ) {
-        while(input.IMAGE_WIDTH < 70 || input.IMAGE_WIDTH > 800) {
-            if (promt) cerr << " Input width of image, >70 but not >800 : ";
-            in >> input.IMAGE_WIDTH;
-        }
-    }
-
-
-    //size_t number_count = in.number_counts;
-
-    input.numbers.resize( number_count );
-    if (promt) cerr << "Enter numbers: ";
-    // vector<double> numbers(number_count);
 
     for (size_t i = 0; i < number_count; i++)
     {
         in >> input.numbers[i];
     }
 
-    if (promt) cerr << "Count of baskets: ";
+    if (promt)
+        cerr << "Count of baskets: ";
     in >> input.bin_count;
 
     return input;
 }
 
-int
+Input download(const string &address)
-main(int argc, char* argv[])
 {
+    stringstream buffer;
 
-    if( argc > 1 ){
+    //address.c_str();
-
-        CURL* curl = curl_easy_init();
-
-        cout << argc << '\n';
-        //while (true)
-        for (int i = 0; i < argc; i++){
 
-            cout << argv[i] << " ";
+    curl_global_init(CURL_GLOBAL_ALL);
+    {
+        CURL *curl = curl_easy_init();
+        if (curl)
+        {
+            CURLcode res;
+            curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
+            res = curl_easy_perform(curl);
+            CURL *curl = curl_easy_init();
+            if (curl)
+            {
+                CURLcode res;
+                /* set options */
+                /* Perform the entire transfer */
+                res = curl_easy_perform(curl);
+                /* Check for errors */
+                if (res != CURLE_OK)
+                    fprintf(stderr, "curl_easy_perform() failed: %s\n",
+                            curl_easy_strerror(res));
+                exit(1);
             }
-        cout << endl;
-
             curl_easy_cleanup(curl);
-
+        }
-
-        return 0;
     }
 
-    curl_global_init(CURL_GLOBAL_ALL);
+    return input_data(buffer, false);
-
+}
-    auto input = input_data(cin, true);
+int
-    auto bins = make_histogram( input.numbers, input.bin_count );
+main(int argc, char* argv[]) {
-    //int chek_block_width(in.IMAGE_WIDTH);
+    Input input;
-    //chek_block_width(in.IMAGE_WIDTH, in.number_count);
+    if (argc > 1) {
-    //if (chek_block_width==1)
+        input = download(argv[1]);
-    show_histogram_svg( bins, input.IMAGE_WIDTH );
+    } else {
-    //if(chek_block_width==0) return 0;
+        input = input_data(cin, true);
-    //show_histogram_svg(bins);
+    }
 
+    const auto bins = make_histogram(input.numbers, input.bin_count);
+    show_histogram_svg(bins);
 }