From e749c21a61c09c3eefe6babb0c520302db176392 Mon Sep 17 00:00:00 2001 From: leca Date: Tue, 1 Apr 2025 17:50:02 +0300 Subject: [PATCH] remove unneeded code. --- CMakeLists.txt | 37 +-- emailtextscene.cpp | 57 ---- emailtextscene.h | 30 -- http_server/http_server.cpp | 5 +- image/checkimage.cpp | 22 -- image/checkimage.h | 15 - main.cpp | 118 ++------ mainwindow.cpp | 222 +++++++++++++- mainwindow.h | 37 ++- modules/magnit.json | 9 - modules/pyaterochka.json | 9 - net/net.cpp | 53 +--- net/net.h | 2 +- ocrscene.cpp | 82 ----- ocrscene.h | 31 -- ofdscene.cpp | 222 -------------- ofdscene.h | 57 ---- parser/module.cpp | 97 ------ parser/module.h | 36 --- parser/parser.cpp | 121 -------- parser/parser.h | 30 -- scenes.qrc | 3 - scenes/emailtextscene.ui | 84 ----- scenes/mainwindow.ui | 326 ++++++++++++-------- scenes/ocrscene.ui | 127 -------- scenes/ofdscene.ui | 207 ------------- translations/en_US.ts | 589 +++++++++++++++++++----------------- translations/ru_RU.ts | 587 ++++++++++++++++++----------------- utils/utils.cpp | 23 -- 29 files changed, 1116 insertions(+), 2122 deletions(-) delete mode 100644 emailtextscene.cpp delete mode 100644 emailtextscene.h delete mode 100644 image/checkimage.cpp delete mode 100644 image/checkimage.h delete mode 100644 modules/magnit.json delete mode 100644 modules/pyaterochka.json delete mode 100644 ocrscene.cpp delete mode 100644 ocrscene.h delete mode 100644 ofdscene.cpp delete mode 100644 ofdscene.h delete mode 100644 parser/module.cpp delete mode 100644 parser/module.h delete mode 100644 parser/parser.cpp delete mode 100644 parser/parser.h delete mode 100644 scenes/emailtextscene.ui delete mode 100644 scenes/ocrscene.ui delete mode 100644 scenes/ofdscene.ui diff --git a/CMakeLists.txt b/CMakeLists.txt index f87e440..161ea28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,12 +3,11 @@ cmake_minimum_required(VERSION 3.10) project(checks-parser VERSION 0.0.4 LANGUAGES CXX) option(BUILD_TRANSLATIONS "Build translations?" ON) -option(BUILD_EMAIL_TO_TEXT_MODE "Build email-to-text mode?" ON) -option(BUILD_OCR_MODE "Build OCR mode?" ON) +option(BUILD_EMAIL_MODE "Build email mode?" ON) option(BUILD_OFD_LOCAL_QR_SCAN "Build OFDs' local qr scanner?" ON) option(BUILD_OFD_BINARYEYE_SCAN "Build OFDs' binaryeye scanner?" ON) -if (NOT (BUILD_EMAIL_TO_TEXT_MODE OR BUILD_OCR_MODE OR BUILD_OFD_LOCAL_QR_SCAN OR BUILD_OFD_BINARYEYE_SCAN)) +if (NOT (BUILD_EMAIL_MODE OR BUILD_OFD_LOCAL_QR_SCAN OR BUILD_OFD_BINARYEYE_SCAN)) message(FATAL_ERROR "You must specify at least one of the modes of data input!") return() endif() @@ -29,18 +28,11 @@ if (BUILD_OFD_LOCAL_QR_SCAN OR BUILD_OFD_BINARYEYE_SCAN) endif() endif() -if (BUILD_EMAIL_TO_TEXT_MODE) +if (BUILD_EMAIL_MODE) if(CMAKE_VERSION VERSION_LESS 3.12) - add_definitions(-DBUILD_EMAIL_TO_TEXT_MODE) + add_definitions(-DBUILD_EMAIL_MODE) else() - add_compile_definitions(BUILD_EMAIL_TO_TEXT_MODE) - endif() -endif() -if (BUILD_OCR_MODE) - if(CMAKE_VERSION VERSION_LESS 3.12) - add_definitions(-DBUILD_OCR_MODE) - else() - add_compile_definitions(BUILD_OCR_MODE) + add_compile_definitions(BUILD_EMAIL_MODE) endif() endif() if (BUILD_OFD_LOCAL_QR_SCAN) @@ -85,26 +77,17 @@ set(TRANSLATION_SOURCES settingsdialog.h settingsdialog.cpp scenes/settingsdialog.ui ) -if (BUILD_EMAIL_TO_TEXT_MODE) - list(APPEND TRANSLATION_SOURCES emailtextscene.cpp emailtextscene.h scenes/emailtextscene.ui) -endif() -if (BUILD_OCR_MODE) - list(APPEND TRANSLATION_SOURCES ocrscene.cpp ocrscene.h scenes/ocrscene.ui) -endif() if (BUILD_OFD_LOCAL_QR_SCAN) list(APPEND TRANSLATION_SOURCES adjustpicturedialog.h adjustpicturedialog.cpp scenes/adjustpicturedialog.ui) endif() if (BUILD_OFD_LOCAL_QR_SCAN OR BUILD_OFD_BINARYEYE_SCAN) list(APPEND TRANSLATION_SOURCES solvecaptchadialog.h solvecaptchadialog.cpp scenes/solvecaptchadialog.ui) - list(APPEND TRANSLATION_SOURCES ofdscene.cpp ofdscene.h scenes/ofdscene.ui) endif() set(PROJECT_SOURCES goods/goods.h goods/goods.cpp check/check.h check/check.cpp - parser/parser.h parser/parser.cpp - parser/module.h parser/module.cpp output/output_options.h output/output_options.cpp @@ -116,10 +99,6 @@ set(PROJECT_SOURCES ${TRANSLATION_SOURCES} ) -if (BUILD_OCR_MODE) - list(APPEND PROJECT_SOURCES image/checkimage.h image/checkimage.cpp) -endif() - if (BUILD_OFD_LOCAL_QR_SCAN) list(APPEND PROJECT_SOURCES image_redactor/imageredactor.h image_redactor/imageredactor.cpp) endif() @@ -219,10 +198,6 @@ if (BUILD_OFD_LOCAL_QR_SCAN) target_link_libraries(checks-parser PRIVATE -lzbar) endif() -if (BUILD_OCR_MODE) - target_link_libraries(checks-parser PRIVATE -ltesseract) -endif() - target_link_libraries(checks-parser PRIVATE -lcurl) if (CMAKE_VERSION VERSION_LESS 3.30) @@ -233,7 +208,7 @@ endif() include_directories(${Boost_INCLUDE_DIRS}) target_link_libraries(checks-parser PUBLIC ${Boost_LIBRARIES}) -if (BUILD_OCR_MODE OR BUILD_OFD_LOCAL_QR_SCAN OR BUILD_OFD_BINARYEYE_SCAN) +if (BUILD_OFD_LOCAL_QR_SCAN OR BUILD_OFD_BINARYEYE_SCAN) find_package(OpenCV REQUIRED COMPONENTS core imgproc imgcodecs) target_link_libraries(checks-parser PRIVATE ${OpenCV_LIBS}) target_include_directories(checks-parser PUBLIC ${OpenCV_INCLUDE_DIRS}) diff --git a/emailtextscene.cpp b/emailtextscene.cpp deleted file mode 100644 index b964adf..0000000 --- a/emailtextscene.cpp +++ /dev/null @@ -1,57 +0,0 @@ -#include "emailtextscene.h" -#include "ui_emailtextscene.h" - -#include -#include -#include -#include - -EmailTextScene::EmailTextScene(QWidget *parent) - : QWidget(parent) - , ui(new Ui::EmailTextScene) { - ui->setupUi(this); - - modules = parser.get_modules_names(); - - for (auto &module : modules) { - ui->store_combo_box->addItem(QString::fromStdString(module)); - } -} - -EmailTextScene::~EmailTextScene() { - delete ui; -} - -void EmailTextScene::on_parse_button_clicked() { - std::wstring checkContent = ui->check_content->toPlainText().toStdWString(); - parser.set_module(parser.search_modules()[ui->store_combo_box->currentIndex()]); - - std::vector goods = parser.parse(checkContent); - if (goods.size() == 0) { - QMessageBox infoDialog; - infoDialog.setText(tr("An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer.")); - infoDialog.setIcon(QMessageBox::Critical); - infoDialog.setWindowTitle(tr("Error in parsing")); - infoDialog.exec(); - return; - } - - Check check; - check.add_goods(goods); - - OutputDialog d(this, check); - d.show(); - d.exec(); -} - - -void EmailTextScene::on_check_content_textChanged() { - std::string store = parser.try_autodetect_store(ui->check_content->toPlainText().toStdString()); - if (store == "") { - std::cerr << tr("Could not autodetect store. If you beleive that this is an error, please, report to the developer.").toStdString() << std::endl; - return; - } - unsigned int index = ui->store_combo_box->findText(QString::fromStdString(store)); - ui->store_combo_box->setCurrentIndex(index); -} - diff --git a/emailtextscene.h b/emailtextscene.h deleted file mode 100644 index 68211be..0000000 --- a/emailtextscene.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef EMAILTEXTSCENE_H -#define EMAILTEXTSCENE_H - -#include "parser/parser.h" -#include - -namespace Ui { -class EmailTextScene; -} - -class EmailTextScene : public QWidget -{ - Q_OBJECT - -public: - explicit EmailTextScene(QWidget *parent = nullptr); - ~EmailTextScene(); - -private slots: - void on_parse_button_clicked(); - - void on_check_content_textChanged(); - -private: - Ui::EmailTextScene *ui; - Parser parser; - std::vector modules; -}; - -#endif // EMAILTEXTSCENE_H diff --git a/http_server/http_server.cpp b/http_server/http_server.cpp index b165bfb..fe1804b 100644 --- a/http_server/http_server.cpp +++ b/http_server/http_server.cpp @@ -1,9 +1,10 @@ #include "http_server.h" + #include #include #include #include -#include +#include #include void HttpServer::generateRandomPort() { @@ -88,7 +89,7 @@ void HttpServer::handleClient(int clientSocket) { std::cerr << response.length() << std::endl; std::cerr << QObject::tr("Could not send message").toStdString() << std::endl; } - emit ((OFDScene *)caller)->httpNewMessage(QString::fromStdString(std::string(buffer))); + emit ((MainWindow *)caller)->httpNewMessage(QString::fromStdString(std::string(buffer))); } void HttpServer::acceptClients() { diff --git a/image/checkimage.cpp b/image/checkimage.cpp deleted file mode 100644 index 4210ca6..0000000 --- a/image/checkimage.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include -#include -#include -#include "checkimage.h" - -CheckImage::CheckImage(std::string path) { - this->path = path; -} - -std::string CheckImage::parse_text() { - std::string result; - - tesseract::TessBaseAPI *ocr = new tesseract::TessBaseAPI(); - ocr->Init(NULL, "rus", tesseract::OEM_LSTM_ONLY); - ocr->SetPageSegMode(tesseract::PSM_AUTO); - - cv::Mat im = cv::imread(this->path, cv::IMREAD_COLOR); - ocr->SetImage(im.data, im.cols, im.rows, 3, im.step); - result = std::string(ocr->GetUTF8Text()); - - return result; -} diff --git a/image/checkimage.h b/image/checkimage.h deleted file mode 100644 index 54496f9..0000000 --- a/image/checkimage.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef CHECKIMAGE_H -#define CHECKIMAGE_H - -#include - -class CheckImage { - std::string path; -public: - CheckImage(std::string path); - - std::string parse_text(); - -}; - -#endif // CHECKIMAGE_H diff --git a/main.cpp b/main.cpp index 767f83b..e7d1ec2 100644 --- a/main.cpp +++ b/main.cpp @@ -1,11 +1,10 @@ -#include "mainwindow.h" -#include "net/net.h" -#include "settings/settings.h" -#include "utils/utils.h" +#include +#include +#include +#include #include #ifdef BUILD_OFD_MODE # include -# include #endif #include #if __GNUC__ < 8 && __clang_major__ < 17 @@ -19,26 +18,14 @@ #include #include #include -#include +#ifdef BUILD_TRANSLATIONS +# include +#endif #include -#ifdef BUILD_EMAIL_TO_TEXT_MODE -# include +#ifdef BUILD_EMAIL_MODE + //placeholder #endif -#ifdef BUILD_OCR_MODE -# include -#endif -#include -#include -#include - -static QWidget *loadUI(QWidget *parent, std::string filename) { - QUiLoader loader; - - QFile file(QString::fromStdString(filename)); - file.open(QIODevice::ReadOnly); - - return loader.load(&file, parent); -} +#include int main(int argc, char *argv[]) { curl_global_init(CURL_GLOBAL_ALL); @@ -47,7 +34,6 @@ int main(int argc, char *argv[]) { create_directories(program_data_path); srand(time(0)); - fetch_and_download_modules(); QApplication app(argc, argv); @@ -56,9 +42,10 @@ int main(int argc, char *argv[]) { Settings s(settings_file_path); +#ifdef BUILD_TRANSLATIONS QTranslator translator; QString lang = "en_US"; -#ifdef BUILD_TRANSLATIONS + bool languageSettingPresent = false; languageSettingPresent = s.get_all_settings().find("language") != s.get_all_settings().end(); @@ -75,81 +62,18 @@ int main(int argc, char *argv[]) { translator.load(":/translation/" + lang + ".qm"); app.installTranslator(&translator); #endif + MainWindow w; - QWidget *window = new QWidget(); - QStackedLayout *sceneLayout = new QStackedLayout; - - // Main Window setup - QWidget *mainwindowscene = loadUI(window, ":/scenes/scenes/mainwindow.ui"); - - sceneLayout->addWidget(mainwindowscene); + w.show(); + // TODO: move to the window //Settings button setup - QPushButton *settingsButton = ((MainWindow *)mainwindowscene)->findChild("settings_button"); - QObject::connect(settingsButton, &QPushButton::clicked, [&]() { - SettingsDialog d; - d.show(); - d.exec(); - }); - - for (auto &btn : ((MainWindow *)mainwindowscene)->findChildren()) { - if (btn->objectName() == "settings_button") continue; - btn->hide(); - } - - // Main Window buttons setup -#ifdef BUILD_EMAIL_TO_TEXT_MODE - QPushButton *text_from_email_button = ((MainWindow *)mainwindowscene)->findChild("text_from_email_button"); - text_from_email_button->show(); - EmailTextScene *emailTextScene = new EmailTextScene(); - sceneLayout->addWidget(emailTextScene); - QObject::connect(text_from_email_button, &QPushButton::clicked, [&]() { - // Text from email scene - int index = sceneLayout->indexOf(emailTextScene); - sceneLayout->setCurrentIndex(index); - sceneLayout->widget(index)->show(); - }); - -#endif -#ifdef BUILD_OCR_MODE - QPushButton *ocr_button = ((MainWindow *)mainwindowscene)->findChild("ocr_button"); - ocr_button->show(); - OCRScene *ocrscene = new OCRScene(); - sceneLayout->addWidget(ocrscene); - QObject::connect(ocr_button, &QPushButton::clicked, [&]() { - // OCR scene - int index = sceneLayout->indexOf(ocrscene); - sceneLayout->setCurrentIndex(index); - sceneLayout->widget(index)->show(); - }); -#endif -#ifdef BUILD_OFD_MODE - QPushButton *ofd_button = ((MainWindow *)mainwindowscene)->findChild("ofd_button"); - ofd_button->show(); - OFDScene *ofdscene = new OFDScene(); - sceneLayout->addWidget(ofdscene); - QObject::connect(ofd_button, &QPushButton::clicked, [&]() { - // OFD scene - int index = sceneLayout->indexOf(ofdscene); - sceneLayout->setCurrentIndex(index); - sceneLayout->widget(index)->show(); - }); -#endif - - //Setting all back buttons - for (uint32_t sceneIndex = 0; sceneIndex < sceneLayout->count(); sceneIndex ++) { - auto scene = sceneLayout->widget(sceneIndex); - - QPushButton *back_button = scene->findChild("back_button"); - if (back_button == nullptr) continue; - - QObject::connect(back_button, &QPushButton::clicked, [&]() { - sceneLayout->setCurrentIndex(0); - }); - } - - window->setLayout(sceneLayout); - window->show(); + // QPushButton *settingsButton = w.findChild("settings_button"); + // QObject::connect(settingsButton, &QPushButton::clicked, [&]() { + // SettingsDialog d; + // d.show(); + // d.exec(); + // }); return app.exec(); } diff --git a/mainwindow.cpp b/mainwindow.cpp index 412022d..26c9b1a 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,13 +1,231 @@ -#include "mainwindow.h" +#include #include "ui_mainwindow.h" -#include + +#include +#include +#include + +#ifdef BUILD_OFD_LOCAL_QR_SCAN +# include +#endif + +#include +#include +#include +#include +#include + +#ifdef BUILD_OFD_BINARYEYE_SCAN +# include +# include +# include +# include +# include +# include +#endif MainWindow::MainWindow(QWidget *parent) : QWidget(parent) , ui(new Ui::MainWindow) { ui->setupUi(this); + ui->stop_server_button->hide(); + +#ifdef BUILD_OFD_BINARYEYE_SCAN + QObject::connect(this, &MainWindow::httpErrorOccured, this, &MainWindow::notifyHttpServerFailure); + connect(this, SIGNAL(httpNewMessage(QString)), this, SLOT(httpNewMessageHandler(QString))); +#endif + +#ifndef BUILD_EMAIL_MODE + ui->parse_email_button->hide(); + ui->or_label_2->hide(); +#endif + +#ifndef BUILD_OFD_BINARYEYE_SCAN + ui->or_label_2->hide(); + ui->binary_eye_button->hide(); +#endif +#ifndef BUILD_OFD_LOCAL_QR_SCAN + ui->or_label_1->hide(); + ui->choose_image_button->hide(); +#endif } +#ifdef BUILD_OFD_BINARYEYE_SCAN +void MainWindow::startHttpServer() { + server = new HttpServer(this); + + if (server->start() < 0) { + emit httpErrorOccured(); + } +} + +void MainWindow::on_binary_eye_button_clicked() { + httpServerThread = new std::thread(&MainWindow::startHttpServer, this); + ui->binary_eye_button->setEnabled(false); + ui->stop_server_button->show(); + + while (!server->isStarted()) {} + + std::string localIp; + try { + localIp = get_local_ip_address(); + } catch(std::exception e) { + std::cerr << e.what() << std::endl; + return; + } + + std::string connectionString = "binaryeye://scan?ret=http://" + localIp + ":" + std::to_string(server->getPort()) + "/?result={RESULT}"; + + generate_qr_code(connectionString); + + QMessageBox infoDialog = QMessageBox(); + infoDialog.setText(QString::fromStdString(connectionString)); + infoDialog.setIconPixmap(QPixmap(QString::fromStdString(get_path_relative_to_home(".local/share/checks_parser/binaryeye_connection.png"))).scaled(400, 400, Qt::KeepAspectRatio)); + infoDialog.setWindowTitle(tr("QR code for binaryeye to connect")); + infoDialog.setButtonText(1, tr("I've scanned")); + infoDialog.exec(); +} + +void MainWindow::notifyHttpServerFailure() { + QMessageBox infoDialog = QMessageBox(); + infoDialog.setText(tr("Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer.")); + infoDialog.setIcon(QMessageBox::Warning); + infoDialog.setWindowTitle(tr("Could not start http server.")); + infoDialog.exec(); +} + +void MainWindow::on_stop_server_button_clicked() { + delete server; + ui->stop_server_button->hide(); + ui->binary_eye_button->setEnabled(true); +} + +void MainWindow::httpNewMessageHandler(QString message) { + std::string parametersString = split(message.toStdString(), " ")[1]; + + //erase /?result= from the string + parametersString.erase(0, parametersString.find("=") + 1); + + std::vector parameters = split(parametersString, "&"); + + std::map paramsMap; + + for (auto ¶meter : parameters) { + std::vector values = split(parameter, "="); + paramsMap.insert(std::pair (values[0], values[1])); + } + + emit onDataDecode(paramsMap); +} + + +#endif //ifdef BUILD_OFD_BINARYEYE_SCAN + +#ifdef BUILD_OFD_LOCAL_QR_SCAN +void MainWindow::on_choose_image_button_clicked() { + QString filename = QFileDialog::getOpenFileName(); + + if (filename == "") { + QMessageBox infoDialog; + infoDialog.setText(tr("Please, select a picture where QR code that contains info about check is present")); + infoDialog.setIcon(QMessageBox::Critical); + infoDialog.setWindowTitle(tr("Picture was not selected")); + infoDialog.exec(); + return; + } + + ui->info_label->setText(tr("Selected image: ") + filename); + + AdjustPictureDialog dialog = AdjustPictureDialog(this, filename.toStdString()); + connect(&dialog, &AdjustPictureDialog::decodedData, this, &MainWindow::onDataDecode); + dialog.exec(); +} +#endif //ifdef BUILD_OFD_LOCAL_QR_SCAN + +void MainWindow::onDataDecode(std::map data) { + ui->fn_line_edit->setText(QString::fromStdString(data["fn"])); + ui->fd_line_edit->setText(QString::fromStdString(data["i"])); + ui->fi_line_edit->setText(QString::fromStdString(data["fp"])); + + QString extractedDateTime = QString::fromStdString(data["t"]); + //TODO: some QRs contain datetime in format yyyyMMddThhmmss. Perhaps there is more different formats, should write function to detect them. + QDateTime datetime = QDateTime::fromString(extractedDateTime, "yyyyMMddThhmm"); + if (datetime == QDateTime::fromString(extractedDateTime, "20000101T1200")) { + datetime = QDateTime::fromString(extractedDateTime, "yyyyMMddThhmmss"); + } + ui->purchase_datetime_edit->setDateTime(datetime); + + int type = std::stoi(data["n"]); + ui->operation_type_combo_box->setCurrentIndex(type - 1); + + std::string total = data["s"]; + + ui->total_spin_box->setValue(std::stod(total)); +} + +void MainWindow::on_parse_button_clicked() { + Net net; + net.get_captcha_from_ofdru(); + + std::string solved_captcha = ""; + bool success = true; + bool is_captcha_solved = true; + Check check; + + do { + SolveCaptchaDialog dialog = SolveCaptchaDialog(this, &solved_captcha); + dialog.exec(); + is_captcha_solved = true; + + try { + std::string check_content = net.fetch_check_data_from_ofdru( + ui->fn_line_edit->text().toStdString(), + ui->fd_line_edit->text().toStdString(), + ui->fi_line_edit->text().toStdString(), + ui->purchase_datetime_edit->dateTime().toString(Qt::ISODate).toStdString(), + ui->operation_type_combo_box->currentIndex() + 1, + // In the request to ofd.ru, total is in a format with 2 last digits represent decimal part of a number. + ui->total_spin_box->text().toDouble() * 100, + solved_captcha); + + check = parseOfdRuAnswer(check_content); + } catch(OfdRequestException e) { + success = false; + if (!strcmp(e.what(), "Incorrect captcha")) { + is_captcha_solved = false; + QMessageBox infoDialog; + infoDialog.setText(tr("Captcha was not solved correctly!")); + infoDialog.setIcon(QMessageBox::Critical); + infoDialog.setWindowTitle(tr("Captcha is incorrect")); + infoDialog.exec(); + break; + } else if (!strcmp(e.what(), "Internal server error")) { + QMessageBox infoDialog; + infoDialog.setText(tr("Internal server error. Please, try again later.")); + infoDialog.setIcon(QMessageBox::Critical); + infoDialog.setWindowTitle(tr("Internal server error")); + infoDialog.exec(); + return; + } else if (!strcmp(e.what(), "Does not exist")) { + QMessageBox infoDialog; + infoDialog.setText(tr("Check not found. Please, ensure correctness of entered data.")); + infoDialog.setIcon(QMessageBox::Critical); + infoDialog.setWindowTitle(tr("Check was not found")); + infoDialog.exec(); + return; + } + } + } while (!is_captcha_solved); + + if (success) { + OutputDialog *d = new OutputDialog(this, check); + d->exec(); + + delete d; + } +} + + MainWindow::~MainWindow() { delete ui; } diff --git a/mainwindow.h b/mainwindow.h index 52654f6..ffe5b34 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -2,7 +2,10 @@ #define MAINWINDOW_H #include -#include +#include +#include + +#include namespace Ui { class MainWindow; @@ -15,10 +18,36 @@ class MainWindow : public QWidget public: explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); - Ui::MainWindow *ui; -private slots: -private: +#ifdef BUILD_OFD_BINARYEYE_SCAN + void startHttpServer(); +#endif +signals: + void httpNewMessage(QString message); + void httpErrorOccured(); + +private slots: +#ifdef BUILD_OFD_LOCAL_QR_SCAN + void on_choose_image_button_clicked(); +#endif + + void onDataDecode(std::map); + void on_parse_button_clicked(); + +#ifdef BUILD_OFD_BINARYEYE_SCAN + + void on_binary_eye_button_clicked(); + void notifyHttpServerFailure(); + void on_stop_server_button_clicked(); + + void httpNewMessageHandler(QString message); +#endif +private: + Ui::MainWindow *ui; +#ifdef BUILD_OFD_BINARYEYE_SCAN + std::thread *httpServerThread; + HttpServer *server = NULL; +#endif }; #endif // MAINWINDOW_H diff --git a/modules/magnit.json b/modules/magnit.json deleted file mode 100644 index f678a91..0000000 --- a/modules/magnit.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name":"Магнит", - "autodetect_regex":"", - "goods_name_regex": "([\\(\\)\\%\\*a-zA-Z0-9\u0401\u0451\u0410-\u044f \\.\\-\/]{17,100})", - "goods_price_regex": "[0-9]{0,4}[^%]\\.[0-9]{2} ", - "goods_quantity_regex": "([0-9]{0,4}[^%]\\.[0-9]{3} )|(\t\\d )", - "check_start_regex": "", - "check_end_regex":"" -} diff --git a/modules/pyaterochka.json b/modules/pyaterochka.json deleted file mode 100644 index 936e67f..0000000 --- a/modules/pyaterochka.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name":"Пятёрочка", - "autodetect_regex":"ООО\s*\"Агроторг\"", - "goods_name_regex": "([\\(\\)\\%\\*a-zA-Z0-9\u0401\u0451\u0410-\u044f \\.\\-\/]{17,100})", - "goods_price_regex": "[0-9]{0,4}[^%]\\.[0-9]{2} ", - "goods_quantity_regex": "([0-9]{0,4}[^%]\\.[0-9]{3} )|(\t\\d )", - "check_start_regex": "КАССОВЫЙ ЧЕК\nприход", - "check_end_regex": "Итог\\:.{0,3}[0-9]{0,6}\\.[0-9]{2}" -} diff --git a/net/net.cpp b/net/net.cpp index b68dbc5..181fa09 100644 --- a/net/net.cpp +++ b/net/net.cpp @@ -1,12 +1,15 @@ -#include "net.h" +#include #include -#include "../utils/utils.h" +#include #include -#include -#include -#include -struct data {}; +Net::Net() {} + +size_t writeCallback(void* contents, size_t size, size_t nmemb, void* userp) { + size_t totalSize = size * nmemb; + ((std::string*)userp)->append(std::string((char*)contents)); + return totalSize; +} size_t write_data(void *buffer, size_t size, size_t nmemb, void *filename) { FILE *f = fopen(((std::string *)filename)->c_str(), "w"); @@ -17,44 +20,6 @@ size_t write_data(void *buffer, size_t size, size_t nmemb, void *filename) { return written; } -Net::Net() {} - -void write_modules(void *buffer, size_t size, size_t nmemb, void *modules) { - std::vector *modules_vector = - (std::vector *)modules; - std::string to_parse = std::string((char*)buffer); - - boost::regex r("(?!\\\")\\w+\\.json(?!\\\")", boost::regex::collate); - boost::smatch res; - - std::string::const_iterator search(to_parse.cbegin()); - while (boost::regex_search(search, to_parse.cend(), res, r)) { - modules_vector->push_back(res[0]); - search = res.suffix().first; - } -} - -size_t writeCallback(void* contents, size_t size, size_t nmemb, void* userp) { - size_t totalSize = size * nmemb; - ((std::string*)userp)->append(std::string((char*)contents)); - return totalSize; -} - -std::vector Net::get_all_modules(std::string url) { - CURL *handle = curl_easy_init(); - - curl_easy_setopt(handle, CURLOPT_URL, url.c_str()); - curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, write_modules); - - std::vector modules {}; - - curl_easy_setopt(handle, CURLOPT_WRITEDATA, &modules); - - curl_easy_perform(handle); - - return modules; -} - void Net::get_file(std::string url, std::string filename) { CURL *handle = curl_easy_init(); diff --git a/net/net.h b/net/net.h index 5ce64e9..eb0752b 100644 --- a/net/net.h +++ b/net/net.h @@ -5,12 +5,12 @@ #include size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp); +size_t writeCallback(void* contents, size_t size, size_t nmemb, void* userp); class Net { public: Net(); - std::vector get_all_modules(std::string url); void get_file(std::string url, std::string filename); std::string fetch_check_data_from_ofdru(std::string fn, std::string fd, std::string fi, std::string datetime, int operation, int total, std::string captcha); void get_captcha_from_ofdru(); diff --git a/ocrscene.cpp b/ocrscene.cpp deleted file mode 100644 index db45994..0000000 --- a/ocrscene.cpp +++ /dev/null @@ -1,82 +0,0 @@ -#include "ocrscene.h" -#include "ui_ocrscene.h" - -#include -#include -#include - -#include - -#include - -OCRScene::OCRScene(QWidget *parent) - : QWidget(parent) - , ui(new Ui::OCRScene) { - ui->setupUi(this); - - auto modules = parser.get_modules_names(); - - for (auto &module : modules) { - ui->store_combo_box->addItem(QString::fromStdString(module)); - } -} - -OCRScene::~OCRScene() { - delete ui; -} - -void OCRScene::on_parse_button_clicked() { - std::wstring checkContent = ui->check_text_edit->toPlainText().toStdWString(); - - parser.set_module(parser.search_modules()[ui->store_combo_box->currentIndex()]); - - std::vector goods = parser.parse(checkContent); - if (goods.size() == 0) { - QMessageBox infoDialog; - infoDialog.setText(tr("An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer.")); - infoDialog.setIcon(QMessageBox::Critical); - infoDialog.setWindowTitle(tr("Error in parsing")); - infoDialog.exec(); - return; - } - - Check check; - check.add_goods(goods); - - OutputDialog d(this, check); - d.show(); - d.exec(); -} - -void OCRScene::on_choose_image_button_clicked() { - QString filename = QFileDialog::getOpenFileName(); - - if (filename == "") { - QMessageBox infoDialog; - infoDialog.setText(tr("Please, select a picture to scan")); - infoDialog.setIcon(QMessageBox::Critical); - infoDialog.setWindowTitle(tr("Picture was not selected")); - infoDialog.exec(); - return; - } - - std::string new_text = "Selected: " + filename.toStdString(); - ui->path_to_image_label->setText(tr("Path to image: ")+ filename); - - CheckImage i(filename.toStdString()); - std::string parsed = i.parse_text(); - - ui->check_text_edit->setPlainText(QString::fromStdString(parsed)); -} - - -void OCRScene::on_check_text_edit_textChanged() { - std::string store = parser.try_autodetect_store(ui->check_text_edit->toPlainText().toStdString()); - if (store == "") { - std::cerr << tr("Could not autodetect store. If you beleive that this is an error, please, report to the developer.").toStdString() << std::endl; - return; - } - unsigned int index = ui->store_combo_box->findText(QString::fromStdString(store)); - ui->store_combo_box->setCurrentIndex(index); -} - diff --git a/ocrscene.h b/ocrscene.h deleted file mode 100644 index 7a1c55f..0000000 --- a/ocrscene.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef OCRSCENE_H -#define OCRSCENE_H - -#include "parser/parser.h" -#include - -namespace Ui { -class OCRScene; -} - -class OCRScene : public QWidget -{ - Q_OBJECT - -public: - explicit OCRScene(QWidget *parent = nullptr); - ~OCRScene(); - -private slots: - void on_parse_button_clicked(); - - void on_choose_image_button_clicked(); - - void on_check_text_edit_textChanged(); - -private: - Ui::OCRScene *ui; - Parser parser; -}; - -#endif // OCRSCENE_H diff --git a/ofdscene.cpp b/ofdscene.cpp deleted file mode 100644 index c9f23f4..0000000 --- a/ofdscene.cpp +++ /dev/null @@ -1,222 +0,0 @@ -#include "ofdscene.h" -#include "scenes/ui_ofdscene.h" -#include "ui_ofdscene.h" - -#include -#include -#include - -#ifdef BUILD_OFD_LOCAL_QR_SCAN -# include -#endif - -#include -#include -#include -#include -#include - -#ifdef BUILD_OFD_BINARYEYE_SCAN -# include -# include -# include -# include -# include -# include -# include -#endif - -OFDScene::OFDScene(QWidget *parent) - : QWidget(parent) - , ui(new Ui::OFDScene) { - ui->setupUi(this); - ui->stop_server_button->hide(); - -#ifdef BUILD_OFD_BINARYEYE_SCAN - QObject::connect(this, &OFDScene::httpErrorOccured, this, &OFDScene::notifyHttpServerFailure); - connect(this, SIGNAL(httpNewMessage(QString)), this, SLOT(httpNewMessageHandler(QString))); -#endif -} - -Ui::OFDScene *OFDScene::getUI() { - return ui; -} - -OFDScene::~OFDScene() { - delete ui; -} - -#ifdef BUILD_OFD_BINARYEYE_SCAN -void OFDScene::startHttpServer() { - server = new HttpServer(this); - - if (server->start() < 0) { - emit httpErrorOccured(); - } -} - -void OFDScene::on_binary_eye_button_clicked() { - httpServerThread = new std::thread(&OFDScene::startHttpServer, this); - ui->binary_eye_button->setEnabled(false); - ui->stop_server_button->show(); - - while (!server->isStarted()) {} - - std::string localIp; - try { - localIp = get_local_ip_address(); - } catch(std::exception e) { - std::cerr << e.what() << std::endl; - return; - } - - std::string connectionString = "binaryeye://scan?ret=http://" + localIp + ":" + std::to_string(server->getPort()) + "/?result={RESULT}"; - - generate_qr_code(connectionString); - - QMessageBox infoDialog = QMessageBox(); - infoDialog.setText(QString::fromStdString(connectionString)); - infoDialog.setIconPixmap(QPixmap(QString::fromStdString(get_path_relative_to_home(".local/share/checks_parser/binaryeye_connection.png"))).scaled(400, 400, Qt::KeepAspectRatio)); - infoDialog.setWindowTitle(tr("QR code for binaryeye to connect")); - infoDialog.setButtonText(1, tr("I've scanned")); - infoDialog.exec(); -} - -void OFDScene::notifyHttpServerFailure() { - QMessageBox infoDialog = QMessageBox(); - infoDialog.setText(tr("Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer.")); - infoDialog.setIcon(QMessageBox::Warning); - infoDialog.setWindowTitle(tr("Could not start http server.")); - infoDialog.exec(); -} - -void OFDScene::on_stop_server_button_clicked() { - delete server; - ui->stop_server_button->hide(); - ui->binary_eye_button->setEnabled(true); -} - -void OFDScene::httpNewMessageHandler(QString message) { - std::string parametersString = split(message.toStdString(), " ")[1]; - - //erase /?result= from the string - parametersString.erase(0, parametersString.find("=") + 1); - - std::vector parameters = split(parametersString, "&"); - - std::map paramsMap; - - for (auto ¶meter : parameters) { - std::vector values = split(parameter, "="); - paramsMap.insert(std::pair (values[0], values[1])); - } - - emit onDataDecode(paramsMap); -} - - -#endif //ifdef BUILD_OFD_BINARYEYE_SCAN - -#ifdef BUILD_OFD_LOCAL_QR_SCAN -void OFDScene::on_choose_image_button_clicked() { - QString filename = QFileDialog::getOpenFileName(); - - if (filename == "") { - QMessageBox infoDialog; - infoDialog.setText(tr("Please, select a picture where QR code that contains info about check is present")); - infoDialog.setIcon(QMessageBox::Critical); - infoDialog.setWindowTitle(tr("Picture was not selected")); - infoDialog.exec(); - return; - } - - ui->info_label->setText(tr("Selected image: ") + filename); - - AdjustPictureDialog dialog = AdjustPictureDialog(this, filename.toStdString()); - connect(&dialog, &AdjustPictureDialog::decodedData, this, &OFDScene::onDataDecode); - dialog.exec(); -} -#endif //ifdef BUILD_OFD_LOCAL_QR_SCAN - -void OFDScene::onDataDecode(std::map data) { - ui->fn_line_edit->setText(QString::fromStdString(data["fn"])); - ui->fd_line_edit->setText(QString::fromStdString(data["i"])); - ui->fi_line_edit->setText(QString::fromStdString(data["fp"])); - - QString extractedDateTime = QString::fromStdString(data["t"]); - //TODO: some QRs contain datetime in format yyyyMMddThhmmss. Perhaps there is more different formats, should write function to detect them. - QDateTime datetime = QDateTime::fromString(extractedDateTime, "yyyyMMddThhmm"); - if (datetime == QDateTime::fromString(extractedDateTime, "20000101T1200")) { - datetime = QDateTime::fromString(extractedDateTime, "yyyyMMddThhmmss"); - } - ui->purchase_datetime_edit->setDateTime(datetime); - - int type = std::stoi(data["n"]); - ui->operation_type_combo_box->setCurrentIndex(type - 1); - - std::string total = data["s"]; - - ui->total_spin_box->setValue(std::stod(total)); -} - -void OFDScene::on_parse_button_clicked() { - Net net; - net.get_captcha_from_ofdru(); - - std::string solved_captcha = ""; - bool success = true; - bool is_captcha_solved = true; - Check check; - - do { - SolveCaptchaDialog dialog = SolveCaptchaDialog(this, &solved_captcha); - dialog.exec(); - is_captcha_solved = true; - - try { - std::string check_content = net.fetch_check_data_from_ofdru( - ui->fn_line_edit->text().toStdString(), - ui->fd_line_edit->text().toStdString(), - ui->fi_line_edit->text().toStdString(), - ui->purchase_datetime_edit->dateTime().toString(Qt::ISODate).toStdString(), - ui->operation_type_combo_box->currentIndex() + 1, - // In the request to ofd.ru, total is in a format with 2 last digits represent decimal part of a number. - ui->total_spin_box->text().toDouble() * 100, - solved_captcha); - - check = parseOfdRuAnswer(check_content); - } catch(OfdRequestException e) { - success = false; - if (!strcmp(e.what(), "Incorrect captcha")) { - is_captcha_solved = false; - QMessageBox infoDialog; - infoDialog.setText(tr("Captcha was not solved correctly!")); - infoDialog.setIcon(QMessageBox::Critical); - infoDialog.setWindowTitle(tr("Captcha is incorrect")); - infoDialog.exec(); - break; - } else if (!strcmp(e.what(), "Internal server error")) { - QMessageBox infoDialog; - infoDialog.setText(tr("Internal server error. Please, try again later.")); - infoDialog.setIcon(QMessageBox::Critical); - infoDialog.setWindowTitle(tr("Internal server error")); - infoDialog.exec(); - return; - } else if (!strcmp(e.what(), "Does not exist")) { - QMessageBox infoDialog; - infoDialog.setText(tr("Check not found. Please, ensure correctness of entered data.")); - infoDialog.setIcon(QMessageBox::Critical); - infoDialog.setWindowTitle(tr("Check was not found")); - infoDialog.exec(); - return; - } - } - } while (!is_captcha_solved); - - if (success) { - OutputDialog *d = new OutputDialog(this, check); - d->exec(); - - delete d; - } -} diff --git a/ofdscene.h b/ofdscene.h deleted file mode 100644 index b2dc550..0000000 --- a/ofdscene.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef OFDSCENE_H -#define OFDSCENE_H - -#include - -#ifdef BUILD_OFD_BINARYEYE_SCAN -# include -# include -# include -#endif -namespace Ui { -class OFDScene; -} - -class OFDScene : public QWidget -{ - Q_OBJECT - -public: - explicit OFDScene(QWidget *parent = nullptr); - Ui::OFDScene *getUI(); - ~OFDScene(); -#ifdef BUILD_OFD_BINARYEYE_SCAN - void startHttpServer(); -#endif -private slots: -#ifdef BUILD_OFD_LOCAL_QR_SCAN - void on_choose_image_button_clicked(); -#endif - - void onDataDecode(std::map); - void on_parse_button_clicked(); - -#ifdef BUILD_OFD_BINARYEYE_SCAN - - - void on_binary_eye_button_clicked(); - void notifyHttpServerFailure(); - void on_stop_server_button_clicked(); - -// public slots: - void httpNewMessageHandler(QString message); -signals: - void httpNewMessage(QString message); - void httpErrorOccured(); -#endif - -private: - Ui::OFDScene *ui; - -#ifdef BUILD_OFD_BINARYEYE_SCAN - std::thread *httpServerThread; - HttpServer *server = NULL; -#endif -}; - -#endif // OFDSCENE_H diff --git a/parser/module.cpp b/parser/module.cpp deleted file mode 100644 index 11f1dcb..0000000 --- a/parser/module.cpp +++ /dev/null @@ -1,97 +0,0 @@ -#include "module.h" - -#include -#include -#include -#include -#include - -#include - -StoreModule::StoreModule() {} - -std::vector StoreModule::parse(std::wstring str, std::wstring regexp, boost::regex_constants::flag_type_ flag) { - std::vector result; - boost::wregex r(regexp, flag); - std::cout << "Handling: " << to_utf8(str) << std::endl; - for (boost::wsregex_iterator it{str.begin(), str.end(), r}, end{}; it != end; - it++) { - std::cout << "Parsed: " << to_utf8(it->str()) << std::endl; - result.push_back(to_utf8(it->str())); - } - - return result; -} - -StoreModule::StoreModule(std::string path) { - std::ifstream settings_file(path); - nlohmann::json settings = nlohmann::json::parse(settings_file); - - this->name = from_utf8(settings["name"]); - this->autodetect_regex = from_utf8(settings["autodetect_regex"]); - this->goods_name_regex = from_utf8(settings["goods_name_regex"]); - this->goods_price_regex = from_utf8(settings["goods_price_regex"]); - this->goods_net_weight_regex = from_utf8(settings["goods_net_weight_regex"]); - this->goods_quantity_regex = from_utf8(settings["goods_quantity_regex"]); - this->check_start_regex = from_utf8(settings["check_start_regex"]); - this->check_end_regex = from_utf8(settings["check_end_regex"]); -} - -std::vector StoreModule::parse_name(std::wstring str) { - return parse(str, this->goods_name_regex, boost::regex_constants::perl); -} - -std::vector StoreModule::parse_price(std::wstring str) { - return parse(str, this->goods_price_regex, boost::regex_constants::collate); -} - -std::vector StoreModule::parse_net_weight(std::vector &names) { - std::vector result; - for (std::string &name : names) { - std::vector parsed = parse(from_utf8(name), this->goods_net_weight_regex, boost::regex_constants::collate); - if (parsed.size() == 0) { - result.push_back("?"); - } else { - result.push_back(parsed[0]); - name.erase(name.find(parsed[0]), name.find(parsed[0]) + parsed[0].length()); - } - } - return result; -} - -std::vector StoreModule::parse_quantity(std::wstring str) { - return parse(str, this->goods_quantity_regex, boost::regex_constants::collate); -} - -std::wstring StoreModule::trim_check(std::wstring& check) { - unsigned int start_pos; - unsigned int end_pos; - - boost::wregex start_regex(this->check_start_regex, boost::regex::collate); - boost::wregex end_regex(this->check_end_regex, boost::regex::collate); - - for (boost::wsregex_iterator it{check.begin(), check.end(), start_regex}, end{}; - it != end; it++) { - start_pos = it->position() + it->str().size(); - break; - } - - check = check.substr(start_pos, check.size()); - - for (boost::wsregex_iterator it{check.begin(), check.end(), end_regex}, end{}; - it != end; it++) { - end_pos = it->position() - 1; - break; - } - - check = check.substr(0, end_pos); - - return check; -} - -std::wstring StoreModule::get_name() { return this->name; } - -bool StoreModule::search_autodetect_regex(std::wstring str) { - std::vector parsed = parse(str, this->autodetect_regex, boost::regex_constants::collate); - return parsed.size() > 0; -} diff --git a/parser/module.h b/parser/module.h deleted file mode 100644 index 7bf459e..0000000 --- a/parser/module.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef STORE_MODULE_H -#define STORE_MODULE_H - -#include -#include -#include - -class StoreModule { - std::string path; - std::wstring name; - std::wstring autodetect_regex; - std::wstring goods_name_regex; - std::wstring goods_price_regex; - std::wstring goods_net_weight_regex; - std::wstring goods_quantity_regex; - std::wstring check_start_regex; - std::wstring check_end_regex; - - std::vector parse(std::wstring str, std::wstring regexp, boost::regex_constants::flag_type_ flag); -public: - StoreModule(std::string path); - StoreModule(); - - std::vector parse_name(std::wstring); - std::vector parse_price(std::wstring); - std::vector parse_net_weight(std::vector &names); - std::vector parse_quantity(std::wstring); - - std::wstring trim_check(std::wstring&); - - std::wstring get_name(); - - bool search_autodetect_regex(std::wstring str); -}; - -#endif // STORE_MODULE_H diff --git a/parser/parser.cpp b/parser/parser.cpp deleted file mode 100644 index fd85118..0000000 --- a/parser/parser.cpp +++ /dev/null @@ -1,121 +0,0 @@ -#include "parser.h" - -#include -#include -#include -#include -#include -#include - -#if __GNUC__ <= 8 && __clang_major__ < 17 -# include - using namespace std::experimental; - using namespace std::experimental::filesystem; -#else -#include -# include - using namespace std::filesystem; -#endif - -Parser::Parser() {} - -std::vector Parser::search_modules() { - Settings s(get_path_relative_to_home(".local/share/checks_parser/settings.json")); - std::string path = get_path_relative_to_home(s.get_setting("stores_modules_dir"));//std::string(std::getenv("HOME")) + "/" + STORES_MODULES_DIR; - directory_entry modules_dir(path); - - if (!exists(modules_dir)) { - create_directories(path); - std::cout << QObject::tr("No modules directory found. Created one at ").toStdString() << path - << std::endl; - } - - std::vector modules_files; - - for (auto &file : directory_iterator(path)) { - modules_files.push_back(file.path()); - } - - return modules_files; -} - -std::vector Parser::get_modules_names() { - std::vector modules = this->search_modules(); - std::vector names = {}; - - for (std::string &modulePath : modules) { - std::ifstream inputFile(modulePath); - - nlohmann::json module = nlohmann::json::parse(inputFile); - std::string name = module["name"]; - names.push_back(name); - } - - return names; -} - -void Parser::set_module(std::string path) { module = StoreModule(path); } - -std::vector Parser::parse(std::wstring check_plaintext) { - std::vector result; - - module.trim_check(check_plaintext); - - std::vector goods_names = module.parse_name(check_plaintext); - std::vector goods_prices = module.parse_price(check_plaintext); - std::vector goods_net_weights = module.parse_net_weight(goods_names); - std::vector goods_quantities = module.parse_quantity(check_plaintext); - - - if (!areAllSizesEqual(goods_names, goods_prices, goods_net_weights, goods_quantities)) { - - // dumpVectorsToStderr(goods_names, goods_prices, goods_net_weights, goods_quantities); - - //Error. Amount of names, prices, net weights or quantities are not equal. That means, that some regex(es) has mismatched. - return {}; - } - short goods_amount = goods_names.size(); - - for (short i = 0; i < goods_amount; i++) { - Goods goods(goods_names[i], std::stod(goods_prices[i]), goods_net_weights[i], std::stod(goods_quantities[i])); - - result.push_back(goods); - } - - return result; -} - -std::string Parser::try_autodetect_store(std::string str) { - std::vector stored_modules_paths = search_modules(); - - for (auto &module_path : stored_modules_paths) { - StoreModule module(module_path); - if (module.search_autodetect_regex(from_utf8(str))) return to_utf8(module.get_name()); - } - - return ""; -} - -std::vector Parser::check_updates() { - std::cout << QObject::tr("Checking updates for stores modules").toStdString() << std::endl; - Settings s(get_path_relative_to_home(".local/share/checks_parser/settings.json")); - std::string path = get_path_relative_to_home(s.get_setting("stores_modules_dir")); - - std::vector to_download; - std::vector stored_modules = search_modules(); - Net n; - std::cerr << QObject::tr("Downloading modules list from: ").toStdString() << s.get_setting("stores_modules_url") << std::endl; - std::vector remote_modules = n.get_all_modules(s.get_setting("stores_modules_url")); - if (stored_modules.empty()) { - to_download = remote_modules; - } else { - for (const std::string& module : remote_modules) { - if (!vector_contains_element(stored_modules, module)) { - std::cout << QObject::tr("Queueing download of ").toStdString() << module << std::endl; - to_download.push_back(module); - } - } - } - - return to_download; -} diff --git a/parser/parser.h b/parser/parser.h deleted file mode 100644 index f833818..0000000 --- a/parser/parser.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef PARSER_H -#define PARSER_H - -#include "../goods/goods.h" -#include "module.h" -#include -#include - -class Parser { - - StoreModule module; - -public: - Parser(); - - std::vector search_modules(); - - std::vector get_modules_names(); - - std::vector check_updates(); - - void set_module(std::string); - - std::vector parse(std::wstring); - - std::string try_autodetect_store(std::string); - -}; - -#endif // PARSER_H diff --git a/scenes.qrc b/scenes.qrc index dc42550..79c28c7 100644 --- a/scenes.qrc +++ b/scenes.qrc @@ -1,10 +1,7 @@ scenes/outputdialog.ui - scenes/emailtextscene.ui - scenes/ocrscene.ui scenes/mainwindow.ui - scenes/ofdscene.ui scenes/settingsdialog.ui scenes/solvecaptchadialog.ui diff --git a/scenes/emailtextscene.ui b/scenes/emailtextscene.ui deleted file mode 100644 index 60008a4..0000000 --- a/scenes/emailtextscene.ui +++ /dev/null @@ -1,84 +0,0 @@ - - - EmailTextScene - - - - 0 - 0 - 1077 - 608 - - - - Form - - - - - - - 0 - 0 - - - - Check content - - - - - - - Parse - - - - - - - - 0 - 0 - - - - Store: - - - - - - - false - - - - - - - - 0 - 0 - - - - Back - - - - - - - - 0 - 0 - - - - - - - - - diff --git a/scenes/mainwindow.ui b/scenes/mainwindow.ui index 360223f..00609a3 100644 --- a/scenes/mainwindow.ui +++ b/scenes/mainwindow.ui @@ -7,7 +7,7 @@ 0 0 1039 - 693 + 426 @@ -26,134 +26,216 @@ Form - - - - 6 + + + + + 0 + 0 + - - - - - 0 - 0 - - - - Text from E-Mail - - - false - - - - - - - :/icons/assets/icons/email-text.svg:/icons/assets/icons/email-text.svg - - - - 128 - 128 - - - - false - - - false - - - false - - - false - - - false - - + + or + + + + + + + + 0 + 0 + + + + Parse + + + + + + + + 0 + 0 + + + + FD (Fiscal Document) + + + + + + + + 0 + 0 + + + + FN (Fiscal Number) + + + + + + + Operation type + + + + + + + + 0 + 0 + + + + Use your phone as a QR code scanner + + + + + + + + 0 + 0 + + + + + + + + + + + Date and time of purchase + + + + + + + + 0 + 0 + + + + Stop server + + + + + + + + 0 + 0 + + + + Choose image on your PC + + + + + + + Total + + + + + + + FI (Fiscal Identifier) + + + + + + + + 0 + 0 + + + + Parse an E-Mail + + + + + + + + 0 + 0 + + + + or + + + + + + + + 0 + 0 + + + + + + + + + + + + + + + + + + Funds income + - - - - - 0 - 0 - - - - Optical Character Recognition - - - - - - - :/icons/assets/icons/OCR.svg:/icons/assets/icons/OCR.svg - - - - 128 - 128 - - - + + + Funds return + - - - - - 0 - 0 - - - - - - - - :/icons/assets/icons/OFD.svg:/icons/assets/icons/OFD.svg - - - - 128 - 128 - - - + + + Funds spend + - - - - - 0 - 0 - - - - - - - - :/icons/assets/icons/settings.svg:/icons/assets/icons/settings.svg - - - - 128 - 128 - - - + + + Spends return + - + + + + + + 4294967296.000000000000000 + + - - - - + diff --git a/scenes/ocrscene.ui b/scenes/ocrscene.ui deleted file mode 100644 index 1c9aa59..0000000 --- a/scenes/ocrscene.ui +++ /dev/null @@ -1,127 +0,0 @@ - - - OCRScene - - - - 0 - 0 - 992 - 634 - - - - - 0 - 0 - - - - Form - - - - 8 - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Parse - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Choose - - - - - - - - 0 - 0 - - - - Back - - - - - - - - 0 - 0 - - - - Recognized text will be shown below as soon as image will be processed. Please, edit it - - - - - - - - 0 - 0 - - - - Path to image: - - - - - - - - - - - 0 - 0 - - - - Store: - - - - - - - - diff --git a/scenes/ofdscene.ui b/scenes/ofdscene.ui deleted file mode 100644 index 6621b02..0000000 --- a/scenes/ofdscene.ui +++ /dev/null @@ -1,207 +0,0 @@ - - - OFDScene - - - - 0 - 0 - 894 - 625 - - - - Form - - - - QLayout::SizeConstraint::SetDefaultConstraint - - - - - FI (Fiscal Identifier) - - - - - - - - 0 - 0 - - - - Back - - - - - - - Date and time of purchase - - - - - - - Use your phone as a QR code scanner - - - - - - - - 0 - 0 - - - - or - - - - - - - - - - - 0 - 0 - - - - FD (Fiscal Document) - - - - - - - - 0 - 0 - - - - Parse - - - - - - - Operation type - - - - - - - - Funds income - - - - - Funds return - - - - - Funds spend - - - - - Spends return - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - FN (Fiscal Number) - - - - - - - Total - - - - - - - - - - - 0 - 0 - - - - - - - - - - - Choose image on your PC - - - - - - - 4294967296.000000000000000 - - - - - - - - 0 - 0 - - - - Stop server - - - - - - - - diff --git a/translations/en_US.ts b/translations/en_US.ts index 0f56e24..2be3f5a 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -27,48 +27,36 @@ EmailTextScene - Form - Form + Form Store type Store type - Check content - Check content + Check content - Parse - Parse + Parse - Store: - Store: + Store: - Back - Back + Back - An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - Error in parsing - Error in parsing - - - - Could not autodetect store. If you beleive that this is an error, please, report to the developer. - + Error in parsing @@ -82,8 +70,9 @@ Store type + Parse - Parse + Parse Preferences @@ -124,51 +113,331 @@ 0000000000000000 + FN (Fiscal Number) FN = Фискальный Номер - FN (Fiscal Number) + FN (Fiscal Number) + FD (Fiscal Document) FD = Фискальный Документ - FD (Fiscal Document) + FD (Fiscal Document) 0000000000 000000000 + Back + Back + + + + Stop server + Stop server + + + + Choose image on your PC + Choose image on your PC + + + + + or + or + + + + Use your phone as a QR code scanner + Use your phone as a QR code scanner + + + FI (Fiscal Identifier) FI = Фискальный Признак - FI (Fiscal Identifier) + FI (Fiscal Identifier) + + Date and time of purchase + Date and time of purchase + + + + Operation type + Operation type + + + + Parse an E-Mail + + + + Funds income Приход средств - Funds income + Funds income + Funds return Возврат средств - Funds return + Funds return + Funds spend Расход средств - Funds spend + Funds spend + Spends return Возврат расхода - Spends return + Spends return + + + + Total + Total + + + checks parser + checks parser + + + + QR code for binaryeye to connect + QR code for binaryeye to connect + + + + I've scanned + I've scanned + + + + Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer. + Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer. + + + + Could not start http server. + Could not start http server. + + + + Selected image: + Selected image: + + + + Captcha was not solved correctly! + Captcha was not solved correctly! + + + + Captcha is incorrect + Captcha is incorrect + + + + Internal server error. Please, try again later. + Internal server error. Please, try again later. + + + + Internal server error + Internal server error + + + + Check not found. Please, ensure correctness of entered data. + Check not found. Please, ensure correctness of entered data. + + + + Check was not found + Check was not found + + + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + + + Error in parsing + Error in parsing + + + + Please, select a picture where QR code that contains info about check is present + Please, select a picture where QR code that contains info about check is present + + + + Picture was not selected + Picture was not selected + + + Please, select a picture to scan + Please, select a picture to scan + + + + Form + Form + + + Optical Character Recognition + Optical Character Recognition + + + Text from E-Mail + Text from E-Mail + + + + OCRScene + + Form + Form + + + Choose + Choose + + + Path to image: + Path to image: + + + Store: + Store: + + + Recognized text will be shown below as soon as image will be processed. Please, edit it + Recognized text will be shown below as soon as image will be processed. Please, edit it + + + Back + Back + + + Parse + Parse + + + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + + + Error in parsing + Error in parsing + + + Please, select a picture to scan + Please, select a picture to scan + + + Picture was not selected + Picture was not selected + + + Path to image: + Path to image: + + + + OFDScene + + Form + Form Total Total - checks parser - checks parser + Back + Back + + + or + or + + + FD (Fiscal Document) + FD (Fiscal Document) + + + Date and time of purchase + Date and time of purchase + + + Stop server + Stop server + + + Funds income + Funds income + + + Funds return + Funds return + + + Funds spend + Funds spend + + + Spends return + Spends return + + + Use your phone as a QR code scanner + Use your phone as a QR code scanner + + + FN (Fiscal Number) + FN (Fiscal Number) + + + FI (Fiscal Identifier) + FI (Fiscal Identifier) + + + Choose image on your PC + Choose image on your PC + + + Operation type + Operation type + + + Parse + Parse + + + Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer. + Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer. + + + Could not start http server. + Could not start http server. + + + Please, select a picture where QR code that contains info about check is present + Please, select a picture where QR code that contains info about check is present + + + Picture was not selected + Picture was not selected + + + Selected image: + Selected image: Captcha was not solved correctly! @@ -191,260 +460,16 @@ Check not found. Please, ensure correctness of entered data. - An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - - - Error in parsing - Error in parsing - - - Please, select a picture where QR code that contains info about check is present - Please, select a picture where QR code that contains info about check is present - - - Picture was not selected - Picture was not selected - - - Please, select a picture to scan - Please, select a picture to scan - - - - Form - Form - - - - Optical Character Recognition - Optical Character Recognition - - - - Text from E-Mail - Text from E-Mail - - - - OCRScene - - - Form - Form - - - - Choose - Choose - - - - Path to image: - Path to image: - - - - Store: - Store: - - - - Recognized text will be shown below as soon as image will be processed. Please, edit it - Recognized text will be shown below as soon as image will be processed. Please, edit it - - - - Back - Back - - - - Parse - Parse - - - - An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - - - - Error in parsing - Error in parsing - - - - Please, select a picture to scan - Please, select a picture to scan - - - - Picture was not selected - Picture was not selected - - - - Path to image: - Path to image: - - - - Could not autodetect store. If you beleive that this is an error, please, report to the developer. - - - - - OFDScene - - - Form - Form - - - - Total - Total - - - - Back - Back - - - - or - or - - - - FD (Fiscal Document) - FD (Fiscal Document) - - - - Date and time of purchase - Date and time of purchase - - - - Stop server - Stop server - - - - Funds income - Funds income - - - - Funds return - Funds return - - - - Funds spend - Funds spend - - - - Spends return - Spends return - - - - Use your phone as a QR code scanner - Use your phone as a QR code scanner - - - - FN (Fiscal Number) - FN (Fiscal Number) - - - - FI (Fiscal Identifier) - FI (Fiscal Identifier) - - - - Choose image on your PC - Choose image on your PC - - - - Operation type - Operation type - - - - Parse - Parse - - - - Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer. - Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer. - - - - Could not start http server. - Could not start http server. - - - - Please, select a picture where QR code that contains info about check is present - Please, select a picture where QR code that contains info about check is present - - - - Picture was not selected - Picture was not selected - - - - Selected image: - Selected image: - - - - Captcha was not solved correctly! - Captcha was not solved correctly! - - - - Captcha is incorrect - Captcha is incorrect - - - - Internal server error. Please, try again later. - Internal server error. Please, try again later. - - - - Internal server error - Internal server error - - - - Check not found. Please, ensure correctness of entered data. - Check not found. Please, ensure correctness of entered data. - - - Check was not found - Check was not found + Check was not found - QR code for binaryeye to connect - QR code for binaryeye to connect + QR code for binaryeye to connect - I've scanned - I've scanned + I've scanned 123 123 @@ -564,15 +589,23 @@ Print total + + QObject + + + Using locale: + + + SettingsDialog - + You need to restart program to apply language changes You need to restart program to apply language changes - + Restart required Restart required diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index f2577e7..371bf2f 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -27,48 +27,36 @@ EmailTextScene - Form - Форма + Форма Store type Магазин - Check content - Контент чека + Контент чека - Parse - Парсить + Парсить - Store: - Магазин: + Магазин: - Back - Назад + Назад - An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику. + Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику. - Error in parsing - Ошибка в парсинге - - - - Could not autodetect store. If you beleive that this is an error, please, report to the developer. - + Ошибка в парсинге @@ -82,8 +70,9 @@ Магазин + Parse - Парсить + Парсить Preferences @@ -124,23 +113,267 @@ 0000000000000000 + FN (Fiscal Number) Фискальный Норма - ФН + ФН + FD (Fiscal Document) Фискальный Документ - ФД + ФД 0000000000 000000000 + Back + Назад + + + + Stop server + Остановить сервер + + + + Choose image on your PC + Выбрать изображение на компьютере + + + + + or + или + + + + Use your phone as a QR code scanner + Использовать телефон как сканнер QR + + + FI (Fiscal Identifier) Фискальный Признак - ФП + ФП + + + + Date and time of purchase + Дата и время покупки + + + + Operation type + Тип операции + + + + Parse an E-Mail + + + + + Funds income + Приход средств + + + + Funds return + Возврат средств + + + + Funds spend + Расход средств + + + + Spends return + Возврат расхода + + + + Total + Итого + + + checks parser + Парсер чеков + + + + QR code for binaryeye to connect + QR код для подключения BinaryEye + + + + I've scanned + Просканировал + + + + Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer. + Не смог поднять HTTP сервер. 10 раз подряд случайно выбранный порт был занят. Либо Вам следует бежать за лоттерейным билетом, или в программе баг. Если лотерейный билет не был выигрышным, пожалуйста, сообщите разработчику. + + + + Could not start http server. + Не получилось запустить HTTP сервер. + + + + Selected image: + Выбранное изображение: + + + + Captcha was not solved correctly! + Капча была решена неверно! + + + + Captcha is incorrect + Капча введена неверно + + + + Internal server error. Please, try again later. + Внутренняя ошибка сервера. Пожалуйста, попробуйте снова позже. + + + + Internal server error + Внутренняя ошибка сервера + + + + Check not found. Please, ensure correctness of entered data. + Чек не найден. Пожалуйста, убедитесь в правильности введённых данных. + + + + Check was not found + Чек не найден + + + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику. + + + Error in parsing + Ошибка в парсинге + + + + Please, select a picture where QR code that contains info about check is present + Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке + + + + Picture was not selected + Изображение не было выбрано + + + Please, select a picture to scan + Пожалуйста, выберете изображение для сканирования + + + + Form + Форма + + + Optical Character Recognition + Оптическое распознавание символов + + + Text from E-Mail + Текст из электронного письма + + + + OCRScene + + Form + Форма + + + Choose + Выбрать + + + Path to image: + Путь к изображению: + + + Store: + Магазин: + + + Recognized text will be shown below as soon as image will be processed. Please, edit it + Распознанный текст будет показан ниже как только изображение обработается. Пожалуйста, отредактируйте + + + Back + Назад + + + Parse + Парсить + + + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику. + + + Error in parsing + Ошибка в парсинге + + + Please, select a picture to scan + Пожалуйста, выберете изображение для сканирования + + + Picture was not selected + Изображение не было выбрано + + + Path to image: + Путь к изображению: + + + + OFDScene + + Form + Форма + + + Total + Итого + + + Back + Назад + + + or + или + + + FD (Fiscal Document) + ФД + + + Date and time of purchase + Дата и время покупки + + + Stop server + Остановить сервер Funds income @@ -159,12 +392,48 @@ Возврат расхода - Total - Итого + Use your phone as a QR code scanner + Использовать телефон как сканнер QR - checks parser - Парсер чеков + FN (Fiscal Number) + ФН + + + FI (Fiscal Identifier) + ФП + + + Choose image on your PC + Выбрать изображение на компьютере + + + Operation type + Тип операции + + + Parse + Парсить + + + Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer. + Не смог поднять HTTP сервер. 10 раз подряд случайно выбранный порт был занят. Либо Вам следует бежать за лоттерейным билетом, или в программе баг. Если лотерейный билет не был выигрышным, пожалуйста, сообщите разработчику. + + + Could not start http server. + Не получилось запустить HTTP сервер. + + + Please, select a picture where QR code that contains info about check is present + Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке + + + Picture was not selected + Изображение не было выбрано + + + Selected image: + Выбранное изображение: Captcha was not solved correctly! @@ -191,260 +460,12 @@ Чек не найден - An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику. - - - Error in parsing - Ошибка в парсинге - - - Please, select a picture where QR code that contains info about check is present - Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке - - - Picture was not selected - Изображение не было выбрано - - - Please, select a picture to scan - Пожалуйста, выберете изображение для сканирования - - - - Form - Форма - - - - Optical Character Recognition - Оптическое распознавание символов - - - - Text from E-Mail - Текст из электронного письма - - - - OCRScene - - - Form - Форма - - - - Choose - Выбрать - - - - Path to image: - Путь к изображению: - - - - Store: - Магазин: - - - - Recognized text will be shown below as soon as image will be processed. Please, edit it - Распознанный текст будет показан ниже как только изображение обработается. Пожалуйста, отредактируйте - - - - Back - Назад - - - - Parse - Парсить - - - - An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику. - - - - Error in parsing - Ошибка в парсинге - - - - Please, select a picture to scan - Пожалуйста, выберете изображение для сканирования - - - - Picture was not selected - Изображение не было выбрано - - - - Path to image: - Путь к изображению: - - - - Could not autodetect store. If you beleive that this is an error, please, report to the developer. - - - - - OFDScene - - - Form - Форма - - - - Total - Итого - - - - Back - Назад - - - - or - или - - - - FD (Fiscal Document) - ФД - - - - Date and time of purchase - Дата и время покупки - - - - Stop server - Остановить сервер - - - - Funds income - Приход средств - - - - Funds return - Возврат средств - - - - Funds spend - Расход средств - - - - Spends return - Возврат расхода - - - - Use your phone as a QR code scanner - Использовать телефон как сканнер QR - - - - FN (Fiscal Number) - ФН - - - - FI (Fiscal Identifier) - ФП - - - - Choose image on your PC - Выбрать изображение на компьютере - - - - Operation type - Тип операции - - - - Parse - Парсить - - - - Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer. - Не смог поднять HTTP сервер. 10 раз подряд случайно выбранный порт был занят. Либо Вам следует бежать за лоттерейным билетом, или в программе баг. Если лотерейный билет не был выигрышным, пожалуйста, сообщите разработчику. - - - - Could not start http server. - Не получилось запустить HTTP сервер. - - - - Please, select a picture where QR code that contains info about check is present - Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке - - - - Picture was not selected - Изображение не было выбрано - - - - Selected image: - Выбранное изображение: - - - - Captcha was not solved correctly! - Капча была решена неверно! - - - - Captcha is incorrect - Капча введена неверно - - - - Internal server error. Please, try again later. - Внутренняя ошибка сервера. Пожалуйста, попробуйте снова позже. - - - - Internal server error - Внутренняя ошибка сервера - - - - Check not found. Please, ensure correctness of entered data. - Чек не найден. Пожалуйста, убедитесь в правильности введённых данных. - - - - Check was not found - Чек не найден - - - QR code for binaryeye to connect - QR код для подключения BinaryEye + QR код для подключения BinaryEye - I've scanned - Просканировал + Просканировал 123 123 @@ -564,15 +585,23 @@ Печатать Итого + + QObject + + + Using locale: + + + SettingsDialog - + You need to restart program to apply language changes Требуется перезагрузить программу, чтобы применить изменения языка - + Restart required Требуется перезагрузка diff --git a/utils/utils.cpp b/utils/utils.cpp index 8e790e6..ef0f132 100644 --- a/utils/utils.cpp +++ b/utils/utils.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include @@ -310,25 +309,3 @@ void generate_qr_code(std::string data) { } #endif // ifdef BUILD_OFD_BINARYEYE_SCAN - -void fetch_and_download_modules() { - Net n; - Parser p; - std::string settings_file_path = get_path_relative_to_home(".local/share/checks_parser/settings.json"); - - Settings s(settings_file_path); - - std::vector storesUpdates = p.check_updates(); - for (auto &update : storesUpdates) { - std::cout << "Downloading " - << s.get_setting("stores_modules_url") + update << " to " - << get_path_relative_to_home(s.get_setting("stores_modules_dir") + - "/" + update) - << std::endl; - - n.get_file(s.get_setting("stores_modules_url") + "/" + update, - get_path_relative_to_home(s.get_setting("stores_modules_dir") + - "/" + update)); - - } -}