.gitignore

@@ -1,9 +1,6 @@
 .DS_Store
 .AppleDouble
 .LSOverride
-curl/
-lab01
-
 
 # Xcode проекты
 lab01.xcodeproj/

main.cpp

@@ -1,11 +1,8 @@
-#include <iostream>
-#include <sstream>
 #include <vector>
-#include <curl/curl.h>
+#include <iostream>
 #include "histogram.h"
-#include "svg.h"
 #include "text.h"
-
+#include "svg.h"  
 using namespace std;
 
 struct Input {
@@ -13,65 +10,29 @@ struct Input {
     size_t bin_count{};
 };
 
-Input input_data(istream& in, bool prompt = false) {
+Input input_data() {
-    Input in_data;
+    Input in;
     size_t number_count;
-    if (prompt) cerr << "Enter number count: ";
+    
-    in >> number_count;
+    cerr << "Enter number count: ";
-    in_data.numbers.resize(number_count);
+    cin >> number_count;
-    if (prompt && number_count > 0) cerr << "Enter numbers: ";
+    
+    in.numbers.resize(number_count);
+    cerr << "Enter numbers: ";
     for (size_t i = 0; i < number_count; i++) {
-        in >> in_data.numbers[i];
+        cin >> in.numbers[i];
     }
-    if (prompt) cerr << "Enter bin count: ";
+    
-    in >> in_data.bin_count;
+    cerr << "Enter bin count: ";
-    return in_data;
+    cin >> in.bin_count;
-}
+    
-
+    return in;
-// Колбэк-функция для cURL: записывает данные в буфер
-size_t write_data(void* ptr, size_t size, size_t nmemb, void* userdata) {
-    size_t total = size * nmemb;
-    stringstream* stream = reinterpret_cast<stringstream*>(userdata);
-    stream->write(reinterpret_cast<const char*>(ptr), total);
-    return total;
 }
 
-Input download(const string& url) {
+int main() {
-    CURL* curl = curl_easy_init();
+    auto in = input_data();
-    if (!curl) {
+    auto bins = make_histogram(in.numbers, in.bin_count);
-        cerr << "Failed to init curl" << endl;
-        exit(1);
-    }
-
-    stringstream buffer;
-    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
-
-    CURLcode res = curl_easy_perform(curl);
-    curl_easy_cleanup(curl);
-
-    if (res != CURLE_OK) {
-        cerr << "cURL error: " << curl_easy_strerror(res) << endl;
-        exit(1);
-    }
-
-    return input_data(buffer, false);
-}
-
-int main(int argc, char* argv[]) {
-    curl_global_init(CURL_GLOBAL_ALL);
-
-    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_svg(bins);
-
+    
-    curl_global_cleanup();
     return 0;
 }