diff --git a/deploy/archlinux/PKGBUILD b/deploy/archlinux/PKGBUILD index 84f8cc1..13b26df 100644 --- a/deploy/archlinux/PKGBUILD +++ b/deploy/archlinux/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Leca pkgname=checks-parser-git -pkgver=alpha_0.0.2 +pkgver=alpha_0.0.4 pkgrel=1 epoch= pkgdesc="Utility for parsing checks(receipts) to csv" @@ -8,7 +8,7 @@ arch=('x86_64') url="https://git.foxarmy.org/leca/checks-parser" license=('GPL-3.0-or-later') groups=() -depends=('qt5-base' 'opencv' 'zbar' 'nlohmann-json' 'tesseract') +depends=('qt5-base' 'opencv' 'zbar' 'nlohmann-json' 'tesseract' 'qrencode') makedepends=('cmake' 'make' 'gcc' 'git' 'qt5-tools') checkdepends=() optdepends=('tesseract-data-rus: scan russian checks with OCR') diff --git a/ofdscene.cpp b/ofdscene.cpp index 6621d33..84c681a 100644 --- a/ofdscene.cpp +++ b/ofdscene.cpp @@ -21,6 +21,7 @@ OFDScene::OFDScene(QWidget *parent) : QWidget(parent) , ui(new Ui::OFDScene) { ui->setupUi(this); + ui->stop_server_button->hide(); QObject::connect(this, &OFDScene::httpErrorOccured, this, &OFDScene::notifyHttpServerFailure); } @@ -51,6 +52,7 @@ void OFDScene::startHttpServer() { std::string connectionString = "binaryeye://scan/?ret=http://"+ localIp +":"+ std::to_string(port) +"/?result={RESULT}"; server.Get("/", [&](const httplib::Request &req, httplib::Response &res){ + std::cout << "New http connection" < paramsMap; if (req.params.size() < 1) { res.set_redirect(connectionString, 301); @@ -69,11 +71,13 @@ void OFDScene::startHttpServer() { res.set_redirect(connectionString, 301); }); - std::cerr << "Listening on port: " << this->port << std::endl; + std::cout << "Listening on port: " << this->port << std::endl; if (!server.listen("0.0.0.0", this->port)) { std::cerr << "Random port seems to be occupied. Trying to generate another one" << std::endl; number_of_retries ++; continue; + } else { + break; } } while(true); } @@ -173,14 +177,17 @@ void OFDScene::on_parse_button_clicked() { } while (!is_captcha_solved); if (success) { - OutputDialog d = OutputDialog(this, check); - d.exec(); + OutputDialog *d = new OutputDialog(this, check); + d->exec(); + + delete d; } } void OFDScene::on_binary_eye_button_clicked() { http_thread = new std::thread(&OFDScene::startHttpServer, this); ui->binary_eye_button->setEnabled(false); + ui->stop_server_button->show(); while (!server.is_running()); std::string localIp; @@ -214,3 +221,11 @@ unsigned int OFDScene::getPort() { return port; } + +void OFDScene::on_stop_server_button_clicked() { + server.stop(); + http_thread->join(); + ui->stop_server_button->hide(); + ui->binary_eye_button->setEnabled(true); +} + diff --git a/ofdscene.h b/ofdscene.h index 8162450..92ae8b4 100644 --- a/ofdscene.h +++ b/ofdscene.h @@ -28,6 +28,8 @@ private slots: void on_binary_eye_button_clicked(); void notifyHttpServerFailure(); + void on_stop_server_button_clicked(); + signals: void httpErrorOccured(); diff --git a/parser/parser.cpp b/parser/parser.cpp index d15a0ff..daf6743 100644 --- a/parser/parser.cpp +++ b/parser/parser.cpp @@ -91,7 +91,7 @@ std::vector Parser::parse(std::wstring check_plaintext) { goods_names.size() != goods_quantities.size() || goods_prices.size() != goods_quantities.size()) { - dumpVectorsToStdErr(goods_names, goods_prices, goods_quantities); + // dumpVectorsToStdErr(goods_names, goods_prices, goods_quantities); //Error. Amount of names, prices or quantities are not equal. That means, that some regex(es) has mismatched. return {}; diff --git a/scenes/ofdscene.ui b/scenes/ofdscene.ui index 4e44026..6621b02 100644 --- a/scenes/ofdscene.ui +++ b/scenes/ofdscene.ui @@ -17,10 +17,10 @@ QLayout::SizeConstraint::SetDefaultConstraint - - + + - Total + FI (Fiscal Identifier) @@ -37,6 +37,20 @@ + + + + Date and time of purchase + + + + + + + Use your phone as a QR code scanner + + + @@ -50,12 +64,8 @@ - - - - 4294967296.000000000000000 - - + + @@ -70,10 +80,23 @@ - - + + + + + 0 + 0 + + - Date and time of purchase + Parse + + + + + + + Operation type @@ -101,22 +124,6 @@ - - - - - - - - 0 - 0 - - - - - - - @@ -130,13 +137,6 @@ - - - - Use your phone as a QR code scanner - - - @@ -150,16 +150,29 @@ - - + + - FI (Fiscal Identifier) + Total + + + + + 0 + 0 + + + + + + + @@ -167,23 +180,23 @@ - - - - Operation type + + + + 4294967296.000000000000000 - - + + - + 0 0 - Parse + Stop server diff --git a/translations/en_US.ts b/translations/en_US.ts index ddb3cdb..6163a79 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -292,7 +292,7 @@ Form - + Total Total @@ -302,42 +302,47 @@ Back - + or or - + FD (Fiscal Document) FD (Fiscal Document) - + Date and time of purchase Date and time of purchase - + + 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 @@ -347,87 +352,87 @@ 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. - + 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 - + QR code for binaryeye to connect - + I've scanned diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 84284f1..f093abd 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -292,7 +292,7 @@ Форма - + Total Итого @@ -302,42 +302,47 @@ Назад - + 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 @@ -347,87 +352,87 @@ ФН - + 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. - + Could not start http server. - + 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 - + I've scanned