Compare commits
403 Commits
18e4811d57
...
v1.3.15-js
Author | SHA1 | Date | |
---|---|---|---|
990d257b09 | |||
dfbad69ab1 | |||
5f0c86ba19 | |||
3588b25e65 | |||
1f8b88b2b6 | |||
0050ea35d0 | |||
7e4c138d1b | |||
685568d4f6 | |||
14b4c035da | |||
90de2f415e | |||
3cc71cb69b | |||
fef7533d00 | |||
e93058cc6b | |||
e65387aa60 | |||
904fa0374b | |||
4bf1bbe81f | |||
3ccdcbae51 | |||
8c50e6cf59 | |||
7e69846169 | |||
34c55c576c | |||
7c2c4d4b80 | |||
f9f698fd15 | |||
b4457d8815 | |||
3621777827 | |||
003bd0bf77 | |||
721c5dd7a5 | |||
a24eb9fd8c | |||
24351b8342 | |||
4b3a39b0e6 | |||
a44b780d93 | |||
19dfae9b56 | |||
bef0d4fe12 | |||
72a2fc781c | |||
fc264689b1 | |||
fc587456d5 | |||
a2b933ab71 | |||
7d0fdf4d6d | |||
c2ce44c79b | |||
16a9556863 | |||
48896f97ec | |||
4486317cb2 | |||
6b9b88ea19 | |||
99a99d95a1 | |||
d4ddbbee21 | |||
34e5189945 | |||
c44c805238 | |||
196f1a730e | |||
7dc04c4422 | |||
5efac2619b | |||
9b0f741b9b | |||
81c5f8ee7e | |||
29e6a25e72 | |||
5abc057bda | |||
8aeb7ecfea | |||
4bb8e241b6 | |||
4469a23f9c | |||
d1f795e2db | |||
6865056f4b | |||
37bd5c90d3 | |||
fcba120dfa | |||
1d4f50fb9f | |||
a78040a037 | |||
9b175d7789 | |||
2d7f145a25 | |||
4589c4ca76 | |||
a32258a59e | |||
22f25e5251 | |||
258d883a51 | |||
504e242d42 | |||
731cdcbe09 | |||
b4e2d4c54a | |||
42961dea40 | |||
fd2f601f67 | |||
b45af505cd | |||
2dfe80b654 | |||
4b9dcc5e99 | |||
53639b55c9 | |||
3a83efbd3f | |||
c9d6a8d245 | |||
91db59b9f3 | |||
1d81e6b650 | |||
6d57b45d1a | |||
4e7ce2cd70 | |||
47fac31223 | |||
0d353cfbcf | |||
bdcb073bf8 | |||
226553a8ab | |||
d4ee56559b | |||
355b28ba40 | |||
edeff35d7e | |||
09d5de1b0b | |||
145fdab26e | |||
89d1ec5b21 | |||
f38c975dc6 | |||
fba007aa35 | |||
8b6adb3ea7 | |||
30603317c6 | |||
7083f3b4f8 | |||
7ff866525e | |||
2164037123 | |||
2e7d33c4c8 | |||
2a2751f6f3 | |||
2764ef4371 | |||
9783f343e1 | |||
8c6f0dfcc7 | |||
d688ad3d5c | |||
7b3f652b0e | |||
4cc42b2a65 | |||
d783fd7fb6 | |||
e0a0ff54e1 | |||
863d052a21 | |||
61b3d29e31 | |||
cac4f7249e | |||
3223c430be | |||
c09682ea33 | |||
fef1d43d5f | |||
705424727b | |||
b96f0896e3 | |||
a3967c76ac | |||
1197598a3d
|
|||
ec13e97226
|
|||
a8dd9d7e24
|
|||
82751eb1d4 | |||
17a4a69df2 | |||
a03261d04a | |||
7832ef5d8c | |||
9c213d0a97 | |||
18378afdc5 | |||
6dd8a8c6b3 | |||
adfb358e12 | |||
ff418b11a1 | |||
38e79f0354 | |||
103b3f3f9c | |||
ff6a6e0e45 | |||
afbce3b4ea | |||
823e59a582 | |||
01cfbddfb1 | |||
838efd3945 | |||
9a65cb4456 | |||
df0951d671 | |||
60cc752819 | |||
57b4716e2a | |||
15f28e9ffd | |||
a07893ddab | |||
d0eb1d12d8 | |||
cd59a39569 | |||
67c8b2f472 | |||
5158878ce2 | |||
b6971c1db5 | |||
9df46a1c49 | |||
6765b12f0c | |||
3e925756cf | |||
b2798b349e | |||
64dce44fe1 | |||
7e96b65c1b | |||
276d65a9d8 | |||
ba71728979 | |||
e82742a609 | |||
6773a7243a | |||
22c8997f1e | |||
9531a08b4a | |||
c065b57f0c | |||
cef05b7511 | |||
bb35e985ad | |||
981a2ea13a | |||
b14b296011 | |||
1ef9853876 | |||
01d8312aa8 | |||
507586f9dc | |||
12ffa71455 | |||
a84f495d43 | |||
7e4b5006eb | |||
0a28f0d82c | |||
5427844977 | |||
a45e552d90 | |||
be28570d23 | |||
1509e8619c | |||
a8df026a80 | |||
a803907449 | |||
afd31f1b27 | |||
f8fef38009 | |||
cbe1fd387d | |||
1620b73d01 | |||
4ebdcf56a0 | |||
99b9419150 | |||
4307fb96a6 | |||
c35390b6d6 | |||
fff6bd2b49 | |||
631ade1954 | |||
337bdd1bb0 | |||
978cc16304 | |||
bea8242d6f | |||
56daa84a14 | |||
17ddfd0ddd | |||
2ac8c4cfc6 | |||
0559ff64e2 | |||
385a7b7b00 | |||
503b7c64f9 | |||
beec9c2f9d | |||
5263b7de0f | |||
9b4d0494c8 | |||
0f2ee0349f | |||
e700a40875 | |||
1eba5338e4 | |||
f20be9ddcf | |||
7631c05e22 | |||
ad93e536f0 | |||
259da8200e | |||
8d528f0f55 | |||
66d0214720 | |||
86064979b4 | |||
86c996d7ac | |||
effe41bac9 | |||
4968942cc2 | |||
769626581f | |||
0e97ce7dc2 | |||
34334676fc | |||
853787cd4b | |||
a932ed5471 | |||
c338884fc7 | |||
ed6df98653 | |||
9eb458c4c5 | |||
202e83268b | |||
8f26bfee0f | |||
1af136e39d | |||
a550d55004 | |||
a37a22d3f9 | |||
a8941f4ef4 | |||
746565dbe0 | |||
79906df12e | |||
edf1d105e7 | |||
6c4b02cb56 | |||
04d5061d79 | |||
042e6dfa38 | |||
e523d3cc2c | |||
927197d0d1 | |||
72cb738af5 | |||
0fb38013f7 | |||
5f1376cf1e | |||
5db7b4224e | |||
7c7adc94e6 | |||
89c2d3a8ae | |||
c2b52aa91d | |||
329c770aa0 | |||
cdb045b72b | |||
6d43cf4c9f | |||
4caa0c0d83 | |||
4d2d38e45c | |||
9a55ce18e4 | |||
223c7a8f8d | |||
ce72d3d14d | |||
8b66c47e49 | |||
4ff3b0efdf | |||
1fd2269753 | |||
a8994423f4 | |||
4594c913e0 | |||
cf9033e898 | |||
b09ccfd4f5 | |||
6b4c486549 | |||
9c44656104 | |||
d57914957d | |||
c4f12ce75a | |||
4ad370ea46 | |||
44ad3caf2b | |||
427a272f8f | |||
96fb50e68d | |||
19274546c9 | |||
d2d730589b | |||
f88b0edb2a | |||
c62299aa72 | |||
c054668eac | |||
82352713f1 | |||
48073ab1f0 | |||
c6e98f50c2 | |||
ef88fdc9a4 | |||
8889aaca2a | |||
9b08420ac1 | |||
0ee92f0181 | |||
a995cae000 | |||
0b7d504a7a | |||
6a4a852fd6 | |||
81a9304438 | |||
332d689b8c | |||
b508c0517d | |||
d2c0fdf820 | |||
7293afd203 | |||
2fd1053bf9 | |||
e0a68a35f4 | |||
4e277b4ca6 | |||
b3f4a4086b | |||
eb7d77692b | |||
ce1b1859df | |||
371cc1a187 | |||
a94606ca89 | |||
5c9c9dc917 | |||
ab8acfc7d1 | |||
1ddd0074b3 | |||
2b934f6baf | |||
1bdae56342 | |||
6caaae6d50 | |||
4dc0c71d3f | |||
a54f4f94c9 | |||
b8d6c909eb | |||
e35fb9dc19 | |||
0e0363f131 | |||
088d7c8aa0 | |||
60084450e6 | |||
9775792916 | |||
93d6277386 | |||
37c5c7c4f6 | |||
5eb33f3e31 | |||
43f5f3ecae | |||
c503750e90 | |||
7054c18113 | |||
077eb803a1 | |||
f963b61ebc | |||
9ed51d60e4 | |||
f5198efab3 | |||
d6446f90fe | |||
58bceb5d27 | |||
92084bed99 | |||
cd1c92a7db | |||
9ca758ecd3 | |||
3c54d8de6d | |||
d91d4261d9 | |||
00f5216a9f | |||
aeae9002fe | |||
9df425f5f8 | |||
5149a67d4b | |||
1309c27f7c | |||
26db620465 | |||
bd213b8f8c | |||
31b7bd1314 | |||
0bdbd39632 | |||
b979fb5b2a | |||
cbefccd2d3 | |||
0ebe274e9a | |||
c4d09eb2ea | |||
3039fcc553 | |||
a67e587769 | |||
d89520d58e | |||
06a9eba177 | |||
a41dc5403f | |||
85b2c1f08e | |||
ba8dd7d083 | |||
fa04e32266 | |||
7d6b433373 | |||
faae8b8d9a | |||
a0d0de19c5 | |||
17eaa7858f | |||
f2556412d8 | |||
26557542f1 | |||
6bb46e165c | |||
027529161d | |||
61c847102d | |||
3034f49c96 | |||
528b74549a | |||
c7acc2a99b | |||
61afdfc325 | |||
c34944af8b | |||
58684cf3c4 | |||
08122cf703 | |||
fdd32cea92 | |||
7c17090a2b | |||
3de46ea099 | |||
f46ac4075a | |||
0668ab65be | |||
f66ae498ce | |||
e420f95eb0 | |||
809440ba95 | |||
c6ea94e249 | |||
4cee0e37da | |||
9c343f3eeb | |||
e79d6c6fef | |||
88013e82f0 | |||
079a6910dd | |||
bbf97dc58d | |||
810b603d70 | |||
8281303a55 | |||
a4afeeb396 | |||
bc3a801b8d | |||
f52dec9124 | |||
07942153c3 | |||
bac848f6be | |||
ccc1bf2a99 | |||
c8487a7541 | |||
dc90705f24 | |||
c4c503080e | |||
e2d9c5aa90 | |||
60f845aa8d | |||
fa0c31d9e4 | |||
57b82094c8 | |||
af337874a6 | |||
f016e9777e | |||
85bec3364f | |||
35d40e3b3c | |||
71a6b82d58 | |||
de75ef32d9 | |||
3bac92c711 | |||
2b5fca73a2 | |||
6d4c247de7 | |||
892fae92ad | |||
3938051c32 |
179
OnDemandUpdatePTU.pro
Normal file
179
OnDemandUpdatePTU.pro
Normal file
@@ -0,0 +1,179 @@
|
|||||||
|
QT += core gui
|
||||||
|
QT += widgets serialport network
|
||||||
|
|
||||||
|
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||||
|
|
||||||
|
TARGET = ATBUpdateTool
|
||||||
|
|
||||||
|
# The following define makes your compiler emit warnings if you use
|
||||||
|
# any Qt feature that has been marked deprecated (the exact warnings
|
||||||
|
# depend on your compiler). Please consult the documentation of the
|
||||||
|
# deprecated API in order to know how to port your code away from it.
|
||||||
|
DEFINES += QT_DEPRECATED_WARNINGS
|
||||||
|
|
||||||
|
# You can also make your code fail to compile if it uses deprecated APIs.
|
||||||
|
# In order to do so, uncomment the following line.
|
||||||
|
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||||
|
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||||
|
|
||||||
|
# 1.3.6 : Do not update device-controller/json files, but have the library
|
||||||
|
# (in a later step) do that.
|
||||||
|
# Fixed sending messages to ISMAS.
|
||||||
|
# Always execute contents of opkg_commands-file (even if there are no
|
||||||
|
# changes).
|
||||||
|
# 1.3.7 : Wait forever for git-commands to finish in QProcess executing such
|
||||||
|
# a command.
|
||||||
|
# 1.3.8 : Remove accessing opkg_commands under file-system-path /etc/psa_update.
|
||||||
|
# Activate download of json-configuration files.
|
||||||
|
# 1.3.9 : Fix sendLastVersion: use configured branch and not master branch in
|
||||||
|
# git show origin/master -s --format="c=%h m=%s d=%cI" ==>
|
||||||
|
# git show origin/zg1/zone1 -s --format="c=%h m=%s d=%cI"
|
||||||
|
# Use dynamic values for os-release and apism-version when sending
|
||||||
|
# last version info.
|
||||||
|
# 1.3.10: Fix premature killing opkg-commands: detected timeout of 100s was
|
||||||
|
# too small when updating apism.
|
||||||
|
# Fix display of UPDATE_SUCCESS when opkg_command fails. Detected when
|
||||||
|
# updating apsim failed.
|
||||||
|
# 1.3.11: Integrate version of ATBUpdateTool in SendLastVersion-ISMAS-message.
|
||||||
|
# 1.3.12: Add command parameters for output of yocto-infos about ATBUpdateTool.
|
||||||
|
# Use 'git pull' instead of 'git fetch'.
|
||||||
|
# Use 'git clone --filter=blob:none' instead of 'git clone' to speed
|
||||||
|
# up cloning of customer repository.
|
||||||
|
# 1.3.13: Fix: if the customer repository is corrupted, remove it and re-clone
|
||||||
|
# the repository (without checking the ISMAS-trigger (WAIT-)button.
|
||||||
|
# 1.3.14: Add additional check for sanity of customer repository using
|
||||||
|
# "git fsck".
|
||||||
|
# Stream-lined code of update process: massive refactoring.
|
||||||
|
# Added functionality: If WAIT button is not active, then an existing
|
||||||
|
# customer repository will be repaired, or a not existing repository
|
||||||
|
# will be cloned. The process stops then.
|
||||||
|
# However, if the WAIT button is active, the at least the commands in
|
||||||
|
# opkg_commands will be executed. Changed files in the customer
|
||||||
|
# repository will be worked on: tariff-files will be synced with the
|
||||||
|
# local filesystem, json-files will be downloaded to firmware.
|
||||||
|
# The device-controller firmware will be handled in a later version.
|
||||||
|
VERSION="1.3.15"
|
||||||
|
# Bug fixes found during testing.
|
||||||
|
# Don't disable Exit-button during update-process.
|
||||||
|
# Removed worker-thread with an own event-loop: only the GUI thread
|
||||||
|
# has an event loop. Tested JSON-downloads several times successfully
|
||||||
|
# (using the slave lib where the CA helper tool was active as master).
|
||||||
|
# Turned previous worker-object into its own thread, but without any
|
||||||
|
# own event-loop (so it cannot block anything inside the CA-plugin).
|
||||||
|
|
||||||
|
# PLANNED TODOS:
|
||||||
|
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||||
|
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
||||||
|
# geklont), aber zusaetzlich werden alle verfuegbaren Dateien als neu
|
||||||
|
# angesehen und die entsprechenden Aktionen durchgefuehrt: tariff-files
|
||||||
|
# spiegeln, json-files laden und dc laden. Also VORSICHT: das repository
|
||||||
|
# muss in diesem fall wirklich in ordnung sein.
|
||||||
|
# 3: Wurde keine Datei geaendert, kein initiales Clone und der WAIT-button
|
||||||
|
# nicht aktiv, so (passiert natuerlich nichts) kann man davon ausgehen,
|
||||||
|
# dass es sich um ein automatisches Update handelt. Dann koennte man im
|
||||||
|
# ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
|
||||||
|
# Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
|
||||||
|
# ausgefuehrt.
|
||||||
|
# 4: rsync: immer alle Dateien soiegeln (bis auf opkg-commands)
|
||||||
|
# 5: Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
|
||||||
|
# installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
|
||||||
|
# 6: rsync: explizites Binary, nicht das in busybox enthaltene.
|
||||||
|
# 7: Ein ini-File oder sowas.
|
||||||
|
|
||||||
|
win32 {
|
||||||
|
BUILD_DATE=$$system("date /t")
|
||||||
|
BUILD_TIME=$$system("time /t")
|
||||||
|
} else {
|
||||||
|
BUILD_DATE=$$system("date +%d-%m-%y")
|
||||||
|
BUILD_TIME=$$system("date +%H:%M:%S")
|
||||||
|
}
|
||||||
|
|
||||||
|
GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
|
||||||
|
|
||||||
|
EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
|
||||||
|
|
||||||
|
INCLUDEPATH += plugins
|
||||||
|
|
||||||
|
CONFIG += c++17
|
||||||
|
# CONFIG -= app_bundle
|
||||||
|
|
||||||
|
DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
|
||||||
|
DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
|
||||||
|
DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
|
||||||
|
DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
|
||||||
|
|
||||||
|
# keep comments, as /* fall through */
|
||||||
|
QMAKE_CXXFLAGS += -C
|
||||||
|
QMAKE_CXXFLAGS += -g
|
||||||
|
QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
||||||
|
|
||||||
|
contains( CONFIG, PTU5 ) {
|
||||||
|
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
||||||
|
CONFIG += link_pkgconfig
|
||||||
|
lessThan(QT_MAJOR_VERSION, 5): PKGCONFIG += qextserialport
|
||||||
|
QMAKE_CXXFLAGS += -O2 -std=c++17 # for GCC >= 4.7
|
||||||
|
# QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
||||||
|
ARCH = PTU5
|
||||||
|
DEFINES+=PTU5
|
||||||
|
}
|
||||||
|
contains( CONFIG, PTU5_YOCTO ) {
|
||||||
|
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
||||||
|
QMAKE_CXXFLAGS += -std=c++17 # for GCC >= 4.7
|
||||||
|
# QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
||||||
|
PTU5BASEPATH = /opt/devel/ptu5
|
||||||
|
ARCH = PTU5
|
||||||
|
DEFINES+=PTU5
|
||||||
|
|
||||||
|
# add qmqtt lib
|
||||||
|
#LIBS += -lQt5Qmqtt
|
||||||
|
}
|
||||||
|
contains( CONFIG, DesktopLinux ) {
|
||||||
|
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
||||||
|
lessThan(QT_MAJOR_VERSION, 5): CONFIG += extserialport
|
||||||
|
# QMAKE_CC = ccache $$QMAKE_CC
|
||||||
|
# QMAKE_CXX = ccache $$QMAKE_CXX
|
||||||
|
QMAKE_CXXFLAGS += -std=c++17
|
||||||
|
# QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
||||||
|
linux-clang { QMAKE_CXXFLAGS += -Qunused-arguments }
|
||||||
|
ARCH = DesktopLinux
|
||||||
|
DEFINES+=DesktopLinux
|
||||||
|
}
|
||||||
|
|
||||||
|
SOURCES += \
|
||||||
|
main.cpp \
|
||||||
|
progress_event.cpp \
|
||||||
|
update_dc_event.cpp \
|
||||||
|
mainwindow.cpp \
|
||||||
|
utils.cpp \
|
||||||
|
update.cpp \
|
||||||
|
git/git_client.cpp \
|
||||||
|
ismas/ismas_client.cpp \
|
||||||
|
process/command.cpp \
|
||||||
|
message_handler.cpp \
|
||||||
|
worker.cpp
|
||||||
|
|
||||||
|
HEADERS += \
|
||||||
|
update.h \
|
||||||
|
progress_event.h \
|
||||||
|
update_dc_event.h \
|
||||||
|
utils.h \
|
||||||
|
mainwindow.h \
|
||||||
|
git/git_client.h \
|
||||||
|
apism/ismas_data.h \
|
||||||
|
ismas/ismas_client.h \
|
||||||
|
process/command.h \
|
||||||
|
message_handler.h \
|
||||||
|
worker.h \
|
||||||
|
plugins/interfaces.h
|
||||||
|
|
||||||
|
FORMS += \
|
||||||
|
mainwindow.ui
|
||||||
|
|
||||||
|
|
||||||
|
##########################################################################################
|
||||||
|
# for running program on target through QtCreator
|
||||||
|
contains( CONFIG, PTU5 ) {
|
||||||
|
qnx: target.path = /tmp/$${TARGET}/bin
|
||||||
|
else: unix:!android: target.path = /opt/app/tools/atbupdate/
|
||||||
|
!isEmpty(target.path): INSTALLS += target
|
||||||
|
}
|
@@ -1,56 +0,0 @@
|
|||||||
# QT -= gui
|
|
||||||
QT += core
|
|
||||||
QT += widgets serialport
|
|
||||||
QT += network
|
|
||||||
|
|
||||||
TARGET = up_dev_ctrl
|
|
||||||
|
|
||||||
CONFIG += c++11
|
|
||||||
# CONFIG -= app_bundle
|
|
||||||
|
|
||||||
# DEFINES+=LinuxDesktop
|
|
||||||
|
|
||||||
QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
|
||||||
|
|
||||||
# You can make your code fail to compile if it uses deprecated APIs.
|
|
||||||
# In order to do so, uncomment the following line.
|
|
||||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
|
||||||
|
|
||||||
contains( CONFIG, PTU5 ) {
|
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
|
||||||
CONFIG += link_pkgconfig
|
|
||||||
lessThan(QT_MAJOR_VERSION, 5): PKGCONFIG += qextserialport
|
|
||||||
QMAKE_CXXFLAGS += -std=c++11 # for GCC >= 4.7
|
|
||||||
QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
|
||||||
ARCH = PTU5
|
|
||||||
DEFINES+=PTU5
|
|
||||||
}
|
|
||||||
contains( CONFIG, DesktopLinux ) {
|
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
|
||||||
lessThan(QT_MAJOR_VERSION, 5): CONFIG += extserialport
|
|
||||||
# QMAKE_CC = ccache $$QMAKE_CC
|
|
||||||
# QMAKE_CXX = ccache $$QMAKE_CXX
|
|
||||||
QMAKE_CXXFLAGS += -std=c++11
|
|
||||||
QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
|
||||||
linux-clang { QMAKE_CXXFLAGS += -Qunused-arguments }
|
|
||||||
ARCH = DesktopLinux
|
|
||||||
DEFINES+=DesktopLinux
|
|
||||||
}
|
|
||||||
|
|
||||||
SOURCES += \
|
|
||||||
main.cpp \
|
|
||||||
message_handler.cpp
|
|
||||||
|
|
||||||
HEADERS += \
|
|
||||||
message_handler.h \
|
|
||||||
DCPlugin/include/interfaces.h
|
|
||||||
|
|
||||||
# https://blog.developer.atlassian.com/the-power-of-git-subtree/?_ga=2-71978451-1385799339-1568044055-1068396449-1567112770
|
|
||||||
# git subtree add --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash
|
|
||||||
# git subtree pull --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash
|
|
||||||
include(./DCPlugin/DCPlugin.pri)
|
|
||||||
|
|
||||||
# Default rules for deployment.
|
|
||||||
qnx: target.path = /tmp/$${TARGET}/bin
|
|
||||||
else: unix:!android: target.path = /opt/$${TARGET}/bin
|
|
||||||
!isEmpty(target.path): INSTALLS += target
|
|
126
allgemein.txt
Normal file
126
allgemein.txt
Normal file
@@ -0,0 +1,126 @@
|
|||||||
|
0:
|
||||||
|
Zunaechst wir immer nachgesehen, ob das Repository bereits geklont wurde.
|
||||||
|
Wenn nein, dann wird geklont. Im Master-Branch befinden sich Dateinen, die
|
||||||
|
in allen anderen Branches gemeinsam genutzt werden. Das sollte wohl auf
|
||||||
|
jeden Fall fuer den DeviceController gelten.
|
||||||
|
1:
|
||||||
|
Anfrage bei ISMAS ob neue Daten da sind. Hier faengt die ganze Sache an.
|
||||||
|
Da man nicht weiss, on ISMAS ueberhaupt antworten wird braucht es einen
|
||||||
|
Timer. Man kann die Sache dann auch gleich mehrfach versuchen.
|
||||||
|
|
||||||
|
Die Anfrage geht also per Signal an den Apism-Client. Im Signal wird der
|
||||||
|
Zustand mitgegeben:
|
||||||
|
|
||||||
|
ISMAS_UPDATE_REQUEST_PENDING
|
||||||
|
|
||||||
|
und im Slot dann entsprechend uebernommen. Der Timer sollte nicht im Worker
|
||||||
|
stehen, sondern im Apism-Client. Der Worker sollte damit nicht belastet
|
||||||
|
sein. Der wird dann vom Apism-Client entsprechend benachrichtigt.
|
||||||
|
|
||||||
|
ISMAS_UPDATE_REQUEST_FAILURE
|
||||||
|
ISMAS_UPDATE_REQUEST_TIMEOUT
|
||||||
|
ISMAS_UPDATE_REQUEST_SUCCESS
|
||||||
|
|
||||||
|
Im 1./2.Fall wird dann ein Fehlerhandling durchgefuehrt. Insbesondere
|
||||||
|
wird Apism ueber den DB-Kanal darueber informiert (U0003). Am Ende wie
|
||||||
|
dann wie immer SendCmdVersion und beenden der Applikation.
|
||||||
|
|
||||||
|
Im Erfolgsfall muss in der Antwort der Branch enthalten sein, fuer den das
|
||||||
|
Update durchgefuhrt werden soll. Das ist auch bereits so (Location).
|
||||||
|
|
||||||
|
Ein Sonderfall waere der -m-Modus, da hier niemand auf der ISMAS-Seite
|
||||||
|
aktiv eingreift. Hier braucht es dann einen Ubergabeparameter an
|
||||||
|
ATBUpdateTool: --branch-name
|
||||||
|
|
||||||
|
Normalfall ist aber die Aktivierung via ISMAS. Dann muss der in der Antwort
|
||||||
|
enthaltene Branch zunaechst ausgecheckt werden.
|
||||||
|
2:
|
||||||
|
Dazu wird ein entsprechendes Signal an den GitClient gesandet.
|
||||||
|
|
||||||
|
GIT_CHECKOUT_BRANCH_REQUEST
|
||||||
|
|
||||||
|
Der GitClient sieht jetzt erstmal nach, ob es diesen Branch ueberhaupt
|
||||||
|
gibt.
|
||||||
|
|
||||||
|
Falls nein:
|
||||||
|
|
||||||
|
GIT_CHECKOUT_BRANCH_REQUEST_FAILURE
|
||||||
|
BRANCH_NOT_EXIST
|
||||||
|
|
||||||
|
Falls ja:
|
||||||
|
der GitClient versucht nun den Branch auszuchecken.
|
||||||
|
Geht das gut?
|
||||||
|
Falls nein:
|
||||||
|
|
||||||
|
GIT_CHECKOUT_BRANCH_REQUEST_FAILURE
|
||||||
|
BRANCH_CHECKOUT_ERROR
|
||||||
|
|
||||||
|
Falls ja:
|
||||||
|
GIT_CHECKOUT_BRANCH_REQUEST_SUCCESS
|
||||||
|
-> eventl. koennte man den Namen des Branches mitgeben
|
||||||
|
|
||||||
|
|
||||||
|
Signal an den Worker. Im entsprechenden Slot wird jetzt der eigentliche
|
||||||
|
UpdateProzess angeworfen.
|
||||||
|
3:
|
||||||
|
Mittels git fetch werden jetzt die Aenderungen ermittelt.
|
||||||
|
|
||||||
|
GIT_FETCH_UPDATES_REQUEST
|
||||||
|
|
||||||
|
GIT_FETCH_UPDATES_REQUEST_FAILURE
|
||||||
|
-> Worker informieren damit Fehlerbehandlung aktiviert wird
|
||||||
|
GIT_FETCH_UPDATES_REQUEST_SUCCESS
|
||||||
|
|
||||||
|
GIT_DIFF_UPDATES
|
||||||
|
|
||||||
|
Die Liste der geaenderten Dateien geht an den Worker. Der kann jetzt
|
||||||
|
noch Test machen, ob das Sinn macht. Evtl. eine Statusmeldung ausgeben
|
||||||
|
drueber was gleich passieren wird.
|
||||||
|
4:
|
||||||
|
Mittels git merge/pull werden nun die Dateien tatsaechlich im Branch
|
||||||
|
aktualisiert.
|
||||||
|
|
||||||
|
GIT_PULL_UPDATES_REQUEST
|
||||||
|
GIT_PULL_UPDATES_REQUEST_FAILURE
|
||||||
|
-> Worker informieren damit Fehlerbehandlung aktiviert wird
|
||||||
|
GIT_PULL_UPDATES_REQUEST_SUCCESS
|
||||||
|
-> Worker informieren
|
||||||
|
|
||||||
|
Sind die Daten vorhanden, dann werden sie mittels rsync ins Dateisystem
|
||||||
|
kopiert.
|
||||||
|
|
||||||
|
RSYNC_UPDATES
|
||||||
|
RSYNC_UPDATES_FAILURE
|
||||||
|
RSYNC_UPDATES_SUCCESS
|
||||||
|
|
||||||
|
Fuer jede kopierte Datei geht eine Nachricht raus ans ISMAS.
|
||||||
|
5:
|
||||||
|
Sind die Daten dann kopiert, so werden sie auf den DC kopiert (falls
|
||||||
|
notwendig): hier gehen dann wieder Nachrichten an ISMAS raus:
|
||||||
|
|
||||||
|
DC_UPDATE
|
||||||
|
DC_UPDATE_FAILURE
|
||||||
|
DC_UPDATE_SUCCESS
|
||||||
|
|
||||||
|
JSON_UPDATE
|
||||||
|
JSON_UPDATE_FAILURE
|
||||||
|
JSON_UPDATE_SUCCESS
|
||||||
|
|
||||||
|
Hier fuer jedes Json-File.
|
||||||
|
|
||||||
|
Schliesslich noch eine Zusammenfasung an ISMAS:
|
||||||
|
|
||||||
|
ISMAS_UPDATE_INFO_CONFIRM
|
||||||
|
ISMAS_UPDATE_INFO_CONFIRM_FAILURE
|
||||||
|
-> Worker informieren damit Fehlerbehandlung aktiviert wird
|
||||||
|
ISMAS_UPDATE_INFO_CONFIRM_SUCCESS
|
||||||
|
|
||||||
|
und schliesslich der abschliessende Status an ISMAS zurueckgemeldet:
|
||||||
|
|
||||||
|
ISMAS_CURRENT_PSA_STATUS_CONFIRM
|
||||||
|
ISMAS_CURRENT_PSA_STATUS_CONFIRM_FAILURE
|
||||||
|
ISMAS_CURRENT_PSA_STATUS_CONFIRM_SUCCESS
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
137
apism/ismas_data.h
Normal file
137
apism/ismas_data.h
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
#ifndef ISMASDATA_H
|
||||||
|
#define ISMASDATA_H
|
||||||
|
|
||||||
|
#include <QJsonObject>
|
||||||
|
#include <QJsonArray>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
namespace ISMAS {
|
||||||
|
|
||||||
|
struct TransferData : public QJsonObject {
|
||||||
|
struct : public QJsonObject {
|
||||||
|
QJsonValue tariffId;
|
||||||
|
QJsonValue group;
|
||||||
|
QJsonValue zone;
|
||||||
|
} device;
|
||||||
|
|
||||||
|
struct : public QJsonObject {
|
||||||
|
QJsonValue state;
|
||||||
|
QJsonValue uid;
|
||||||
|
QJsonValue seq_tick_number;
|
||||||
|
QJsonValue timestamp;
|
||||||
|
QJsonValue userText;
|
||||||
|
QJsonValue userTextType;
|
||||||
|
} transaction;
|
||||||
|
|
||||||
|
struct : public QJsonObject {
|
||||||
|
// TODO: check what is really used at the moment
|
||||||
|
QJsonValue id; // unique article id
|
||||||
|
QJsonValue name; // name
|
||||||
|
QJsonValue price; // price in cent
|
||||||
|
QJsonValue currency; //
|
||||||
|
QJsonValue startTime; // start time
|
||||||
|
QJsonValue endTime; // end time
|
||||||
|
QJsonValue userText; // additional info
|
||||||
|
QJsonValue parkingTime;
|
||||||
|
QJsonValue printText;
|
||||||
|
// QJsonValue discount;
|
||||||
|
} item;
|
||||||
|
|
||||||
|
struct : public QJsonObject {
|
||||||
|
struct : public QJsonObject {
|
||||||
|
QJsonValue coins; // total amount of coins value
|
||||||
|
// QJsonValue notes; // total amount of notes value
|
||||||
|
QJsonValue overpaid; // in cent
|
||||||
|
QJsonValue currency;
|
||||||
|
QJsonValue change;
|
||||||
|
} cash;
|
||||||
|
|
||||||
|
struct : public QJsonObject {
|
||||||
|
QJsonValue cardNumber;
|
||||||
|
QJsonValue value; // buchungsbetrag
|
||||||
|
QJsonValue cardType;
|
||||||
|
QJsonValue currency;
|
||||||
|
QJsonValue tid;
|
||||||
|
QJsonValue tresult;
|
||||||
|
} card;
|
||||||
|
|
||||||
|
struct : public QJsonObject {
|
||||||
|
QJsonValue cardNumber;
|
||||||
|
QJsonValue cardType;
|
||||||
|
QJsonValue value;
|
||||||
|
QJsonValue valueOld;
|
||||||
|
QJsonValue valueNew;
|
||||||
|
QJsonValue time;
|
||||||
|
QJsonValue timeOld;
|
||||||
|
QJsonValue timeNew;
|
||||||
|
} prePaidCard;
|
||||||
|
} payment;
|
||||||
|
|
||||||
|
struct : public QJsonObject {
|
||||||
|
QJsonValue delivery; // PRINT, OnlineTicket
|
||||||
|
QJsonValue result; // SUCCESS, ERROR
|
||||||
|
QJsonValue errorCode; // 0=OK, 1=...
|
||||||
|
QJsonValue errorMsg;
|
||||||
|
} result;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
struct AccountData : public QJsonObject {
|
||||||
|
struct : public QJsonObject {
|
||||||
|
QJsonValue UID;
|
||||||
|
QJsonValue ChangeNumber;
|
||||||
|
QJsonValue Process; // Vorgang
|
||||||
|
QJsonValue startDateTime;
|
||||||
|
QJsonValue endDateTime;
|
||||||
|
QJsonValue startHash;
|
||||||
|
QJsonValue endHash;
|
||||||
|
|
||||||
|
struct : public QJsonObject {
|
||||||
|
QJsonValue value; // coin value
|
||||||
|
QJsonValue numberOfCoins; // number of coins
|
||||||
|
QJsonValue currency;
|
||||||
|
} coin;
|
||||||
|
|
||||||
|
} coinBox; // Münzkasse
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
struct EventData : public QJsonObject {
|
||||||
|
struct : public QJsonObject {
|
||||||
|
QJsonValue eventID;
|
||||||
|
QJsonValue deviceName;
|
||||||
|
QJsonValue reason;
|
||||||
|
QJsonValue event;
|
||||||
|
QJsonValue eventState;
|
||||||
|
QJsonValue timeStamp;
|
||||||
|
QJsonValue parameter;
|
||||||
|
QJsonValue secondLevelInfo;
|
||||||
|
} machineEvent; //
|
||||||
|
};
|
||||||
|
|
||||||
|
struct StateData : public QJsonObject {
|
||||||
|
QJsonValue Timestamp;
|
||||||
|
QJsonArray HW_States;
|
||||||
|
struct : public QJsonObject {
|
||||||
|
QJsonValue name;
|
||||||
|
QJsonValue value;
|
||||||
|
QJsonValue unit;
|
||||||
|
} machineState; //
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
enum class REQUEST : quint8 {
|
||||||
|
NO_REQUEST,
|
||||||
|
START,
|
||||||
|
STOP,
|
||||||
|
PING,
|
||||||
|
SELF,
|
||||||
|
ISMAS_PARAMETER
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#endif // ISMASDATA_H
|
BIN
doc/update_ptu.pdf
Normal file
BIN
doc/update_ptu.pdf
Normal file
Binary file not shown.
172
doc/update_ptu.tex
Normal file
172
doc/update_ptu.tex
Normal file
@@ -0,0 +1,172 @@
|
|||||||
|
\documentclass[12pt]{article}
|
||||||
|
\usepackage{euler}
|
||||||
|
\usepackage[english]{babel}
|
||||||
|
\usepackage{lipsum}
|
||||||
|
\usepackage{multirow}
|
||||||
|
\usepackage[colorlinks=true, urlcolor=blue, linkcolor=red]{hyperref}
|
||||||
|
\newcounter{Chapcounter}
|
||||||
|
\newcommand\showmycounter{\addtocounter{Chapcounter}{1}\themycounter}
|
||||||
|
\newcommand{\chapter}[1]
|
||||||
|
{{\centering
|
||||||
|
\addtocounter{Chapcounter}{1} \Large \underline{\textbf{ \color{blue} Chapter \theChapcounter: ~#1}} }
|
||||||
|
\addcontentsline{toc}{section}{ \color{blue} Chapter:~\theChapcounter~~ #1}
|
||||||
|
}
|
||||||
|
\hypersetup{colorlinks=true}
|
||||||
|
\hypersetup{linkcolor=black}
|
||||||
|
|
||||||
|
\title{Update PTU}
|
||||||
|
\author{Gerhard Hoffmann}
|
||||||
|
\date{\today}
|
||||||
|
|
||||||
|
\begin{document}
|
||||||
|
\maketitle
|
||||||
|
% \chapter{Introduction}
|
||||||
|
\section{Motivation}
|
||||||
|
|
||||||
|
The two main components of a PSA are
|
||||||
|
\begin{itemize}
|
||||||
|
\item PTU software.
|
||||||
|
\item Device controller (DC) firmware.
|
||||||
|
\end{itemize}
|
||||||
|
|
||||||
|
While the DC firmware is basically the same for each PSA (even for different
|
||||||
|
customers), the PTU software is highly dependent on customer requirements.\par
|
||||||
|
Hence, each customer is assigned an own git-repository, which will be loaded
|
||||||
|
("cloned") on the PSA when configuring the machine for the first time.\par
|
||||||
|
Two special tools, the {\bf UpdateController} (a \href{https://doc.qt.io/qt-5/}{Qt}
|
||||||
|
binary [{\bf \nameref{UpdateTool}}]) and the {\bf UpdateScript}
|
||||||
|
(a \href{https://www.gnu.org/software/bash/manual/bash.html}{bash}
|
||||||
|
script [{\bf \nameref{UpdateScript}}]), work together to finish a PSA installation.\par
|
||||||
|
|
||||||
|
\section{PSA: Initial configuration}
|
||||||
|
|
||||||
|
For the initial configuration, a PSA loads a customer-specific git-repository,
|
||||||
|
which structure is detailed below [{\bf \nameref{repostructure}}].\par
|
||||||
|
The "git clone" for the repository is done by the UpdateScript [{\bf \nameref{UpdateScript}}].
|
||||||
|
It updates the file
|
||||||
|
\begin{center}
|
||||||
|
\fbox{
|
||||||
|
/opt/app/tools/atbupdate/update\_log.csv
|
||||||
|
}
|
||||||
|
\end{center}
|
||||||
|
which will be interpreted by the UpdateController [{\bf \nameref{UpdateTool}}].
|
||||||
|
The structure of [{\bf \nameref{updatelogcsv}}] is detailed below.\par
|
||||||
|
Each line of update\_log.csv represents a command for the UpdateController,
|
||||||
|
which will either download certain files to the DC or execute some
|
||||||
|
\href{https://openwrt.org/docs/guide-user/additional-software/opkg}{opkg}
|
||||||
|
commands [{\bf \nameref{opkg}}].
|
||||||
|
|
||||||
|
\section{PSA: Update}
|
||||||
|
|
||||||
|
The update of a PSA is basically managed by \href{https://git-scm.com/}{git}, a
|
||||||
|
free and open source distributed version control system. Like many other Version
|
||||||
|
Control Systems, git has a way to fire off custom scripts when certain important
|
||||||
|
actions occur, so-called \href{https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks}{hooks}.
|
||||||
|
The hooks used for a PSA update are called {\bf post-checkout} and {\bf post-merge}.\par
|
||||||
|
The post-checkout hook is called when checking out some branch of the customer-repository
|
||||||
|
(for instance when cloning the customer repository for the first time). In contrast,
|
||||||
|
the post-merge hook is called when a \href{https://www.git-scm.com/docs/git-pull}{git pull}
|
||||||
|
operation has been issued (more precisely, a \href {https://www.git-scm.com/docs/git-fetch}{git-fetch}
|
||||||
|
followed by a \href{https://www.git-scm.com/docs/git-merge}{git-merge}).\par
|
||||||
|
Both hooks update the file [{\bf \nameref{updatelogcsv}}], which is interpreted
|
||||||
|
by the UpdateController in a second step.
|
||||||
|
|
||||||
|
% \chapter{Update-Tool "up\_dev\_ctrl"}
|
||||||
|
\section{up\_dev\_ctrl}
|
||||||
|
\label{UpdateTool}
|
||||||
|
|
||||||
|
The update-tool is a Qt binary ("up\_dev\_ctrl") and called by the
|
||||||
|
system-controller application. It is installed under
|
||||||
|
\begin{center}
|
||||||
|
\fbox{
|
||||||
|
/opt/app/tools/atbupdate/up\_dev\_ctrl
|
||||||
|
}
|
||||||
|
\end{center}
|
||||||
|
|
||||||
|
and has two responsibilities:
|
||||||
|
\begin{itemize}
|
||||||
|
\item Call update-script "update\_psa".
|
||||||
|
\item Update the device controller firmware.
|
||||||
|
\end{itemize}
|
||||||
|
\subsection{Calling the update-script "update\_psa"}
|
||||||
|
The update-script "update\_psa" is about executing all git-commands
|
||||||
|
necessary to clone and pull a customer repository.
|
||||||
|
|
||||||
|
\newpage
|
||||||
|
|
||||||
|
% \chapter{Update-Script "update\_psa"}
|
||||||
|
\section{update\_psa}
|
||||||
|
\label{UpdateScript}
|
||||||
|
|
||||||
|
Inside of such a
|
||||||
|
repository, there are at least the following directories:
|
||||||
|
\begin{itemize}
|
||||||
|
\item {\bf etc}
|
||||||
|
\item {\bf etc/dc}\newline
|
||||||
|
Contains the device controller firmware as binary file.
|
||||||
|
\item {\bf etc/psa\_config}\newline
|
||||||
|
Contains the printer template files (JSON).
|
||||||
|
\item {\bf etc/psa\_tariff}\newline
|
||||||
|
Contains the tariff files (JSON).
|
||||||
|
\item {\bf etc/psa\_update}\newline
|
||||||
|
Contains a single file for opkg-commands.
|
||||||
|
\end{itemize}
|
||||||
|
\newpage
|
||||||
|
|
||||||
|
%\chapter{Annex}
|
||||||
|
\section{Structure of a customer git-repository}
|
||||||
|
\label{repostructure}
|
||||||
|
\subsection{The post-checkout hook}
|
||||||
|
TODO: checkout\_history
|
||||||
|
\subsection{The post-merge hook}
|
||||||
|
They are both located under the {\bf .githooks}-directory
|
||||||
|
|
||||||
|
\section{update\_log.csv}
|
||||||
|
\label{updatelogcsv}
|
||||||
|
\begin{table}[h!]
|
||||||
|
\begin{center}
|
||||||
|
\caption{Initial state of update\_log.csv}
|
||||||
|
\label{tab:initial_state}
|
||||||
|
\begin{tabular}{llll}
|
||||||
|
\textbf{Request} & \textbf{Name} & \textbf{Date} & \textbf{Status}\\
|
||||||
|
\hline
|
||||||
|
\multicolumn{4}{c}{}\\
|
||||||
|
DOWNLOAD & /etc/dc/dc2c4.21.bin & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
DOWNLOAD & /etc/psa\_config/DC2C\_print01.json & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
DOWNLOAD & /etc/psa\_config/DC2C\_print02.json & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
DOWNLOAD & /etc/psa\_config/DC2C\_print03.json & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
DOWNLOAD & /etc/psa\_config/DC2C\_print04.json & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
DOWNLOAD & /etc/psa\_config/DC2C\_print29.json & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
DOWNLOAD & /etc/psa\_config/DC2C\_print32.json & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
EXECUTE & opkg update & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
\end{tabular}
|
||||||
|
\end{center}
|
||||||
|
\end{table}
|
||||||
|
|
||||||
|
\begin{table}[h!]
|
||||||
|
\begin{center}
|
||||||
|
\caption{State of update\_log.csv after updating}
|
||||||
|
\label{tab:initial_state}
|
||||||
|
\begin{tabular}{llll}
|
||||||
|
\textbf{Request} & \textbf{Name} & \textbf{Date} & \textbf{Status}\\
|
||||||
|
\hline
|
||||||
|
\multicolumn{4}{c}{}\\
|
||||||
|
DONE & /etc/dc/dc2c4.21.bin & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
DONE & /etc/psa\_config/DC2C\_print01.json & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
DONE & /etc/psa\_config/DC2C\_print02.json & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
DONE & /etc/psa\_config/DC2C\_print03.json & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
DONE & /etc/psa\_config/DC2C\_print04.json & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
DONE & /etc/psa\_config/DC2C\_print29.json & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
DONE & /etc/psa\_config/DC2C\_print32.json & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
DONE & opkg update & 2023-05-01T12:00:00 & N/A\\
|
||||||
|
\end{tabular}
|
||||||
|
\end{center}
|
||||||
|
\end{table}
|
||||||
|
|
||||||
|
\newpage
|
||||||
|
|
||||||
|
\section{The package manager "opkg"}
|
||||||
|
\label{opkg}
|
||||||
|
|
||||||
|
\section{Known problems}
|
||||||
|
\end{document}
|
434
git/git_client.cpp
Normal file
434
git/git_client.cpp
Normal file
@@ -0,0 +1,434 @@
|
|||||||
|
#include "git_client.h"
|
||||||
|
#include "update.h"
|
||||||
|
#include "worker.h"
|
||||||
|
#include "utils.h"
|
||||||
|
|
||||||
|
#include <QRegularExpression>
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QDir>
|
||||||
|
|
||||||
|
|
||||||
|
GitClient::GitClient(QString const &customerNrStr,
|
||||||
|
QString const &customerRepository,
|
||||||
|
QString const &workingDirectory,
|
||||||
|
QString const &branchName,
|
||||||
|
QObject *parent)
|
||||||
|
: QObject(parent)
|
||||||
|
, m_worker(qobject_cast<Worker *>(parent))
|
||||||
|
, m_repositoryPath(QString("https://git.mimbach49.de/GerhardHoffmann/%1.git").arg(customerNrStr))
|
||||||
|
, m_customerNr(customerNrStr)
|
||||||
|
, m_workingDirectory(workingDirectory)
|
||||||
|
, m_branchName(branchName)
|
||||||
|
, m_customerRepository(customerRepository) {
|
||||||
|
if (!m_worker) {
|
||||||
|
qCritical() << "ERROR CASTING PARENT TO WORKER FAILED";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GitClient::gitCloneCustomerRepository() {
|
||||||
|
/* Blobless clone
|
||||||
|
==============
|
||||||
|
|
||||||
|
When using the --filter=blob:none option, the initial git clone will
|
||||||
|
download all reachable commits and trees, and only download the blobs
|
||||||
|
for commits when you do a git checkout. This includes the first checkout
|
||||||
|
inside the git clone operation.
|
||||||
|
|
||||||
|
The important thing to notice is that we have a copy of every blob at
|
||||||
|
HEAD but the blobs in the history are not present. If your repository
|
||||||
|
has a deep history full of large blobs, then this option can
|
||||||
|
significantly reduce your git clone times. The commit and tree data is
|
||||||
|
still present, so any subsequent git checkout only needs to download
|
||||||
|
the missing blobs. The Git client knows how to batch these requests to
|
||||||
|
ask the server only for the missing blobs.
|
||||||
|
|
||||||
|
Further, when running git fetch in a blobless clone, the server only
|
||||||
|
sends the new commits and trees. The new blobs are downloaded only
|
||||||
|
after a git checkout. Note that git pull runs git fetch and then git
|
||||||
|
merge, so it will download the necessary blobs during the git merge
|
||||||
|
command.
|
||||||
|
|
||||||
|
When using a blobless clone, you will trigger a blob download whenever
|
||||||
|
you need the contents of a file, but you will not need one if you only
|
||||||
|
need the OID (object-id) of a file. This means that git log can detect
|
||||||
|
which commits changed a given path without needing to download extra
|
||||||
|
data.
|
||||||
|
|
||||||
|
This means that blobless clones can perform commands like git
|
||||||
|
merge-base, git log, or even git log -- <path> with the same performance
|
||||||
|
as a full clone.
|
||||||
|
|
||||||
|
Commands like git diff or git blame <path> require the contents of the
|
||||||
|
paths to compute diffs, so these will trigger blob downloads the first
|
||||||
|
time they are run. However, the good news is that after that you will
|
||||||
|
have those blobs in your repository and do not need to download them a
|
||||||
|
second time. Most developers only need to run git blame on a small
|
||||||
|
number of files, so this tradeoff of a slightly slower git blame command
|
||||||
|
is worth the faster clone and fetch times.
|
||||||
|
|
||||||
|
Note: git v2.18 does not support treeless clones: --filter=tree:0.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Note: for some reason it is necessary to pass "--progress ---v",
|
||||||
|
// otherwise QProcess returns an error of 128 = 0x80 for the command.
|
||||||
|
|
||||||
|
QString gitCommand("git clone --progress -vvv --filter=blob:none ");
|
||||||
|
gitCommand += m_repositoryPath;
|
||||||
|
Command c(gitCommand);
|
||||||
|
|
||||||
|
qInfo() << "IN CURRENT WD" << m_workingDirectory
|
||||||
|
<< "CLONE VIA COMMAND" << gitCommand;
|
||||||
|
|
||||||
|
if (c.execute(m_workingDirectory)) { // execute the command in wd
|
||||||
|
QString const result = c.getCommandResult();
|
||||||
|
if (!result.isEmpty()) {
|
||||||
|
// Cloning into 'customer_281'...\n
|
||||||
|
int customer = -1;
|
||||||
|
int cloning = result.indexOf("Cloning", 0, Qt::CaseInsensitive);
|
||||||
|
if (cloning != -1) {
|
||||||
|
customer = result.indexOf("customer_", cloning, Qt::CaseInsensitive);
|
||||||
|
if (customer != -1) {
|
||||||
|
QString customerNr = result.mid(customer);
|
||||||
|
static constexpr char const ch = '\'';
|
||||||
|
int i = customerNr.indexOf(QChar(ch));
|
||||||
|
if (i != -1) {
|
||||||
|
if ((customerNr = customerNr.mid(0, i)) == m_customerNr) {
|
||||||
|
qInfo() << "CLONING" << m_repositoryPath << "OK";
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
Utils::printCriticalErrorMsg(
|
||||||
|
QString("ERROR CLONE RESULT HAS WRONG CUSTOMER-NR. (%1 != %2) CLONE_RESULT=%3")
|
||||||
|
.arg(customerNr)
|
||||||
|
.arg(m_customerNr)
|
||||||
|
.arg(result));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Utils::printCriticalErrorMsg(
|
||||||
|
QString("ERROR CLONE RESULT HAS WRONG FORMAT. CLONING=%1 CUSTOMER=%2 CLONE_RESULT=%3")
|
||||||
|
.arg(cloning)
|
||||||
|
.arg(customer)
|
||||||
|
.arg(result));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Utils::printCriticalErrorMsg("ERROR CLONE RESULT IS EMPTY");
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GitClient::copyGitConfigFromMaster() { // only allowed when called in
|
||||||
|
// master branch (???)
|
||||||
|
if (QDir(m_customerRepository).exists()) {
|
||||||
|
QString const cp = QString("cp .gitconfig .git/config");
|
||||||
|
Command c("bash");
|
||||||
|
if (c.execute(m_customerRepository, QStringList() << "-c" << cp)) {
|
||||||
|
qInfo() << "cp .gitconfig .git/config OK";
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
qCritical() << "ERROR cp .gitconfig .git/config";
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
QStringList GitClient::gitBranchNames() {
|
||||||
|
// git config --global pager.branch false
|
||||||
|
QStringList bNames;
|
||||||
|
if (QDir(m_customerRepository).exists()) {
|
||||||
|
QString gitCommand("git branch -a");
|
||||||
|
Command c(gitCommand);
|
||||||
|
if (c.execute(m_customerRepository)) {
|
||||||
|
QString const result = c.getCommandResult();
|
||||||
|
return result.split('\n');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return bNames;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GitClient::gitCheckoutBranch() {
|
||||||
|
// TODO: nachsehen, ob der Branch ueberhaupt existiert
|
||||||
|
|
||||||
|
if (QDir(m_customerRepository).exists()) {
|
||||||
|
int zoneNr = Utils::read1stLineOfFile("/mnt/system_data/zone_nr");
|
||||||
|
m_branchName = (zoneNr != 0)
|
||||||
|
? QString("zg1/zone%1").arg(zoneNr) : "master";
|
||||||
|
|
||||||
|
QString gitCommand("git checkout ");
|
||||||
|
gitCommand += m_branchName;
|
||||||
|
|
||||||
|
Command c(gitCommand);
|
||||||
|
return c.execute(m_customerRepository); // execute command in customerRepo
|
||||||
|
}
|
||||||
|
Utils::printCriticalErrorMsg(QString("ERROR ") + m_customerRepository + " DOES NOT EXIST");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GitClient::gitCloneAndCheckoutBranch() {
|
||||||
|
qInfo() << "CLONE" << m_repositoryPath << "AND CHECKOUT" << m_branchName;
|
||||||
|
if (gitCloneCustomerRepository()) {
|
||||||
|
//if (copyGitConfigFromMaster()) {
|
||||||
|
if (gitCheckoutBranch()) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
// TODO
|
||||||
|
}
|
||||||
|
//}
|
||||||
|
}
|
||||||
|
Utils::printCriticalErrorMsg(QString("CLONE ") + m_repositoryPath + " AND CHECKOUT FAILED");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
QStringList GitClient::gitShowReason(QString branchName) {
|
||||||
|
QStringList lst;
|
||||||
|
if (QDir(m_customerRepository).exists()) {
|
||||||
|
// %h: commit (short form)
|
||||||
|
// %s: commit message
|
||||||
|
// %cI: commit date, strict ISO 8601 format
|
||||||
|
// Note: branch with branchName has to exist: format zg1/zone1
|
||||||
|
Command c(QString("git show origin/%1 -s --format=\"c=%h m=%s d=%cI\"").arg(branchName));
|
||||||
|
if (c.execute(m_customerRepository)) {
|
||||||
|
QString const s = c.getCommandResult().trimmed();
|
||||||
|
int const c = s.indexOf("c=");
|
||||||
|
int const m = s.indexOf("m=");
|
||||||
|
int const d = s.indexOf("d=");
|
||||||
|
|
||||||
|
QString msg = IsmasClient::getReasonForLastSendVersion();
|
||||||
|
QString commit{""}, date{""};
|
||||||
|
|
||||||
|
if (c != -1) {
|
||||||
|
int start = c + 2;
|
||||||
|
if (m >= start) {
|
||||||
|
int length = m - start;
|
||||||
|
commit = s.mid(start, length).trimmed();
|
||||||
|
|
||||||
|
start = m + 2;
|
||||||
|
if (d >= start) {
|
||||||
|
length = d - start;
|
||||||
|
msg += " (";
|
||||||
|
msg = s.mid(start, length).trimmed();
|
||||||
|
msg += ")";
|
||||||
|
|
||||||
|
start = d + 2;
|
||||||
|
date = s.mid(start);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!commit.isEmpty() && !msg.isEmpty() && !date.isEmpty()) {
|
||||||
|
lst << commit << msg << date;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
qCritical() << "CUSTOMER_REPOSITORY" << m_customerRepository
|
||||||
|
<< "DOES NOT EXIST";
|
||||||
|
}
|
||||||
|
return lst;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Zu beachten: wird eine datei neu hinzugefuegt (git add/commit) dann aber gleich
|
||||||
|
wieder geloscht, so wird sie im diff nicht angezeigt.
|
||||||
|
*/
|
||||||
|
std::optional<QStringList> GitClient::gitDiff(QString const &commits) {
|
||||||
|
if (QDir(m_customerRepository).exists()) {
|
||||||
|
// 409f198..6c22726
|
||||||
|
QString gitCommand("git diff --compact-summary ");
|
||||||
|
gitCommand += commits;
|
||||||
|
|
||||||
|
Command c(gitCommand);
|
||||||
|
if (c.execute(m_customerRepository)) { // execute command in local customerRepo
|
||||||
|
QString s = c.getCommandResult().trimmed();
|
||||||
|
Utils::printInfoMsg("GIT DIFF RESULT " + s);
|
||||||
|
|
||||||
|
QStringList lines = Update::split(s, '\n');
|
||||||
|
QStringList fileNames;
|
||||||
|
// each line has the format "etc/psa_config/DC2C_print01.json | 1 +
|
||||||
|
// or the format "etc/psa_config/DC2C_print01.json (new) | 1 +
|
||||||
|
// the filenames are relativ to the repository
|
||||||
|
for (int i = 0; i < lines.size(); ++i) {
|
||||||
|
QString const &line = lines.at(i);
|
||||||
|
int newIndex = line.indexOf("(new"); // for new files
|
||||||
|
int goneIndex = line.indexOf("(gone"); // for removed files
|
||||||
|
int modeIndex = line.indexOf("(mode");
|
||||||
|
int pipeIndex = line.indexOf('|');
|
||||||
|
if (newIndex != -1) {
|
||||||
|
QString file = line.left(newIndex).trimmed();
|
||||||
|
qInfo() << "FILE (NEW)" << file;
|
||||||
|
fileNames << file;
|
||||||
|
} else
|
||||||
|
if (modeIndex != -1) {
|
||||||
|
QString const file = line.left(modeIndex).trimmed();
|
||||||
|
qInfo() << "FILE (MODE)" << file;
|
||||||
|
fileNames << file;
|
||||||
|
} else
|
||||||
|
if (goneIndex != -1) {
|
||||||
|
QString const file = line.left(goneIndex).trimmed();
|
||||||
|
qCritical() << "FILE (GONE)" << file;
|
||||||
|
} else
|
||||||
|
if (pipeIndex != -1) {
|
||||||
|
QString const file = line.left(pipeIndex).trimmed();
|
||||||
|
qInfo() << "FILE (PIPE)" << file;
|
||||||
|
fileNames << file;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!fileNames.isEmpty()) {
|
||||||
|
return fileNames;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GitClient::gitFsck() {
|
||||||
|
bool r = false;
|
||||||
|
if (QDir(m_customerRepository).exists()) {
|
||||||
|
Command c("git fsck");
|
||||||
|
if ((r = c.execute(m_customerRepository)) == false) {
|
||||||
|
QString const &s = c.getCommandResult().trimmed();
|
||||||
|
Utils::printCriticalErrorMsg(QString("GIT FSCK FAILED: %1").arg(s));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
Hat sich nichts geaendert, so werden auch keine Commits <>..<> angezeigt
|
||||||
|
*/
|
||||||
|
std::optional<QString> GitClient::gitPull() {
|
||||||
|
if (QDir(m_customerRepository).exists()) {
|
||||||
|
qInfo() << "BRANCH NAME" << m_branchName;
|
||||||
|
|
||||||
|
Command c("git pull");
|
||||||
|
if (c.execute(m_customerRepository)) {
|
||||||
|
QString const s = c.getCommandResult().trimmed();
|
||||||
|
if (!s.isEmpty()) {
|
||||||
|
QStringList lines = Update::split(s, '\n');
|
||||||
|
worker()->CONSOLE(lines) << Worker::UPDATE_STEP::UPDATE_REPOSITORY;
|
||||||
|
if (!lines.empty()) {
|
||||||
|
static const QRegularExpression alreadyUpToDate("^\\s*Already\\s+up\\s+to\\s+date.*$");
|
||||||
|
if (std::none_of(lines.cbegin(), lines.cend(),
|
||||||
|
[](QString const &s) { return s.contains(alreadyUpToDate); })) {
|
||||||
|
int zoneNr = Utils::read1stLineOfFile("/mnt/system_data/zone_nr");
|
||||||
|
m_branchName = (zoneNr != 0) ? QString("zg1/zone%1").arg(zoneNr) : "master";
|
||||||
|
// lines can look like this:
|
||||||
|
// From https://git.mimbach49.de/GerhardHoffmann/customer_281
|
||||||
|
// 41ec581..5d25ac3 master -> origin/master
|
||||||
|
// ff10f57..43530a1 zg1/zone1 -> origin/zg1/zone1
|
||||||
|
// 6ed893f..5d9882c zg1/zone2 -> origin/zg1/zone2
|
||||||
|
// 4384d17..77045d8 zg1/zone3 -> origin/zg1/zone3
|
||||||
|
// 89d2812..36a0d74 zg1/zone5 -> origin/zg1/zone5
|
||||||
|
bool found = false;
|
||||||
|
for (int i=0; i < lines.size(); ++i) {
|
||||||
|
if (lines.at(i).contains(m_branchName)) {
|
||||||
|
found = true;
|
||||||
|
// 409f198..6c22726 zg1/zone1 -> origin/zg1/zone1
|
||||||
|
static QRegularExpression re("(^\\s*)([0-9A-Fa-f]+..[0-9A-Fa-f]+)(.*$)");
|
||||||
|
QRegularExpressionMatch match = re.match(lines.at(i));
|
||||||
|
if (match.hasMatch()) {
|
||||||
|
if (re.captureCount() == 3) { // start with full match (0), then the other 3 matches
|
||||||
|
QString const matchCaptured = match.captured(2);
|
||||||
|
worker()->CONSOLE(QStringList(matchCaptured)) << Worker::UPDATE_STEP::UPDATE_REPOSITORY;
|
||||||
|
return matchCaptured;
|
||||||
|
} else {
|
||||||
|
QStringList lst(QString("(wrong capture count (%1)").arg(re.captureCount()));
|
||||||
|
worker()->GUI(lst) << (worker()->CONSOLE(lst) << Worker::UPDATE_STEP::UPDATE_REPOSITORY_FAILURE);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
QStringList lst("no regex-match for commits");
|
||||||
|
worker()->GUI(lst) << (worker()->CONSOLE(lst) << Worker::UPDATE_STEP::UPDATE_REPOSITORY_FAILURE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!found) {
|
||||||
|
QStringList lst(QString("unknown branch name ") + m_branchName);
|
||||||
|
worker()->GUI(lst) << (worker()->CONSOLE(lst) << Worker::UPDATE_STEP::UPDATE_REPOSITORY_FAILURE);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return "Already up to date";
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
QStringList lst(QString("WRONG FORMAT FOR RESULT OF 'GIT PULL' ") + s);
|
||||||
|
worker()->GUI(lst) << (worker()->CONSOLE(lst) << Worker::UPDATE_STEP::UPDATE_REPOSITORY_FAILURE);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
QStringList lst("EMPTY RESULT FOR 'GIT PULL'");
|
||||||
|
worker()->GUI(lst) << (worker()->CONSOLE(lst) << Worker::UPDATE_STEP::UPDATE_REPOSITORY_FAILURE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
QStringList lst(QString("REPOSITORY ") + m_customerRepository + " DOES NOT EXIST");
|
||||||
|
worker()->GUI(lst) << (worker()->CONSOLE(lst) << Worker::UPDATE_STEP::UPDATE_REPOSITORY_FAILURE);
|
||||||
|
}
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::optional<QStringList> GitClient::gitMerge() {
|
||||||
|
Command c("git merge");
|
||||||
|
if (c.execute(m_workingDirectory)) {
|
||||||
|
QString s = c.getCommandResult();
|
||||||
|
QStringList lst = Update::split(s, '\n');
|
||||||
|
return lst;
|
||||||
|
}
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString GitClient::gitLastCommit(QString fileName) {
|
||||||
|
if (QDir(m_customerRepository).exists()) {
|
||||||
|
QString const filePath
|
||||||
|
= QDir::cleanPath(m_customerRepository + QDir::separator() + fileName);
|
||||||
|
if (QFile(filePath).exists()) {
|
||||||
|
QString const gitCommand = QString("git log %1 | head -n 1").arg(fileName);
|
||||||
|
Command c("bash");
|
||||||
|
if (c.execute(m_customerRepository, QStringList() << "-c" << gitCommand)) {
|
||||||
|
QString const r = c.getCommandResult();
|
||||||
|
int const idx = r.indexOf("commit ");
|
||||||
|
if (idx != -1) {
|
||||||
|
return r.mid(idx + 8).trimmed();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
// fileName has to an absolute path
|
||||||
|
QString GitClient::gitBlob(QString fileName) {
|
||||||
|
QFileInfo fi(fileName);
|
||||||
|
if (fi.exists()) {
|
||||||
|
QString const gitCommand = QString("git hash-object %1").arg(fileName);
|
||||||
|
Command c(gitCommand);
|
||||||
|
if (c.execute("/tmp")) {
|
||||||
|
return c.getCommandResult().trimmed();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "N/A";
|
||||||
|
}
|
||||||
|
|
||||||
|
QString GitClient::gitCommitForBlob(QString blob) {
|
||||||
|
if (QDir(m_customerRepository).exists()) {
|
||||||
|
QString const gitCommand
|
||||||
|
= QString("git whatchanged --all --find-object=%1 | head -n 1").arg(blob);
|
||||||
|
Command c(gitCommand);
|
||||||
|
if (c.execute(m_customerRepository)) {
|
||||||
|
return c.getCommandResult();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GitClient::gitIsFileTracked(QString fName) {
|
||||||
|
if (QDir(m_customerRepository).exists()) {
|
||||||
|
QString const gitCommand
|
||||||
|
= QString("git ls-files --error-unmatch %1").arg(fName);
|
||||||
|
Command c(gitCommand);
|
||||||
|
return c.execute(m_customerRepository);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//get_commit_for_blob () {
|
||||||
|
// # search for the blob in all commits for the file(name) $1
|
||||||
|
// echo $(git log --all --pretty=format:%H -- $2 |
|
||||||
|
// xargs -I{} bash -c "git ls-tree {} -- $2 |
|
||||||
|
// grep -q $1 && echo -n {} && head -n 1")
|
||||||
|
//}
|
62
git/git_client.h
Normal file
62
git/git_client.h
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
#ifndef GIT_CLIENT_H_INCLUDED
|
||||||
|
#define GIT_CLIENT_H_INCLUDED
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QStringList>
|
||||||
|
#include <optional>
|
||||||
|
|
||||||
|
#include "process/command.h"
|
||||||
|
#include "ismas/ismas_client.h"
|
||||||
|
|
||||||
|
class Worker;
|
||||||
|
class GitClient : public QObject {
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
Worker *m_worker;
|
||||||
|
QString const m_repositoryPath;
|
||||||
|
QString const m_customerNr;
|
||||||
|
QString const m_workingDirectory;
|
||||||
|
QString m_branchName;
|
||||||
|
QString const m_customerRepository;
|
||||||
|
|
||||||
|
bool copyGitConfigFromMaster();
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit GitClient(QString const &customerNrStr,
|
||||||
|
QString const &repositoryPath,
|
||||||
|
QString const &workingDirectory = QCoreApplication::applicationDirPath(),
|
||||||
|
QString const &branchName = "master",
|
||||||
|
QObject *parent = 0);
|
||||||
|
|
||||||
|
bool gitCloneCustomerRepository();
|
||||||
|
bool gitCheckoutBranch();
|
||||||
|
QStringList gitBranchNames();
|
||||||
|
|
||||||
|
QString const workingDirectory() const { return m_workingDirectory; }
|
||||||
|
QString workingDirectory() { return m_workingDirectory; }
|
||||||
|
|
||||||
|
QString const branchName() const { return m_branchName; }
|
||||||
|
QString branchName() { return m_branchName; }
|
||||||
|
|
||||||
|
QString repositoryPath() { return m_repositoryPath; }
|
||||||
|
QString const repositoryPath() const { return m_repositoryPath; }
|
||||||
|
|
||||||
|
bool gitCloneAndCheckoutBranch();
|
||||||
|
|
||||||
|
Worker *worker() { return m_worker; }
|
||||||
|
Worker const *worker() const { return m_worker; }
|
||||||
|
|
||||||
|
std::optional<QString> gitPull();
|
||||||
|
std::optional<QStringList> gitDiff(QString const &commit);
|
||||||
|
std::optional<QStringList> gitMerge();
|
||||||
|
|
||||||
|
bool gitFsck();
|
||||||
|
|
||||||
|
QString gitLastCommit(QString fileName);
|
||||||
|
QStringList gitShowReason(QString branchName);
|
||||||
|
static QString gitBlob(QString fileName);
|
||||||
|
QString gitCommitForBlob(QString blob);
|
||||||
|
bool gitIsFileTracked(QString file2name);
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // GIT_CLIENT_H_INCLUDED
|
942
ismas/ismas_client.cpp
Normal file
942
ismas/ismas_client.cpp
Normal file
@@ -0,0 +1,942 @@
|
|||||||
|
#include "ismas/ismas_client.h"
|
||||||
|
#include "utils.h"
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
|
#include <cstdio>
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
|
#include <arpa/inet.h> // inet_addr()
|
||||||
|
#include <netdb.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <netinet/tcp.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <strings.h> // bzero()
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <unistd.h> // read(), write(), close()
|
||||||
|
#include <fcntl.h>
|
||||||
|
|
||||||
|
|
||||||
|
#include <QThread>
|
||||||
|
#include <QJsonDocument>
|
||||||
|
#include <QJsonObject>
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
########################
|
||||||
|
# Spec vom 27.10.2023:
|
||||||
|
# U0010 -> %-Werte
|
||||||
|
# U0001 -> 100%
|
||||||
|
# U0003 -> "FAIL"
|
||||||
|
# U0002 -> "" (OK -> WAIT state reset)
|
||||||
|
# ISMAS -> "WAIT"
|
||||||
|
########################
|
||||||
|
#
|
||||||
|
# $1: EVENT: U0001 update finished: 100%
|
||||||
|
# U0002 reset TRG
|
||||||
|
# U0003 error
|
||||||
|
# U0010 for update process
|
||||||
|
# $2: PERCENT : "only for ISMAS: 0-100%",
|
||||||
|
# $3: RESULTCODE : "only for ISMAS",
|
||||||
|
# 0: Success
|
||||||
|
# 1: no Update nessesary
|
||||||
|
# 2: Backup failed
|
||||||
|
# 3: Package error/ Wrong package
|
||||||
|
# 4: Install Error
|
||||||
|
# $4: STEP : "running step (only for us): update_psa...",
|
||||||
|
# $5: STEP_RESULT : "error and result text",
|
||||||
|
# $6: VERSION : "opkg and conf info; what will be updated"
|
||||||
|
#
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <QDateTime>
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
|
void IsmasClient::printDebugMessage(int port,
|
||||||
|
QString const &clientIP,
|
||||||
|
int clientPort,
|
||||||
|
QString const &message) {
|
||||||
|
#if 0
|
||||||
|
Q_UNUSED(port);
|
||||||
|
Q_UNUSED(clientIP);
|
||||||
|
Q_UNUSED(clientPort);
|
||||||
|
Q_UNUSED(message);
|
||||||
|
#else
|
||||||
|
qDebug().noquote()
|
||||||
|
<< "\n"
|
||||||
|
<< "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
|
||||||
|
<< "hostname ........" << "127.0.0.1" << "\n"
|
||||||
|
<< "port ............" << port << "\n"
|
||||||
|
<< "local address ..." << clientIP << "\n"
|
||||||
|
<< "local port ......" << clientPort << "\n"
|
||||||
|
<< message;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void IsmasClient::printInfoMessage(int port,
|
||||||
|
QString const &clientIP,
|
||||||
|
int clientPort,
|
||||||
|
QString const &message) {
|
||||||
|
#if 0
|
||||||
|
Q_UNUSED(port);
|
||||||
|
Q_UNUSED(clientIP);
|
||||||
|
Q_UNUSED(clientPort);
|
||||||
|
Q_UNUSED(message);
|
||||||
|
#else
|
||||||
|
qInfo().noquote()
|
||||||
|
<< "\n"
|
||||||
|
<< "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
|
||||||
|
<< "hostname ........" << "127.0.0.1" << "\n"
|
||||||
|
<< "port ............" << port << "\n"
|
||||||
|
<< "local address ..." << clientIP << "\n"
|
||||||
|
<< "local port ......" << clientPort << "\n"
|
||||||
|
<< message;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void IsmasClient::printErrorMessage(int port,
|
||||||
|
QString const &clientIP,
|
||||||
|
int clientPort,
|
||||||
|
QString const &message) {
|
||||||
|
qCritical().noquote()
|
||||||
|
<< "\n"
|
||||||
|
<< "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
|
||||||
|
<< "hostname ........" << "127.0.0.1" << "\n"
|
||||||
|
<< "port ............" << port << "\n"
|
||||||
|
<< "local address ..." << clientIP << "\n"
|
||||||
|
<< "local port ......" << clientPort << "\n"
|
||||||
|
<< message;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::optional<QString>
|
||||||
|
IsmasClient::sendRequestReceiveResponse(int port, QString const &request) {
|
||||||
|
|
||||||
|
qInfo() << "REQUEST" << request;
|
||||||
|
|
||||||
|
int sockfd;
|
||||||
|
int r;
|
||||||
|
errno = 0;
|
||||||
|
// socket create and verification
|
||||||
|
if ((sockfd = ::socket(AF_INET, SOCK_STREAM, 0)) == -1) {
|
||||||
|
qCritical().noquote()
|
||||||
|
<< "\n"
|
||||||
|
<< "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
|
||||||
|
<< "SOCKET CREATION FAILED (" << strerror(errno) << ")";
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct sockaddr_in servAddr;
|
||||||
|
bzero(&servAddr, sizeof(servAddr));
|
||||||
|
// assign IP, PORT
|
||||||
|
servAddr.sin_family = AF_INET;
|
||||||
|
servAddr.sin_addr.s_addr = inet_addr("127.0.0.1");
|
||||||
|
|
||||||
|
servAddr.sin_port = htons(port);
|
||||||
|
// connect the client socket to server socket
|
||||||
|
if ((r = ::connect(sockfd, (struct sockaddr *)(&servAddr), sizeof(servAddr))) != 0) {
|
||||||
|
qCritical().noquote()
|
||||||
|
<< "\n"
|
||||||
|
<< "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
|
||||||
|
<< "CONNECTION WITH SERVER FAILED (" << strerror(r) << ")";
|
||||||
|
::close(sockfd);
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct sockaddr_in clientAddr;
|
||||||
|
bzero(&clientAddr, sizeof(clientAddr));
|
||||||
|
socklen_t sockLen = sizeof(clientAddr);
|
||||||
|
|
||||||
|
char clientIP[16];
|
||||||
|
bzero(&clientIP, sizeof(clientIP));
|
||||||
|
getsockname(sockfd, (struct sockaddr *)(&clientAddr), &sockLen);
|
||||||
|
inet_ntop(AF_INET, &clientAddr.sin_addr, clientIP, sizeof(clientIP));
|
||||||
|
unsigned int clientPort = ntohs(clientAddr.sin_port);
|
||||||
|
|
||||||
|
printDebugMessage(port, clientIP, clientPort, QString("CONNECTED TO SERVER"));
|
||||||
|
|
||||||
|
struct timeval tv;
|
||||||
|
tv.tv_sec = 10; /* 10 secs timeout for read and write */
|
||||||
|
|
||||||
|
struct linger so_linger;
|
||||||
|
so_linger.l_onoff = 1;
|
||||||
|
so_linger.l_linger = 0;
|
||||||
|
|
||||||
|
int maxfdp1;
|
||||||
|
fd_set rset;
|
||||||
|
fd_set wset;
|
||||||
|
|
||||||
|
setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &so_linger, sizeof(so_linger));
|
||||||
|
// no reliable, but does not harm, as we use select() as well
|
||||||
|
setsockopt(sockfd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
|
||||||
|
setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
|
||||||
|
int flag = 1;
|
||||||
|
setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(int));
|
||||||
|
|
||||||
|
static char buf[1024*8];
|
||||||
|
bzero(buf, sizeof(buf));
|
||||||
|
int const bytesToWrite = strlen(request.toStdString().c_str());
|
||||||
|
strncpy(buf, request.toStdString().c_str(), sizeof(buf)-1);
|
||||||
|
|
||||||
|
int loop = 0;
|
||||||
|
int bytesWritten = 0;
|
||||||
|
while (bytesWritten < bytesToWrite) {
|
||||||
|
errno = 0;
|
||||||
|
FD_ZERO(&wset);
|
||||||
|
FD_SET(sockfd, &wset);
|
||||||
|
maxfdp1 = sockfd + 1;
|
||||||
|
tv.tv_sec = 60; /* 60 secs timeout for read and write -> APISM cuts the connection after 30s */
|
||||||
|
tv.tv_usec = 0;
|
||||||
|
|
||||||
|
int const w = select(maxfdp1, NULL, &wset, NULL, &tv);
|
||||||
|
if (w < 0) { // error
|
||||||
|
if (errno == EINTR) {
|
||||||
|
printErrorMessage(port, clientIP, clientPort,
|
||||||
|
QString("INTERRUPTED BY SIGNAL (1) (") + strerror(errno) + ")");
|
||||||
|
continue;
|
||||||
|
} else {
|
||||||
|
printErrorMessage(port, clientIP, clientPort,
|
||||||
|
QString("SELECT-ERROR (WRITE) %1(").arg(loop) + strerror(errno) + ")");
|
||||||
|
::close(sockfd);
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
if (w == 0) { // timeout
|
||||||
|
printErrorMessage(port, clientIP, clientPort,
|
||||||
|
QString("SELECT-TIMEOUT (WRITE) %1(").arg(loop) + strerror(errno) + ")");
|
||||||
|
if (++loop < 10) {
|
||||||
|
QThread::msleep(500);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
::close(sockfd);
|
||||||
|
return std::nullopt;
|
||||||
|
} else
|
||||||
|
if (w > 0) {
|
||||||
|
int n = ::sendto(sockfd, buf+bytesWritten, bytesToWrite-bytesWritten, 0, NULL, 0);
|
||||||
|
if (n >= 0) {
|
||||||
|
bytesWritten += n;
|
||||||
|
} else {
|
||||||
|
if (errno == EWOULDBLOCK) {
|
||||||
|
if (++loop < 10) {
|
||||||
|
QThread::msleep(500);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
printErrorMessage(port, clientIP, clientPort,
|
||||||
|
QString("WRITE TIMEOUT %1(").arg(loop) + strerror(errno) + ")");
|
||||||
|
::close(sockfd);
|
||||||
|
return std::nullopt;
|
||||||
|
} else
|
||||||
|
if (errno == EINTR) {
|
||||||
|
printErrorMessage(port, clientIP, clientPort,
|
||||||
|
QString("WRITE INTERRUPTED BY SIGNAL (1) (") + strerror(errno) + ")");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// DO NOT USE SHUTDOWN! APISM CAN NOT COPE WITH IT
|
||||||
|
// errno = 0;
|
||||||
|
// if (shutdown(sockfd, SHUT_WR) < 0) {
|
||||||
|
// printErrorMessage(port, clientIP, clientPort,
|
||||||
|
// QString("CANNOT CLOSE WRITING END (") + strerror(errno) + ")");
|
||||||
|
// }
|
||||||
|
|
||||||
|
printInfoMessage(port, clientIP, clientPort, QString("MESSAGE SENT <<<") + buf + ">>>");
|
||||||
|
|
||||||
|
loop = 0;
|
||||||
|
bzero(buf, sizeof(buf));
|
||||||
|
int bytesToRead = sizeof(buf)-1;
|
||||||
|
int bytesRead = 0;
|
||||||
|
while (bytesRead < bytesToRead) {
|
||||||
|
errno = 0;
|
||||||
|
FD_ZERO(&rset);
|
||||||
|
FD_SET(sockfd, &rset);
|
||||||
|
maxfdp1 = sockfd + 1;
|
||||||
|
tv.tv_sec = 60; /* 60 secs timeout for read and write */
|
||||||
|
tv.tv_usec = 0;
|
||||||
|
|
||||||
|
QString const selectStart = QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
|
||||||
|
|
||||||
|
int const r = select(maxfdp1, &rset, NULL, NULL, &tv);
|
||||||
|
if (r < 0) { // error
|
||||||
|
if (errno == EINTR) {
|
||||||
|
printErrorMessage(port, clientIP, clientPort,
|
||||||
|
QString("INTERRUPTED BY SIGNAL (2) (") + strerror(errno) + ")");
|
||||||
|
continue;
|
||||||
|
} else {
|
||||||
|
printErrorMessage(port, clientIP, clientPort,
|
||||||
|
QString("SELECT-ERROR (READ) %1(").arg(loop) + strerror(errno) + ")");
|
||||||
|
::close(sockfd);
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
if (r == 0) { // timeout
|
||||||
|
printErrorMessage(port, clientIP, clientPort,
|
||||||
|
QString("SELECT-TIMEOUT (READ) %1(").arg(loop) + strerror(errno) + ")");
|
||||||
|
if (++loop < 10) {
|
||||||
|
QThread::msleep(500);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
::close(sockfd);
|
||||||
|
return std::nullopt;
|
||||||
|
} else
|
||||||
|
if (r > 0) {
|
||||||
|
if (FD_ISSET(sockfd, &rset)) {
|
||||||
|
int n = ::recvfrom(sockfd, buf+bytesRead, bytesToRead-bytesRead,
|
||||||
|
0, NULL, NULL);
|
||||||
|
if (n > 0) { //
|
||||||
|
bytesRead += n;
|
||||||
|
} else
|
||||||
|
if (n == 0) {
|
||||||
|
// The return value will be 0 when the peer has performed an orderly shutdown.
|
||||||
|
printErrorMessage(port, clientIP, clientPort,
|
||||||
|
QString("PEER CLOSED CONNECTION (") + strerror(errno) + ") START AT" +
|
||||||
|
selectStart + " NOW " + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
|
||||||
|
::close(sockfd);
|
||||||
|
return std::nullopt;
|
||||||
|
} else
|
||||||
|
if (n < 0) {
|
||||||
|
if (errno == EWOULDBLOCK) { // check just in case
|
||||||
|
if (++loop < 10) {
|
||||||
|
QThread::msleep(500);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
printErrorMessage(port, clientIP, clientPort,
|
||||||
|
QString("READ TIMEOUT %1(").arg(loop) + strerror(errno) + ")");
|
||||||
|
::close(sockfd);
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
if (errno == EINTR) {
|
||||||
|
printErrorMessage(port, clientIP, clientPort,
|
||||||
|
QString("INTERRUPTED BY SIGNAL (2) (") + strerror(errno) + ")");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// printInfoMessage(port, clientIP, clientPort, QString("MESSAGE RECEIVED ") + buf);
|
||||||
|
QString response(buf);
|
||||||
|
|
||||||
|
if (int idx = response.indexOf("{\"error\":\"ISMAS is offline\"}")) {
|
||||||
|
response = response.mid(0, idx);
|
||||||
|
} else
|
||||||
|
if (response.contains("RECORD")) { // RECORD SAVED or RECORD WRITE ABORTED
|
||||||
|
printInfoMessage(port, clientIP, clientPort, QString("IGNORED '") + response + "' RESPONSE");
|
||||||
|
::close(sockfd);
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
|
||||||
|
QJsonParseError parseError;
|
||||||
|
QJsonDocument document(QJsonDocument::fromJson(response.toUtf8(), &parseError));
|
||||||
|
if (parseError.error == QJsonParseError::NoError) {
|
||||||
|
if (document.isObject()) { // done: received valid APISM response
|
||||||
|
printInfoMessage(port, clientIP, clientPort,
|
||||||
|
QString("VALID APISM RESPONSE .. \n") + response);
|
||||||
|
::close(sockfd);
|
||||||
|
return response;
|
||||||
|
} else {
|
||||||
|
printInfoMessage(port, clientIP, clientPort,
|
||||||
|
QString("CORRUPTED RESPONSE ") + response);
|
||||||
|
::close(sockfd);
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
printDebugMessage(port, clientIP, clientPort,
|
||||||
|
QString("PARSE ERROR ") + response + " " + parseError.errorString());
|
||||||
|
::close(sockfd);
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::updateNewsToIsmas(char const *event,
|
||||||
|
int percent,
|
||||||
|
int resultCode,
|
||||||
|
char const *step,
|
||||||
|
char const *step_result,
|
||||||
|
char const *version) {
|
||||||
|
char buf[1024];
|
||||||
|
memset(buf, 0, sizeof(buf));
|
||||||
|
|
||||||
|
QString const ts = QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
|
||||||
|
snprintf(buf, sizeof(buf)-1,
|
||||||
|
"{"
|
||||||
|
"\"REASON\":\"SW_UP\","
|
||||||
|
"\"TIMESTAMP\":\"%s\","
|
||||||
|
"\"EVENT_ID\":\"0\","
|
||||||
|
"\"EVENT\":\"%s\","
|
||||||
|
"\"EVENTSTATE\":1,"
|
||||||
|
"\"PARAMETER\": {"
|
||||||
|
"\"PERCENT\" : %d,"
|
||||||
|
"\"RESULTCODE\" : %d,"
|
||||||
|
"\"STEP\" : \"%s\","
|
||||||
|
"\"STEP_RESULT\" : \"%s\","
|
||||||
|
"\"VERSION\" : \"%s\""
|
||||||
|
"}"
|
||||||
|
"}", ts.toStdString().c_str(), event, percent, resultCode,
|
||||||
|
step, step_result, version);
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::errorBackendNotConnected(QString const &info,
|
||||||
|
QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0003",
|
||||||
|
m_progressInPercent,
|
||||||
|
RESULT_CODE::INSTALL_ERROR,
|
||||||
|
"CHECK BACKEND CONNECTIVITY",
|
||||||
|
info.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::errorGitClone(QString const &info,
|
||||||
|
QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0003",
|
||||||
|
m_progressInPercent,
|
||||||
|
RESULT_CODE::INSTALL_ERROR,
|
||||||
|
"CLONE CUSTOMER REPOSITORY FAILED",
|
||||||
|
info.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::backendConnected(QString const &info,
|
||||||
|
QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0010",
|
||||||
|
m_progressInPercent,
|
||||||
|
RESULT_CODE::SUCCESS,
|
||||||
|
"CHECK BACKEND CONNECTIVITY",
|
||||||
|
info.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::execOpkgCommand(QString const &info,
|
||||||
|
QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0010",
|
||||||
|
m_progressInPercent,
|
||||||
|
RESULT_CODE::SUCCESS,
|
||||||
|
"EXECUTE OPKG COMMAND",
|
||||||
|
info.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::rsyncFile(QString const &info, QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0010",
|
||||||
|
m_progressInPercent,
|
||||||
|
RESULT_CODE::SUCCESS,
|
||||||
|
"RSYNC FILE",
|
||||||
|
info.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::updateTriggerSet(QString const &info, QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0010",
|
||||||
|
m_progressInPercent,
|
||||||
|
RESULT_CODE::SUCCESS,
|
||||||
|
"CHECK UPDATE TRIGGER",
|
||||||
|
info.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::errorUpdateTrigger(QString const &info, QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0003",
|
||||||
|
m_progressInPercent,
|
||||||
|
RESULT_CODE::INSTALL_ERROR,
|
||||||
|
"CHECK UPDATE TRIGGER",
|
||||||
|
info.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
|
||||||
|
//static int const constexpr SIZE = 4096*8;
|
||||||
|
static char buf[4096*2];
|
||||||
|
memset(buf, 0, sizeof(buf));
|
||||||
|
|
||||||
|
// local data="#M=APISM#C=CMD_SENDVERSION#J=
|
||||||
|
snprintf(buf, sizeof(buf)-1,
|
||||||
|
"{"
|
||||||
|
"\"VERSION_INFO\" : {"
|
||||||
|
"\"REASON\":\"%s\","
|
||||||
|
"\"CREATED\":\"%s\","
|
||||||
|
"\"HASH\":\"%s\""
|
||||||
|
"},"
|
||||||
|
"\"TARIFF\" : {"
|
||||||
|
"\"VERSION\" : \"%s\","
|
||||||
|
"\"PROJECT\" : \"%s\","
|
||||||
|
"\"ZONE\" : %d,"
|
||||||
|
"\"INFO\" : \"%s\","
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"LAST-COMMIT\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d,"
|
||||||
|
"\"LOADED\" : \"%s\""
|
||||||
|
"},"
|
||||||
|
"\"OPKG_COMMANDS\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"LAST-COMMIT\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d,"
|
||||||
|
"\"LOADED\" : \"%s\""
|
||||||
|
"},"
|
||||||
|
"\"JSON\" : {"
|
||||||
|
"\"DC2C_CASH\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_CONF\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_DEVICE\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_01\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_02\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_03\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_04\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_05\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_06\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_07\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_08\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_09\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_10\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_11\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_12\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_13\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_14\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_15\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_16\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_17\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_18\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_19\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_20\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_21\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_22\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_23\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_24\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_25\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_26\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_27\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_28\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_29\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_30\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_31\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"},"
|
||||||
|
"\"DC2C_PRINT_32\" : {"
|
||||||
|
"\"BLOB\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d"
|
||||||
|
"}"
|
||||||
|
"},"
|
||||||
|
"\"HARDWARE\" : {"
|
||||||
|
"\"DEVICES\" : [\"PTU5\", \"DC\", \"PRINTER\", \"BNA\"]"
|
||||||
|
"},"
|
||||||
|
"\"OS\" : {"
|
||||||
|
"\"Linux\": \"%s\""
|
||||||
|
"},"
|
||||||
|
"\"CONFIG\" : {"
|
||||||
|
"\"PTU5\" : {"
|
||||||
|
"\"CPU_SERIAL\" : \"%s\""
|
||||||
|
"},"
|
||||||
|
"\"DC\" : {"
|
||||||
|
"\"HW-VERSION\" : \"%s\","
|
||||||
|
"\"SW-VERSION\" : \"%s\","
|
||||||
|
"\"SIZE\" : %d,"
|
||||||
|
"\"GITBLOB\" : \"%s\","
|
||||||
|
"\"GITLASTCOMMIT\" : \"%s\""
|
||||||
|
"},"
|
||||||
|
"\"PRINTER\" : {"
|
||||||
|
"},"
|
||||||
|
"\"BNA\" : {"
|
||||||
|
"}"
|
||||||
|
"},"
|
||||||
|
"\"SOFTWARE\": {"
|
||||||
|
"\"APISM\" : {"
|
||||||
|
"\"VERSION\" : \"%s\""
|
||||||
|
"},"
|
||||||
|
"\"ATBQT\" : {"
|
||||||
|
"\"VERSION\" : \"%s\""
|
||||||
|
"},"
|
||||||
|
"\"ATB-UPDATE-TOOL\" : {"
|
||||||
|
"\"VERSION\" : \"%s\""
|
||||||
|
"}"
|
||||||
|
"},"
|
||||||
|
"\"PLUGINS\" : {"
|
||||||
|
"\"libATBDeviceControllerPlugin.so\" : {"
|
||||||
|
"\"VERSION\" : \"%s\""
|
||||||
|
"},"
|
||||||
|
"\"libIngenicoISelf_CCPlugin.so\" : {"
|
||||||
|
"\"VERSION\" : \"%s\""
|
||||||
|
"},"
|
||||||
|
"\"libMOBILISIS_CalculatePricePlugin.so\" : {"
|
||||||
|
"\"VERSION\" : \"%s\""
|
||||||
|
"},"
|
||||||
|
"\"libMOBILISIS_CalculatePricePlugin_ConfigUi.so\" : {"
|
||||||
|
"\"VERSION\" : \"%s\""
|
||||||
|
"},"
|
||||||
|
"\"libPRM_CalculatePricePlugin.so\" : {"
|
||||||
|
"\"VERSION\" : \"%s\""
|
||||||
|
"},"
|
||||||
|
"\"libPRM_CalculatePricePlugin_ConfigUi.so\" : {"
|
||||||
|
"\"VERSION\" : \"%s\""
|
||||||
|
"},"
|
||||||
|
"\"libTCP_ZVT_CCPlugin.so\" : {"
|
||||||
|
"\"VERSION\" : \"%s\""
|
||||||
|
"}"
|
||||||
|
"}"
|
||||||
|
"}",
|
||||||
|
psa.versionInfo.reason.toStdString().c_str(),
|
||||||
|
psa.versionInfo.created.toStdString().c_str(),
|
||||||
|
psa.versionInfo.lastCommit.toStdString().c_str(),
|
||||||
|
|
||||||
|
psa.tariff.version.toStdString().c_str(),
|
||||||
|
psa.tariff.project.toStdString().c_str(),
|
||||||
|
psa.tariff.zone,
|
||||||
|
psa.tariff.info.toStdString().c_str(),
|
||||||
|
psa.tariff.blob.toStdString().c_str(),
|
||||||
|
psa.tariff.lastCommit.toStdString().c_str(),
|
||||||
|
psa.tariff.size,
|
||||||
|
psa.tariff.loadTime.toStdString().c_str(),
|
||||||
|
|
||||||
|
psa.opkg.blob.toStdString().c_str(),
|
||||||
|
psa.opkg.lastCommit.toStdString().c_str(),
|
||||||
|
psa.opkg.size,
|
||||||
|
psa.opkg.loadTime.toStdString().c_str(),
|
||||||
|
|
||||||
|
psa.cash.blob.toStdString().c_str(),
|
||||||
|
psa.cash.size,
|
||||||
|
psa.conf.blob.toStdString().c_str(),
|
||||||
|
psa.conf.size,
|
||||||
|
psa.device.blob.toStdString().c_str(),
|
||||||
|
psa.device.size,
|
||||||
|
|
||||||
|
psa.print[0].blob.toStdString().c_str(),
|
||||||
|
psa.print[0].size,
|
||||||
|
psa.print[1].blob.toStdString().c_str(),
|
||||||
|
psa.print[1].size,
|
||||||
|
psa.print[2].blob.toStdString().c_str(),
|
||||||
|
psa.print[2].size,
|
||||||
|
psa.print[3].blob.toStdString().c_str(),
|
||||||
|
psa.print[3].size,
|
||||||
|
psa.print[4].blob.toStdString().c_str(),
|
||||||
|
psa.print[4].size,
|
||||||
|
psa.print[5].blob.toStdString().c_str(),
|
||||||
|
psa.print[5].size,
|
||||||
|
psa.print[6].blob.toStdString().c_str(),
|
||||||
|
psa.print[6].size,
|
||||||
|
psa.print[7].blob.toStdString().c_str(),
|
||||||
|
psa.print[7].size,
|
||||||
|
psa.print[8].blob.toStdString().c_str(),
|
||||||
|
psa.print[8].size,
|
||||||
|
psa.print[9].blob.toStdString().c_str(),
|
||||||
|
psa.print[9].size,
|
||||||
|
psa.print[10].blob.toStdString().c_str(),
|
||||||
|
psa.print[10].size,
|
||||||
|
psa.print[11].blob.toStdString().c_str(),
|
||||||
|
psa.print[11].size,
|
||||||
|
psa.print[12].blob.toStdString().c_str(),
|
||||||
|
psa.print[12].size,
|
||||||
|
psa.print[13].blob.toStdString().c_str(),
|
||||||
|
psa.print[13].size,
|
||||||
|
psa.print[14].blob.toStdString().c_str(),
|
||||||
|
psa.print[14].size,
|
||||||
|
psa.print[15].blob.toStdString().c_str(),
|
||||||
|
psa.print[15].size,
|
||||||
|
psa.print[16].blob.toStdString().c_str(),
|
||||||
|
psa.print[16].size,
|
||||||
|
psa.print[17].blob.toStdString().c_str(),
|
||||||
|
psa.print[17].size,
|
||||||
|
psa.print[18].blob.toStdString().c_str(),
|
||||||
|
psa.print[18].size,
|
||||||
|
psa.print[19].blob.toStdString().c_str(),
|
||||||
|
psa.print[19].size,
|
||||||
|
psa.print[20].blob.toStdString().c_str(),
|
||||||
|
psa.print[20].size,
|
||||||
|
psa.print[21].blob.toStdString().c_str(),
|
||||||
|
psa.print[21].size,
|
||||||
|
psa.print[22].blob.toStdString().c_str(),
|
||||||
|
psa.print[22].size,
|
||||||
|
psa.print[23].blob.toStdString().c_str(),
|
||||||
|
psa.print[23].size,
|
||||||
|
psa.print[24].blob.toStdString().c_str(),
|
||||||
|
psa.print[24].size,
|
||||||
|
psa.print[25].blob.toStdString().c_str(),
|
||||||
|
psa.print[25].size,
|
||||||
|
psa.print[26].blob.toStdString().c_str(),
|
||||||
|
psa.print[26].size,
|
||||||
|
psa.print[27].blob.toStdString().c_str(),
|
||||||
|
psa.print[27].size,
|
||||||
|
psa.print[28].blob.toStdString().c_str(),
|
||||||
|
psa.print[28].size,
|
||||||
|
psa.print[29].blob.toStdString().c_str(),
|
||||||
|
psa.print[29].size,
|
||||||
|
psa.print[30].blob.toStdString().c_str(),
|
||||||
|
psa.print[30].size,
|
||||||
|
psa.print[31].blob.toStdString().c_str(),
|
||||||
|
psa.print[31].size,
|
||||||
|
|
||||||
|
psa.hw.linuxVersion.toStdString().c_str(),
|
||||||
|
psa.hw.cpuSerial.toStdString().c_str(),
|
||||||
|
|
||||||
|
psa.dc.versionHW.toStdString().c_str(),
|
||||||
|
psa.dc.versionSW.toStdString().c_str(),
|
||||||
|
psa.dc.size,
|
||||||
|
psa.dc.gitBlob.toStdString().c_str(),
|
||||||
|
psa.dc.gitLastCommit.toStdString().c_str(),
|
||||||
|
|
||||||
|
psa.sw.apismVersion.toStdString().c_str(),
|
||||||
|
psa.sw.atbQTVersion.toStdString().c_str(),
|
||||||
|
psa.sw.atbUpdateToolVersion.toStdString().c_str(),
|
||||||
|
|
||||||
|
psa.pluginVersion.deviceController.toStdString().c_str(),
|
||||||
|
psa.pluginVersion.ingenicoISelfCC.toStdString().c_str(),
|
||||||
|
psa.pluginVersion.mobilisisCalculatePrice.toStdString().c_str(),
|
||||||
|
psa.pluginVersion.mobilisisCalculatePriceConfigUi.toStdString().c_str(),
|
||||||
|
psa.pluginVersion.prmCalculatePrice.toStdString().c_str(),
|
||||||
|
psa.pluginVersion.prmCalculatePriceConfigUi.toStdString().c_str(),
|
||||||
|
psa.pluginVersion.tcpZVT.toStdString().c_str());
|
||||||
|
|
||||||
|
qInfo() << buf;
|
||||||
|
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::updateOfPSAContinues(QString currentStage,
|
||||||
|
QString currentStageInfo,
|
||||||
|
QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0010",
|
||||||
|
m_progressInPercent,
|
||||||
|
RESULT_CODE::SUCCESS,
|
||||||
|
currentStage.toStdString().c_str(),
|
||||||
|
currentStageInfo.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::updateOfPSAStarted(QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0010",
|
||||||
|
m_progressInPercent,
|
||||||
|
RESULT_CODE::SUCCESS,
|
||||||
|
"START",
|
||||||
|
"detected WAIT state: start update process",
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::checkoutBranch(QString const &info, QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0010",
|
||||||
|
m_progressInPercent,
|
||||||
|
RESULT_CODE::SUCCESS,
|
||||||
|
"BRANCH-CHECKOUT",
|
||||||
|
info.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::cloneAndCheckoutCustomerRepository(QString const &info, QString const &version) { // clone and checkout customer repository
|
||||||
|
return updateNewsToIsmas("U0010",
|
||||||
|
m_progressInPercent,
|
||||||
|
RESULT_CODE::SUCCESS,
|
||||||
|
"CLONE-CHECKOUT",
|
||||||
|
info.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::gitFetch(QString const &info, QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0010",
|
||||||
|
m_progressInPercent,
|
||||||
|
RESULT_CODE::SUCCESS,
|
||||||
|
"GIT-FETCH",
|
||||||
|
info.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::errorGitFetch(int resultCode, QString const &info, QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0003",
|
||||||
|
m_progressInPercent,
|
||||||
|
resultCode,
|
||||||
|
"GIT-FETCH-FAILED",
|
||||||
|
info.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::updateOfPSAActivated(QString const &version) { // sent even after success
|
||||||
|
m_progressInPercent = 0;
|
||||||
|
return updateNewsToIsmas("U0002",
|
||||||
|
m_progressInPercent,
|
||||||
|
RESULT_CODE::SUCCESS,
|
||||||
|
"UPDATE ACTIVATED",
|
||||||
|
"reset WAIT state",
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::updateOfPSASucceeded(QString const &version) {
|
||||||
|
m_progressInPercent = 100;
|
||||||
|
return updateNewsToIsmas("U0001",
|
||||||
|
m_progressInPercent,
|
||||||
|
RESULT_CODE::SUCCESS,
|
||||||
|
"UPDATE SUCCESS",
|
||||||
|
"update process succeeded",
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::sanityCheckFailed(int resultCode, QString reason, QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0003",
|
||||||
|
m_progressInPercent,
|
||||||
|
resultCode,
|
||||||
|
"SANITY-CHECK-FAILED",
|
||||||
|
reason.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::jsonParseFailed(int resultCode, QString reason, QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0003",
|
||||||
|
m_progressInPercent,
|
||||||
|
resultCode,
|
||||||
|
"JSON-PARSE-ERROR",
|
||||||
|
reason.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
std::optional<QString> IsmasClient::finalResult(int resultCode,
|
||||||
|
QString reason,
|
||||||
|
QString const &version) {
|
||||||
|
Q_UNUSED(resultCode);
|
||||||
|
Q_UNUSED(reason);
|
||||||
|
Q_UNUSED(version);
|
||||||
|
|
||||||
|
/*
|
||||||
|
m_progressInPercent = 100;
|
||||||
|
if (resultCode == RESULT_CODE::SUCCESS) {
|
||||||
|
return updateNewsToIsmas("U0002",
|
||||||
|
m_progressInPercent,
|
||||||
|
resultCode,
|
||||||
|
"FINAL-UPDATE-RESULT",
|
||||||
|
reason.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
if (resultCode == RESULT_CODE::INSTALL_ERROR) {
|
||||||
|
return updateNewsToIsmas("U0003",
|
||||||
|
m_progressInPercent,
|
||||||
|
resultCode,
|
||||||
|
"FINAL-UPDATE-RESULT",
|
||||||
|
reason.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IsmasClient::updateOfPSAFailed(int resultCode, QString step,
|
||||||
|
QString reason, QString const &version) {
|
||||||
|
return updateNewsToIsmas("U0003",
|
||||||
|
m_progressInPercent,
|
||||||
|
resultCode,
|
||||||
|
step.toStdString().c_str(),
|
||||||
|
reason.toStdString().c_str(),
|
||||||
|
version.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
char const *IsmasClient::reason[REASON::ENTRIES] = {
|
||||||
|
"TIME-TRIGGERED", "SERVICE", "DEV-TEST"
|
||||||
|
};
|
||||||
|
|
||||||
|
QString IsmasClient::getReasonForLastSendVersion() {
|
||||||
|
QString const &parentName = Utils::getParentName();
|
||||||
|
if (parentName == "ATBQT") {
|
||||||
|
return reason[REASON::SERVICE];
|
||||||
|
}
|
||||||
|
if (parentName == "systemd") {
|
||||||
|
return reason[REASON::TIME_TRIGGERED];
|
||||||
|
}
|
||||||
|
return reason[REASON::DEV_TEST];
|
||||||
|
}
|
208
ismas/ismas_client.h
Normal file
208
ismas/ismas_client.h
Normal file
@@ -0,0 +1,208 @@
|
|||||||
|
#ifndef ISMAS_CLIENT_H_INCLUDED
|
||||||
|
#define ISMAS_CLIENT_H_INCLUDED
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QString>
|
||||||
|
|
||||||
|
#include <optional>
|
||||||
|
|
||||||
|
struct PSAInstalled {
|
||||||
|
struct VersionInfo {
|
||||||
|
QString created;
|
||||||
|
QString reason;
|
||||||
|
QString lastCommit;
|
||||||
|
} versionInfo;
|
||||||
|
|
||||||
|
struct Tariff {
|
||||||
|
QString name;
|
||||||
|
QString version;
|
||||||
|
QString project;
|
||||||
|
int zone;
|
||||||
|
int size;
|
||||||
|
QString blob;
|
||||||
|
QString lastCommit;
|
||||||
|
QString info;
|
||||||
|
QString loadTime;
|
||||||
|
} tariff;
|
||||||
|
|
||||||
|
struct HardWare {
|
||||||
|
QString linuxVersion;
|
||||||
|
QString cpuSerial;
|
||||||
|
} hw;
|
||||||
|
|
||||||
|
struct Opkg {
|
||||||
|
int size;
|
||||||
|
QString blob;
|
||||||
|
QString lastCommit;
|
||||||
|
QString loadTime;
|
||||||
|
} opkg;
|
||||||
|
|
||||||
|
struct DC {
|
||||||
|
QString versionHW;
|
||||||
|
QString versionSW;
|
||||||
|
QString gitBlob;
|
||||||
|
QString gitLastCommit;
|
||||||
|
int size;
|
||||||
|
} dc;
|
||||||
|
|
||||||
|
struct SoftWare {
|
||||||
|
QString apismVersion;
|
||||||
|
QString atbQTVersion;
|
||||||
|
QString atbUpdateToolVersion;
|
||||||
|
} sw;
|
||||||
|
|
||||||
|
struct PluginVersion {
|
||||||
|
QString deviceController;
|
||||||
|
QString ingenicoISelfCC;
|
||||||
|
QString mobilisisCalculatePrice;
|
||||||
|
QString mobilisisCalculatePriceConfigUi;
|
||||||
|
QString prmCalculatePrice;
|
||||||
|
QString prmCalculatePriceConfigUi;
|
||||||
|
QString tcpZVT;
|
||||||
|
} pluginVersion;
|
||||||
|
|
||||||
|
struct DC2C {
|
||||||
|
QString name;
|
||||||
|
QString blob;
|
||||||
|
int size;
|
||||||
|
};
|
||||||
|
|
||||||
|
DC2C cash;
|
||||||
|
DC2C conf;
|
||||||
|
DC2C device;
|
||||||
|
|
||||||
|
DC2C print[32];
|
||||||
|
|
||||||
|
explicit PSAInstalled() {
|
||||||
|
tariff.name = "N/A";
|
||||||
|
tariff.version = "N/A";
|
||||||
|
tariff.project = "N/A";
|
||||||
|
tariff.zone = -1;
|
||||||
|
tariff.size = -1;
|
||||||
|
tariff.blob = "N/A";
|
||||||
|
tariff.info = "N/A";
|
||||||
|
tariff.loadTime = "N/A";
|
||||||
|
|
||||||
|
hw.linuxVersion = "N/A";
|
||||||
|
hw.cpuSerial = "N/A";
|
||||||
|
|
||||||
|
opkg.size = -1;
|
||||||
|
opkg.blob = "N/A";
|
||||||
|
opkg.lastCommit = "N/A";
|
||||||
|
opkg.loadTime = "N/A";
|
||||||
|
|
||||||
|
dc.versionHW = "N/A";
|
||||||
|
dc.versionSW = "N/A";
|
||||||
|
dc.gitBlob = "N/A";
|
||||||
|
dc.gitLastCommit = "N/A";
|
||||||
|
dc.size = -1;
|
||||||
|
|
||||||
|
sw.apismVersion = "N/A";
|
||||||
|
sw.atbQTVersion = "N/A";
|
||||||
|
sw.atbUpdateToolVersion = "N/A";
|
||||||
|
|
||||||
|
pluginVersion.deviceController = "N/A";
|
||||||
|
pluginVersion.ingenicoISelfCC = "N/A";
|
||||||
|
pluginVersion.mobilisisCalculatePrice = "N/A";
|
||||||
|
pluginVersion.mobilisisCalculatePriceConfigUi = "N/A";
|
||||||
|
pluginVersion.prmCalculatePrice = "N/A";
|
||||||
|
pluginVersion.prmCalculatePriceConfigUi = "N/A";
|
||||||
|
pluginVersion.tcpZVT = "N/A";
|
||||||
|
|
||||||
|
cash.name = "N/A";
|
||||||
|
cash.blob = "N/A";
|
||||||
|
cash.size = -1;
|
||||||
|
|
||||||
|
conf.name = "N/A";
|
||||||
|
conf.blob = "N/A";
|
||||||
|
conf.size = -1;
|
||||||
|
|
||||||
|
device.size = -1;
|
||||||
|
device.blob = "N/A";
|
||||||
|
device.size = -1;
|
||||||
|
|
||||||
|
for (int i=0; i < 32; ++i) {
|
||||||
|
print[i].size = -1;
|
||||||
|
print[i].blob = "N/A";
|
||||||
|
print[i].size = -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
class IsmasClient : public QObject {
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
int m_progressInPercent;
|
||||||
|
public:
|
||||||
|
explicit IsmasClient() : m_progressInPercent(1) {}
|
||||||
|
|
||||||
|
enum APISM {
|
||||||
|
DB_PORT = 7777,
|
||||||
|
DIRECT_PORT = 7778
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
enum RESULT_CODE {
|
||||||
|
SUCCESS=0,
|
||||||
|
NO_UPDATE_NECESSARY=1,
|
||||||
|
BACKUP_FAILED=2,
|
||||||
|
WRONG_PACKAGE=3,
|
||||||
|
INSTALL_ERROR=4};
|
||||||
|
|
||||||
|
enum REASON {
|
||||||
|
TIME_TRIGGERED = 0,
|
||||||
|
SERVICE,
|
||||||
|
DEV_TEST,
|
||||||
|
ENTRIES
|
||||||
|
};
|
||||||
|
|
||||||
|
static char const *reason[REASON::ENTRIES];
|
||||||
|
|
||||||
|
static std::optional<QString>
|
||||||
|
sendRequestReceiveResponse(int port, QString const &request);
|
||||||
|
|
||||||
|
static QString getReasonForLastSendVersion();
|
||||||
|
|
||||||
|
int getProgressInPercent() const {return m_progressInPercent; }
|
||||||
|
void setProgressInPercent(int procent) { m_progressInPercent = procent; }
|
||||||
|
|
||||||
|
QString updateNewsToIsmas(char const *event,
|
||||||
|
int percent,
|
||||||
|
int resultCode,
|
||||||
|
char const *step,
|
||||||
|
char const *step_result,
|
||||||
|
char const *version);
|
||||||
|
|
||||||
|
QString updateOfPSAStarted(QString const &version = QString()); // start of update process
|
||||||
|
QString cloneAndCheckoutCustomerRepository(QString const &info, QString const &version = QString()); // clone and checkout customer repository
|
||||||
|
QString checkoutBranch(QString const &info, QString const &version = QString()); // checkout branch
|
||||||
|
QString errorBackendNotConnected(QString const &info, QString const &version = QString()); // checkout branch
|
||||||
|
QString errorGitClone(QString const &info, QString const &version = QString());
|
||||||
|
QString backendConnected(QString const &info, QString const &version = QString());
|
||||||
|
QString updateTriggerSet(QString const &info, QString const &version = QString());
|
||||||
|
QString errorUpdateTrigger(QString const &info, QString const &version = QString());
|
||||||
|
QString gitFetch(QString const &info, QString const &version = QString());
|
||||||
|
QString execOpkgCommand(QString const &info, QString const &version = QString());
|
||||||
|
QString rsyncFile(QString const &info, QString const &version = QString());
|
||||||
|
QString errorGitFetch(int resultCode, QString const &info, QString const &version = QString());
|
||||||
|
QString updateOfPSAActivated(QString const &version = QString());
|
||||||
|
// and update accepted
|
||||||
|
QString updateOfPSASucceeded(QString const &version = QString()); // update process succeeded
|
||||||
|
QString updateOfPSAContinues(QString currentStage, QString currentStageInfo, QString const &version = QString());
|
||||||
|
QString updateOfPSAFailed(int resultCode, QString step, QString reason, QString const &version = QString());
|
||||||
|
QString sanityCheckFailed(int resultCode, QString reason, QString const &version = QString());
|
||||||
|
QString jsonParseFailed(int resultCode, QString reason, QString const &version = QString());
|
||||||
|
std::optional<QString> finalResult(int resultCode, QString reason, QString const &version = QString());
|
||||||
|
|
||||||
|
QString updateOfPSASendVersion(PSAInstalled const &psa);
|
||||||
|
|
||||||
|
private:
|
||||||
|
static void printDebugMessage(int port, QString const &clientIP, int clientPort,
|
||||||
|
QString const &message);
|
||||||
|
static void printInfoMessage(int port, QString const &clientIP, int clientPort,
|
||||||
|
QString const &message);
|
||||||
|
static void printErrorMessage(int port, QString const &clientIP, int clientPort,
|
||||||
|
QString const &message);
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ISMAS_CLIENT_H_INCLUDED
|
232
main.cpp
232
main.cpp
@@ -4,15 +4,40 @@
|
|||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
|
|
||||||
#include "message_handler.h"
|
#ifdef __linux__
|
||||||
#include "interfaces.h"
|
#include <stdlib.h> // system()
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "DCPlugin/include/hwapi.h"
|
#include "message_handler.h"
|
||||||
|
#include "plugins/interfaces.h"
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <thread>
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <QSharedMemory>
|
#include <QSharedMemory>
|
||||||
|
#include <QRunnable>
|
||||||
|
#include <QThreadPool>
|
||||||
|
#include <QDir>
|
||||||
|
#include <QProcess>
|
||||||
|
#include <QCommandLineParser>
|
||||||
|
#include <QStandardPaths>
|
||||||
|
#include <QMainWindow>
|
||||||
|
|
||||||
|
#include "update.h"
|
||||||
|
#include "git/git_client.h"
|
||||||
|
#include "ismas/ismas_client.h"
|
||||||
|
#include "worker_thread.h"
|
||||||
|
#include "worker.h"
|
||||||
|
#include "mainwindow.h"
|
||||||
|
#include "utils.h"
|
||||||
|
|
||||||
|
#include <QThread>
|
||||||
|
#include <QtWidgets>
|
||||||
|
#include <QScopedPointer>
|
||||||
|
|
||||||
|
#if defined (Q_OS_UNIX) || defined (Q_OS_LINUX)
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef PTU5
|
#ifdef PTU5
|
||||||
#define SERIAL_PORT "ttymxc2"
|
#define SERIAL_PORT "ttymxc2"
|
||||||
@@ -20,86 +45,145 @@
|
|||||||
#define SERIAL_PORT "ttyUSB0"
|
#define SERIAL_PORT "ttyUSB0"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void updateBinary(std::unique_ptr<hwinf> hw, // update d2dc*.bin
|
|
||||||
char const *fileToSendToDC,
|
|
||||||
char const *baudrate,
|
|
||||||
char const *serialInterface) {
|
|
||||||
for (int i=0; i < 1;++i) {
|
|
||||||
qDebug() << "file to send to DC ..." << fileToSendToDC;
|
|
||||||
qDebug() << "baudrate ............." << baudrate;
|
|
||||||
qDebug() << "serial interface ....." << serialInterface;
|
|
||||||
hw->dc_updateDC(fileToSendToDC, baudrate, serialInterface);
|
|
||||||
std::this_thread::sleep_for(std::chrono::milliseconds(3000));
|
|
||||||
}
|
|
||||||
QCoreApplication::quit();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void updatePrinterConf(std::unique_ptr<hwinf> hw, // update printer-file
|
|
||||||
QVector<int> nrOfTemplate,
|
|
||||||
QVector<QString> fileToSendToDC,
|
|
||||||
QString br, QString serial) {
|
|
||||||
// for (int i = 0; i < 1; ++i) {
|
|
||||||
if (nrOfTemplate.size() == 1 && fileToSendToDC.size() == 1) {
|
|
||||||
hw->dc_updatePrinterTemplate(hwapi::FileTypeJson::PRINTER,
|
|
||||||
nrOfTemplate, fileToSendToDC,
|
|
||||||
br, serial);
|
|
||||||
|
|
||||||
// hw->dc_printTemplate(hwapi::FileTypeJson::PRINTER,
|
|
||||||
// nrOfTemplate, br, serial);
|
|
||||||
}
|
|
||||||
QCoreApplication::quit();
|
|
||||||
}
|
|
||||||
|
|
||||||
// argv[1]: file to send to dc
|
// argv[1]: file to send to dc
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
|
QByteArray const value = qgetenv("LC_ALL");
|
||||||
|
if (value != "C") {
|
||||||
|
qputenv("LC_ALL", "C");
|
||||||
|
}
|
||||||
|
// qputenv("XDG_RUNTIME_DIR", "/run/user/0");
|
||||||
|
|
||||||
|
openlog("ATB-UPDATE", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
|
||||||
|
|
||||||
QApplication a(argc, argv);
|
QApplication a(argc, argv);
|
||||||
|
QApplication::setApplicationName("ATBUpdateTool");
|
||||||
|
QApplication::setApplicationVersion(APP_VERSION);
|
||||||
|
|
||||||
if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
|
if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
|
||||||
atbInstallMessageHandler(atbDebugOutput);
|
atbInstallMessageHandler(atbDebugOutput);
|
||||||
setDebugLevel(QtMsgType::QtDebugMsg);
|
setDebugLevel(LOG_NOTICE);
|
||||||
//setDebugLevel(QtMsgType::QtDebugMsg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (argc != 2) {
|
QCommandLineParser parser;
|
||||||
qCritical() << "Usage: " << argv[0] << "<file to send to dc>";
|
parser.setApplicationDescription("Download tool for downloading device controller firmware, printer json-files and executing opkg-commands.");
|
||||||
return -1;
|
parser.addHelpOption();
|
||||||
|
parser.addVersionOption();
|
||||||
|
|
||||||
|
QCommandLineOption pluginDirectoryOption(QStringList() << "plugin-directory" << "plugin-directory",
|
||||||
|
QCoreApplication::translate("main", "Where to find dc-plugin."),
|
||||||
|
QCoreApplication::translate("main", "directory"));
|
||||||
|
QString const pluginDefault = "/usr/lib";
|
||||||
|
pluginDirectoryOption.setDefaultValue(pluginDefault);
|
||||||
|
parser.addOption(pluginDirectoryOption);
|
||||||
|
|
||||||
|
QCommandLineOption pluginNameOption(QStringList() << "plugin-name" << "plugin-name",
|
||||||
|
QCoreApplication::translate("main", "Name of dc-plugin."),
|
||||||
|
QCoreApplication::translate("main", "directory"));
|
||||||
|
QString const pluginNameDefault = "libCAslave.so";
|
||||||
|
pluginNameOption.setDefaultValue(pluginNameDefault);
|
||||||
|
parser.addOption(pluginNameOption);
|
||||||
|
|
||||||
|
QCommandLineOption noDownloadOption("no-psa-hardware-update",
|
||||||
|
QCoreApplication::translate("main", "Do not update the PSA firmware (json, device-controller)."));
|
||||||
|
parser.addOption(noDownloadOption);
|
||||||
|
|
||||||
|
QCommandLineOption workingDirectoryOption(QStringList() << "working-directory" << "working-directory",
|
||||||
|
QCoreApplication::translate("main", "working directory of update-script."),
|
||||||
|
QCoreApplication::translate("main", "directory"));
|
||||||
|
QString const workingDirectoryDefault = "/opt/app/tools/atbupdate";
|
||||||
|
workingDirectoryOption.setDefaultValue(workingDirectoryDefault);
|
||||||
|
parser.addOption(workingDirectoryOption);
|
||||||
|
|
||||||
|
QCommandLineOption dryRunOption(QStringList() << "d" << "dry-run",
|
||||||
|
QCoreApplication::translate("main", "Start ATBUpdateTool in dry-run-mode. No actual actions."));
|
||||||
|
parser.addOption(dryRunOption);
|
||||||
|
|
||||||
|
QCommandLineOption extendedVersionOption(QStringList() << "V" << "extended-version",
|
||||||
|
QCoreApplication::translate("main", "Show extended version (including last git commit)."));
|
||||||
|
parser.addOption(extendedVersionOption);
|
||||||
|
|
||||||
|
QCommandLineOption yoctoVersionOption(QStringList() << "y" << "yocto-version",
|
||||||
|
QCoreApplication::translate("main", "Show yocto version of ATBUpdateTool."));
|
||||||
|
parser.addOption(yoctoVersionOption);
|
||||||
|
|
||||||
|
QCommandLineOption yoctoInstallStatusOption(QStringList() << "Y" << "yocto-install",
|
||||||
|
QCoreApplication::translate("main", "Show yocto install status of ATBUpdateTool."));
|
||||||
|
parser.addOption(yoctoInstallStatusOption);
|
||||||
|
|
||||||
|
// Process the actual command line arguments given by the user
|
||||||
|
parser.process(a);
|
||||||
|
QString plugInDir = parser.value(pluginDirectoryOption);
|
||||||
|
QString plugInName = parser.value(pluginNameOption);
|
||||||
|
QString workingDir = parser.value(workingDirectoryOption);
|
||||||
|
bool const dryRun = parser.isSet(dryRunOption);
|
||||||
|
bool const noUpdatePsaHardware = parser.isSet(noDownloadOption);
|
||||||
|
bool const showYoctoVersion = parser.isSet(yoctoVersionOption);
|
||||||
|
bool const showYoctoInstallStatus = parser.isSet(yoctoInstallStatusOption);
|
||||||
|
bool const showExtendedVersion = parser.isSet(extendedVersionOption);
|
||||||
|
QString const rtPath = QCoreApplication::applicationDirPath();
|
||||||
|
|
||||||
|
int machineNr = Utils::read1stLineOfFile("/etc/machine_nr");
|
||||||
|
int customerNr = Utils::read1stLineOfFile("/etc/cust_nr");
|
||||||
|
int zoneNr = Utils::read1stLineOfFile("/etc/zone_nr");
|
||||||
|
QString const branchName = (zoneNr != 0)
|
||||||
|
? QString("zg1/zone%1").arg(zoneNr) : "master";
|
||||||
|
|
||||||
|
QThread::currentThread()->setObjectName("main thread");
|
||||||
|
qInfo() << "Main thread" << QThread::currentThreadId();
|
||||||
|
|
||||||
|
if (showExtendedVersion) {
|
||||||
|
printf(APP_EXTENDED_VERSION"\n");
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<hwinf> hw(new hwapi());
|
if (showYoctoVersion) {
|
||||||
QFileInfo fileInfo(argv[1]);
|
printf("%s\n", Worker::getATBUpdateToolYoctoVersion().toStdString().c_str());
|
||||||
QString fname(fileInfo.fileName());
|
return 0;
|
||||||
int ret = 0;
|
|
||||||
|
|
||||||
if (fname.startsWith("dc") && fname.endsWith(".bin")) {
|
|
||||||
std::thread t(updateBinary, std::move(hw),
|
|
||||||
fname.toStdString().c_str(), "115200", SERIAL_PORT);
|
|
||||||
ret = a.exec();
|
|
||||||
t.join();
|
|
||||||
} else {
|
|
||||||
if (fname.startsWith("DC2C_print") && fname.endsWith(".json")) {
|
|
||||||
qDebug() << "downloading" << fname << "to dc...";
|
|
||||||
|
|
||||||
QVector<QString> fnames;
|
|
||||||
QVector<int> templateIdx;
|
|
||||||
|
|
||||||
int const nrOfTemplate = fname.midRef(10, 2).toInt();
|
|
||||||
if (nrOfTemplate <= 0 && nrOfTemplate > 32) {
|
|
||||||
qCritical() << "wrong template number" << nrOfTemplate;
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
fnames.append(fname);
|
|
||||||
templateIdx.append(nrOfTemplate);
|
|
||||||
|
|
||||||
std::thread t(updatePrinterConf, std::move(hw),
|
|
||||||
templateIdx,
|
|
||||||
fnames,
|
|
||||||
"115200", SERIAL_PORT);
|
|
||||||
|
|
||||||
ret = a.exec();
|
|
||||||
t.join();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
if (showYoctoInstallStatus) {
|
||||||
|
printf("%s\n", Worker::getATBUpdateToolYoctoInstallationStatus().toStdString().c_str());
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!QDir(plugInDir).exists()) {
|
||||||
|
qCritical() << plugInDir
|
||||||
|
<< "does not exists, but has to contain dc-library";
|
||||||
|
exit(-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
qInfo() << "pwd ......................" << rtPath;
|
||||||
|
qInfo() << "plugInDir ................" << plugInDir;
|
||||||
|
qInfo() << "plugInName ..............." << plugInName;
|
||||||
|
qInfo() << "workingDir ..............." << workingDir;
|
||||||
|
qInfo() << "dryRun ..................." << dryRun;
|
||||||
|
qInfo() << "noUpdatePsaHardware ......" << noUpdatePsaHardware;
|
||||||
|
qInfo() << "extended-version ........." << APP_EXTENDED_VERSION;
|
||||||
|
//qInfo() << "yocto-version ............" << Worker::getATBUpdateToolYoctoVersion();
|
||||||
|
//qInfo() << "yocto-install-status ....." << Worker::getATBUpdateToolYoctoInstallationStatus();
|
||||||
|
|
||||||
|
// before loading the library, delete all possible shared memory segments
|
||||||
|
#if defined Q_OS_LINUX || defined Q_OS_UNIX
|
||||||
|
// system("rm -rf /tmp/qipc*");
|
||||||
|
#else
|
||||||
|
#error "Only tested under UNIX/LINUX"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
Worker worker(customerNr,
|
||||||
|
machineNr,
|
||||||
|
zoneNr,
|
||||||
|
branchName,
|
||||||
|
plugInDir,
|
||||||
|
plugInName,
|
||||||
|
workingDir,
|
||||||
|
noUpdatePsaHardware,
|
||||||
|
dryRun);
|
||||||
|
|
||||||
|
MainWindow mw(&worker);
|
||||||
|
worker.setMainWindow(&mw);
|
||||||
|
|
||||||
|
mw.setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
|
||||||
|
mw.showFullScreen();
|
||||||
|
|
||||||
|
return a.exec();
|
||||||
}
|
}
|
||||||
|
81
main.cpp.bck
Normal file
81
main.cpp.bck
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
#include <QCoreApplication>
|
||||||
|
#include <QApplication>
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QTimer>
|
||||||
|
#include <QFileInfo>
|
||||||
|
|
||||||
|
#include "message_handler.h"
|
||||||
|
#include "plugins/interfaces.h"
|
||||||
|
|
||||||
|
#include "DCPlugin/include/hwapi.h"
|
||||||
|
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <thread>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
|
static void updateBinary(std::unique_ptr<hwinf> hw, // update d2dc*.bin
|
||||||
|
char const *fileToSendToDC,
|
||||||
|
char const *baudrate,
|
||||||
|
char const *serialInterface) {
|
||||||
|
for (int i=0; i < 1;++i) {
|
||||||
|
hw->dc_updateDC(fileToSendToDC, baudrate, serialInterface);
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(3000));
|
||||||
|
}
|
||||||
|
QCoreApplication::quit();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void updatePrinterConf(std::unique_ptr<hwinf> hw, // update printer-file
|
||||||
|
char const *fileToSendToDC,
|
||||||
|
char const *baudrate,
|
||||||
|
char const *serialInterface) {
|
||||||
|
for (int i=0; i < 1;++i) {
|
||||||
|
hw->dc_updateDC(fileToSendToDC, baudrate, serialInterface);
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(3000));
|
||||||
|
}
|
||||||
|
QCoreApplication::quit();
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char *argv[]) {
|
||||||
|
QApplication a(argc, argv);
|
||||||
|
|
||||||
|
if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
|
||||||
|
atbInstallMessageHandler(atbDebugOutput);
|
||||||
|
setDebugLevel(QtMsgType::QtDebugMsg);
|
||||||
|
//setDebugLevel(QtMsgType::QtDebugMsg);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (argc > 2) {
|
||||||
|
qCritical() << "Usage: " << argv[0] << "<file to send to dc>";
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<hwinf> hw(new hwapi());
|
||||||
|
QFileInfo fileInfo(argv[1]);
|
||||||
|
QString fname(fileInfo.fileName());
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
|
if (fname.startsWith("dc") && fname.endsWith(".bin")) {
|
||||||
|
#ifdef PTU5
|
||||||
|
std::thread t(updateBinary, std::move(hw),
|
||||||
|
fname.toStdString().c_str(), "115200", "ttymxc2");
|
||||||
|
#else
|
||||||
|
std::thread t(updateBinary, std::move(hw),
|
||||||
|
fname.toStdString().c_str(), "115200", "ttyUSB0");
|
||||||
|
#endif
|
||||||
|
ret = a.exec();
|
||||||
|
t.join();
|
||||||
|
} else
|
||||||
|
if (fname.startsWith("DC") && fname.endsWith(".json")) {
|
||||||
|
#ifdef PTU5
|
||||||
|
std::thread t(updatePrinterConf, std::move(hw),
|
||||||
|
fname.toStdString().c_str(), "115200", "ttymxc2");
|
||||||
|
#else
|
||||||
|
std::thread t(updatePrinterConf, std::move(hw),
|
||||||
|
fname.toStdString().c_str(), "115200", "ttyUSB0");
|
||||||
|
#endif
|
||||||
|
ret = a.exec();
|
||||||
|
t.join();
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
54
main.cpp.bck2
Normal file
54
main.cpp.bck2
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
#include <QCoreApplication>
|
||||||
|
#include <QApplication>
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QTimer>
|
||||||
|
#include <QFileInfo>
|
||||||
|
|
||||||
|
#include "message_handler.h"
|
||||||
|
#include "interfaces.h"
|
||||||
|
#include "DCPlugin/include/hwapi.h"
|
||||||
|
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <thread>
|
||||||
|
#include <memory>
|
||||||
|
#include <QSharedMemory>
|
||||||
|
#include <QRunnable>
|
||||||
|
#include <QThreadPool>
|
||||||
|
#include <QDir>
|
||||||
|
|
||||||
|
#include "update.h"
|
||||||
|
#include "worker_thread.h"
|
||||||
|
#include "worker.h"
|
||||||
|
|
||||||
|
#ifdef PTU5
|
||||||
|
#define SERIAL_PORT "ttymxc2"
|
||||||
|
#else
|
||||||
|
#define SERIAL_PORT "ttyUSB0"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// argv[1]: file to send to dc
|
||||||
|
int main(int argc, char *argv[]) {
|
||||||
|
QApplication a(argc, argv);
|
||||||
|
|
||||||
|
if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
|
||||||
|
atbInstallMessageHandler(atbDebugOutput);
|
||||||
|
setDebugLevel(QtMsgType::QtDebugMsg);
|
||||||
|
//setDebugLevel(QtMsgType::QtDebugMsg);
|
||||||
|
}
|
||||||
|
|
||||||
|
QByteArray const value = qgetenv("XDG_RUNTIME_DIR");
|
||||||
|
if (value.size() == 0) {
|
||||||
|
qputenv("XDG_RUNTIME_DIR", "/run/user/0");
|
||||||
|
}
|
||||||
|
|
||||||
|
QString const update_ctrl_file = "/opt/app/tools/atbupdate/update_log.csv";
|
||||||
|
QString const workingDir = (argc == 2) ? argv[1] : ".";
|
||||||
|
|
||||||
|
Worker worker(update_ctrl_file, workingDir);
|
||||||
|
|
||||||
|
qCritical() << "starting main event loop";
|
||||||
|
int ret = a.exec();
|
||||||
|
qCritical() << "stopping main event loop" << ret;
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
62
main.cpp.bck3
Normal file
62
main.cpp.bck3
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
#include <QCoreApplication>
|
||||||
|
#include <QApplication>
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QTimer>
|
||||||
|
#include <QFileInfo>
|
||||||
|
|
||||||
|
#include "message_handler.h"
|
||||||
|
#include "plugins/interfaces.h"
|
||||||
|
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <thread>
|
||||||
|
#include <memory>
|
||||||
|
#include <QSharedMemory>
|
||||||
|
#include <QRunnable>
|
||||||
|
#include <QThreadPool>
|
||||||
|
#include <QDir>
|
||||||
|
|
||||||
|
#include "update.h"
|
||||||
|
#include "worker_thread.h"
|
||||||
|
#include "worker.h"
|
||||||
|
|
||||||
|
#include <thread>
|
||||||
|
|
||||||
|
#ifdef PTU5
|
||||||
|
#define SERIAL_PORT "ttymxc2"
|
||||||
|
#else
|
||||||
|
#define SERIAL_PORT "ttyUSB0"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static void doWork(QString update_ctrl_file, QString workingDir) {
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(2000));
|
||||||
|
Update update(update_ctrl_file, workingDir);
|
||||||
|
update.doUpdate();
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(2000));
|
||||||
|
QCoreApplication::quit();
|
||||||
|
}
|
||||||
|
|
||||||
|
// argv[1]: file to send to dc
|
||||||
|
int main(int argc, char *argv[]) {
|
||||||
|
QApplication a(argc, argv);
|
||||||
|
|
||||||
|
if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
|
||||||
|
atbInstallMessageHandler(atbDebugOutput);
|
||||||
|
setDebugLevel(QtMsgType::QtDebugMsg);
|
||||||
|
//setDebugLevel(QtMsgType::QtDebugMsg);
|
||||||
|
}
|
||||||
|
|
||||||
|
QByteArray const value = qgetenv("XDG_RUNTIME_DIR");
|
||||||
|
if (value.size() == 0) {
|
||||||
|
qputenv("XDG_RUNTIME_DIR", "/run/user/0");
|
||||||
|
}
|
||||||
|
|
||||||
|
// QString const update_ctrl_file = "/opt/app/tools/atbupdate/update_log.csv";
|
||||||
|
// QString const workingDir = (argc == 2) ? argv[1] : ".";
|
||||||
|
|
||||||
|
// std::thread t(doWork, update_ctrl_file, workingDir);
|
||||||
|
|
||||||
|
int ret = a.exec();
|
||||||
|
// t.join();
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
305
mainwindow.cpp
Normal file
305
mainwindow.cpp
Normal file
@@ -0,0 +1,305 @@
|
|||||||
|
#include "mainwindow.h"
|
||||||
|
#include "ui_mainwindow.h"
|
||||||
|
#include "worker.h"
|
||||||
|
#include "utils.h"
|
||||||
|
#include "progress_event.h"
|
||||||
|
#include "update_dc_event.h"
|
||||||
|
#include "plugins/interfaces.h"
|
||||||
|
|
||||||
|
#include <QDateTime>
|
||||||
|
#include <QMessageBox>
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QScrollBar>
|
||||||
|
#include <QEvent>
|
||||||
|
|
||||||
|
|
||||||
|
MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
||||||
|
: QMainWindow(parent)
|
||||||
|
, ui(new Ui::MainWindow)
|
||||||
|
, m_worker(worker)
|
||||||
|
, m_width(70)
|
||||||
|
, m_progressRunning(false)
|
||||||
|
, m_updateStep(UpdateDcEvent::UpdateStep::NONE) {
|
||||||
|
|
||||||
|
this->setStatusBar(new QStatusBar(this));
|
||||||
|
QFont f;
|
||||||
|
f.setStyleHint(QFont::Monospace);
|
||||||
|
f.setWeight(QFont::Bold);
|
||||||
|
f.setFamily("Misc Fixed");
|
||||||
|
f.setPixelSize(12);
|
||||||
|
this->statusBar()->setFont(f);
|
||||||
|
|
||||||
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
ui->updateProgress->setRange(0, 100);
|
||||||
|
ui->updateProgress->reset();
|
||||||
|
|
||||||
|
QStringList lst;
|
||||||
|
QString start = QDateTime::currentDateTime().toString(Qt::ISODate);
|
||||||
|
lst << QString("Start: ") + start.leftJustified(m_width-10);
|
||||||
|
lst << QString("").leftJustified(m_width-3, '=');
|
||||||
|
lst << QString("Update tool version: %1 - %2 %3").arg(APP_VERSION).arg(APP_BUILD_DATE).arg(APP_BUILD_TIME).leftJustified(m_width-3);
|
||||||
|
lst << QString("Machine number : %1 ").arg(m_worker->machineNr()).leftJustified(m_width-3);
|
||||||
|
lst << QString("Customer number : %1 ").arg(m_worker->customerNr()).leftJustified(m_width-3);
|
||||||
|
lst << QString("Zone number : %1 (%2)").arg(m_worker->zoneNr()).arg(Utils::zoneName(m_worker->zoneNr())).leftJustified(m_width-3);
|
||||||
|
lst << QString("APISM version : %1").arg(m_worker->apismVersion()).leftJustified(m_width-3);
|
||||||
|
lst << QString("").leftJustified(m_width-3, '=');
|
||||||
|
|
||||||
|
ui->updateStatus->setText(lst.join('\n'));
|
||||||
|
ui->updateStatus->setEnabled(true);
|
||||||
|
// ui->updateStatus->installEventFilter(this);
|
||||||
|
|
||||||
|
m_startTimer = new QTimer(this);
|
||||||
|
connect(m_startTimer, SIGNAL(timeout()), m_worker, SLOT(start()));
|
||||||
|
m_startTimer->setSingleShot(true);
|
||||||
|
m_startTimer->start(1000);
|
||||||
|
|
||||||
|
m_exitTimer = new QTimer(this);
|
||||||
|
connect(m_exitTimer, SIGNAL(timeout()), ui->exit, SLOT(click()));
|
||||||
|
m_exitTimer->setSingleShot(true);
|
||||||
|
m_exitTimer->start(1800 * 1000);
|
||||||
|
|
||||||
|
connect(ui->exit, SIGNAL(clicked()),this,SLOT(onQuit()));
|
||||||
|
connect(m_worker, SIGNAL(disableExit()),this,SLOT(onDisableExit()));
|
||||||
|
connect(m_worker, SIGNAL(enableExit()),this,SLOT(onEnableExit()));
|
||||||
|
connect(m_worker, SIGNAL(stopStartTimer()),this,SLOT(onStopStartTimer()));
|
||||||
|
connect(m_worker, SIGNAL(restartExitTimer()),this,SLOT(onRestartExitTimer()));
|
||||||
|
connect(m_worker, SIGNAL(appendText(QString,QString)),this,SLOT(onAppendText(QString,QString)));
|
||||||
|
connect(m_worker, SIGNAL(showErrorMessage(QString,QString)),this, SLOT(onShowErrorMessage(QString,QString)));
|
||||||
|
connect(m_worker, SIGNAL(showStatusMessage(QString,QString)),this, SLOT(onShowStatusMessage(QString,QString)));
|
||||||
|
connect(m_worker, SIGNAL(showErrorMessage(QStringList)),this, SLOT(onShowErrorMessage(QStringList)));
|
||||||
|
connect(m_worker, SIGNAL(showStatusMessage(QString,QString)),this, SLOT(onShowStatusMessage(QString,QString)));
|
||||||
|
connect(m_worker, SIGNAL(replaceLast(QString,QString)),this,SLOT(onReplaceLast(QString,QString)));
|
||||||
|
connect(m_worker, SIGNAL(replaceLast(QStringList,QString)),this, SLOT(onReplaceLast(QStringList,QString)));
|
||||||
|
}
|
||||||
|
|
||||||
|
MainWindow::~MainWindow() {
|
||||||
|
delete m_startTimer;
|
||||||
|
delete m_exitTimer;
|
||||||
|
delete ui;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::customEvent(QEvent *event) {
|
||||||
|
if (event->type() == ProgressEvent::type()) {
|
||||||
|
ProgressEvent *pevent = (ProgressEvent *)event;
|
||||||
|
int const progress = pevent->progressPercent();
|
||||||
|
QObject const *sender = pevent->sender();
|
||||||
|
if (sender == this) {
|
||||||
|
switch(progress) {
|
||||||
|
case 0: {
|
||||||
|
ui->updateProgress->reset();
|
||||||
|
} break;
|
||||||
|
case START_PROGRESS_LOOP: {
|
||||||
|
m_progressRunning = true;
|
||||||
|
ui->updateProgress->reset();
|
||||||
|
// m_progressValue = 10;
|
||||||
|
QApplication::postEvent(this, new ProgressEvent(this, 1));
|
||||||
|
} break;
|
||||||
|
case STOP_PROGRESS_LOOP: {
|
||||||
|
m_progressRunning = false;
|
||||||
|
// m_progressValue -= 10;
|
||||||
|
// m_worker->setProgress(m_progressValue/10);
|
||||||
|
} break;
|
||||||
|
default: {
|
||||||
|
if (m_progressRunning) {
|
||||||
|
// m_progressValue = progress;
|
||||||
|
ui->updateProgress->setValue(progress);
|
||||||
|
// ueberpruefen: hauptfenster schickt sich selber ein event
|
||||||
|
// QApplication::postEvent(this, new ProgressEvent(this, progress));
|
||||||
|
// QThread::msleep(500);
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
if (sender == m_worker) {
|
||||||
|
switch(progress) {
|
||||||
|
case 0: {
|
||||||
|
ui->updateProgress->reset();
|
||||||
|
} break;
|
||||||
|
case START_PROGRESS_LOOP: {
|
||||||
|
QApplication::postEvent(this, new ProgressEvent(this, START_PROGRESS_LOOP));
|
||||||
|
} break;
|
||||||
|
case STOP_PROGRESS_LOOP: {
|
||||||
|
QApplication::postEvent(this, new ProgressEvent(this, STOP_PROGRESS_LOOP));
|
||||||
|
} break;
|
||||||
|
default:{
|
||||||
|
ui->updateProgress->setValue(progress);
|
||||||
|
}}
|
||||||
|
} else {
|
||||||
|
qCritical() << "!!! UNKNOWN SENDER !!!";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QThread::yieldCurrentThread();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onStopStartTimer() {
|
||||||
|
m_startTimer->stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onDisableExit() {
|
||||||
|
ui->exit->setEnabled(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onEnableExit() {
|
||||||
|
ui->exit->setEnabled(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onRestartExitTimer() {
|
||||||
|
m_exitTimer->stop();
|
||||||
|
m_exitTimer->start(60 * 1000);
|
||||||
|
|
||||||
|
scrollDownTextEdit();
|
||||||
|
ui->updateStatus->setEnabled(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onQuit() {
|
||||||
|
m_exitTimer->stop();
|
||||||
|
int errorCode = 0;
|
||||||
|
|
||||||
|
qCritical()
|
||||||
|
<< QString("ON QUIT: CURRENT STEP %1")
|
||||||
|
.arg(m_worker->getSmap()[m_worker->currentStep()]);
|
||||||
|
|
||||||
|
// TODO: replace SEND_LAST_VERSION with UPDATE_SUCCEEDED
|
||||||
|
if (m_worker->currentStep() != Worker::UPDATE_STEP::SEND_LAST_VERSION) {
|
||||||
|
errorCode = -1;
|
||||||
|
}
|
||||||
|
qCritical() << QString("ON QUIT: EXIT CODE %1").arg(errorCode);
|
||||||
|
qApp->exit(errorCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::scrollDownTextEdit() {
|
||||||
|
// Utils::printInfoMsg(QString("SCROLL-DOWN-TEXT_EDIT CALLED AT ")
|
||||||
|
// + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
|
||||||
|
|
||||||
|
ui->updateStatus->setEnabled(true);
|
||||||
|
|
||||||
|
QTextCursor tmpCursor = ui->updateStatus->textCursor();
|
||||||
|
tmpCursor.movePosition(QTextCursor::End);
|
||||||
|
ui->updateStatus->setTextCursor(tmpCursor);
|
||||||
|
ui->updateStatus->ensureCursorVisible();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onAppendText(QString text, QString suffix) {
|
||||||
|
// Utils::printInfoMsg(QString("ON APPEND CALLED AT ")
|
||||||
|
// + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
|
||||||
|
|
||||||
|
QString editText = ui->updateStatus->toPlainText();
|
||||||
|
scrollDownTextEdit();
|
||||||
|
|
||||||
|
if (!suffix.isNull() && suffix.size() > 0) {
|
||||||
|
//qInfo() << "TEXT" << text << "SUFFIX" << suffix;
|
||||||
|
if (suffix == Worker::UPDATE_STEP_SUCCESS || suffix == Worker::UPDATE_STEP_FAIL) {
|
||||||
|
ui->updateStatus->insertPlainText(QString("\n").leftJustified(m_width-3, '=') + " ");
|
||||||
|
// editText += QString("\n").leftJustified(m_width-3, '=');
|
||||||
|
// editText += " ";
|
||||||
|
}
|
||||||
|
QString const &add = (QString("\n") + text).leftJustified(m_width - (2 + suffix.size())) + suffix;
|
||||||
|
ui->updateStatus->insertPlainText(add);
|
||||||
|
// editText += add;
|
||||||
|
} else {
|
||||||
|
QString const &add = text.leftJustified(m_width-9);
|
||||||
|
ui->updateStatus->insertPlainText(add);
|
||||||
|
//editText += add;
|
||||||
|
}
|
||||||
|
|
||||||
|
// debug
|
||||||
|
// QString editText = ui->updateStatus->toPlainText();
|
||||||
|
// Utils::printLineEditInfo(editText.split('\n', QString::SplitBehavior::SkipEmptyParts));
|
||||||
|
// ui->updateStatus->setText(editText.trimmed());
|
||||||
|
|
||||||
|
// scrollDownTextEdit();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onReplaceLast(QStringList newTextLines, QString suffix) {
|
||||||
|
// Utils::printInfoMsg(QString("ON REPLACE LAST (LIST) CALLED AT ")
|
||||||
|
// + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
|
||||||
|
|
||||||
|
int const s = newTextLines.size();
|
||||||
|
if (s > 0) {
|
||||||
|
QString editText = ui->updateStatus->toPlainText();
|
||||||
|
QStringList lines = editText.split('\n', QString::SplitBehavior::SkipEmptyParts);
|
||||||
|
QString newText;
|
||||||
|
if (lines.size() >= s) {
|
||||||
|
for (int i = 0; i < s; ++i) {
|
||||||
|
lines.removeLast();
|
||||||
|
}
|
||||||
|
if (lines.size() > 0) {
|
||||||
|
newText = lines.join('\n');
|
||||||
|
newText += '\n';
|
||||||
|
}
|
||||||
|
QStringList newLines;
|
||||||
|
for (int i = 0; i < s; ++i) {
|
||||||
|
if (i == 0 && !suffix.isNull() && suffix.size() > 0 && suffix != "\n") {
|
||||||
|
newLines += Utils::rstrip(newTextLines.at(i).leftJustified(m_width-10) + suffix);
|
||||||
|
} else {
|
||||||
|
newLines += Utils::rstrip(newTextLines.at(i).leftJustified(m_width-10));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lines += newLines;
|
||||||
|
newText += newLines.join(' ');
|
||||||
|
}
|
||||||
|
|
||||||
|
ui->updateStatus->setText(newText);
|
||||||
|
Utils::printLineEditInfo(lines);
|
||||||
|
scrollDownTextEdit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onReplaceLast(QString text, QString suffix) {
|
||||||
|
// Utils::printInfoMsg(QString("ON REPLACE LAST (TEXT) CALLED AT ")
|
||||||
|
// + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
|
||||||
|
|
||||||
|
QString editText = ui->updateStatus->toPlainText();
|
||||||
|
QStringList lines = editText.split('\n', QString::SplitBehavior::SkipEmptyParts);
|
||||||
|
if (lines.size() > 0) {
|
||||||
|
lines.removeLast();
|
||||||
|
if (!suffix.isNull() && suffix.size() > 0 && suffix != "\n") {
|
||||||
|
QString const add = text.leftJustified(m_width-10) + suffix;
|
||||||
|
if (!add.isEmpty()) {
|
||||||
|
lines += text.leftJustified(m_width-10) + suffix;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
QString const add = text.leftJustified(m_width-10);
|
||||||
|
if (!add.isEmpty()) {
|
||||||
|
lines += text.leftJustified(m_width-10);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Utils::printLineEditInfo(lines);
|
||||||
|
ui->updateStatus->setText(lines.join('\n').trimmed());
|
||||||
|
scrollDownTextEdit();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onShowMessage(QString title, QString text) {
|
||||||
|
this->statusBar()->clearMessage();
|
||||||
|
this->statusBar()->showMessage( // timeout: 10000
|
||||||
|
QString(title + " " + text).leftJustified(80, ' '), 10000);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onShowErrorMessage(QString title, QString text) {
|
||||||
|
onShowMessage(title, text);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onShowStatusMessage(QString title, QString text) {
|
||||||
|
onShowMessage(title, text);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onShowErrorMessage(QStringList lst) {
|
||||||
|
if (lst.size() >= 2) {
|
||||||
|
onShowMessage(lst.at(0), lst.at(1));
|
||||||
|
}
|
||||||
|
if (lst.size() == 1) {
|
||||||
|
onShowMessage(lst.at(0), "");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onShowStatusMessage(QStringList lst) {
|
||||||
|
if (lst.size() >= 2) {
|
||||||
|
onShowMessage(lst.at(0), lst.at(1));
|
||||||
|
}
|
||||||
|
if (lst.size() == 1) {
|
||||||
|
onShowMessage(lst.at(0), "");
|
||||||
|
}
|
||||||
|
}
|
77
mainwindow.h
Normal file
77
mainwindow.h
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
#ifndef MAINWINDOW_H
|
||||||
|
#define MAINWINDOW_H
|
||||||
|
|
||||||
|
#include <QMainWindow>
|
||||||
|
#include <QTimer>
|
||||||
|
#include <QStatusBar>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
namespace Ui { class MainWindow; }
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#include "worker.h"
|
||||||
|
#include "update.h"
|
||||||
|
#include "update_dc_event.h"
|
||||||
|
|
||||||
|
#define EMERGENCY_LEAVE_BL 0
|
||||||
|
|
||||||
|
class hwinf;
|
||||||
|
class MainWindow : public QMainWindow {
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void customEvent(QEvent *event) override;
|
||||||
|
|
||||||
|
public:
|
||||||
|
MainWindow(Worker *worker, QWidget *parent = nullptr);
|
||||||
|
~MainWindow();
|
||||||
|
|
||||||
|
static const int START_PROGRESS_LOOP = -1;
|
||||||
|
static const int STOP_PROGRESS_LOOP = -2;
|
||||||
|
static const int BL_START_COUNT = 5;
|
||||||
|
static const int BL_CHECK_COUNT = 5;
|
||||||
|
static const int BL_IS_UP_COUNT = 5;
|
||||||
|
static const int BL_STOP_COUNT = 5;
|
||||||
|
|
||||||
|
UpdateDcEvent::UpdateStep updateStep() const { return m_updateStep; }
|
||||||
|
void setUpdateStep(UpdateDcEvent::UpdateStep updateStep) { m_updateStep = updateStep; }
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
void onAppendText(QString, QString suffix = "");
|
||||||
|
void onReplaceLast(QStringList, QString suffix = "");
|
||||||
|
void onReplaceLast(QString, QString suffix = "");
|
||||||
|
void onShowErrorMessage(QString, QString);
|
||||||
|
void onShowStatusMessage(QString, QString);
|
||||||
|
void onShowErrorMessage(QStringList);
|
||||||
|
void onShowStatusMessage(QStringList);
|
||||||
|
void onStopStartTimer();
|
||||||
|
void onRestartExitTimer();
|
||||||
|
void onEnableExit();
|
||||||
|
void onDisableExit();
|
||||||
|
#if EMERGENCY_LEAVE_BL==1
|
||||||
|
void emergencyLeaveBL();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
signals:
|
||||||
|
|
||||||
|
#if EMERGENCY_LEAVE_BL==1
|
||||||
|
void leaveBL();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void onQuit();
|
||||||
|
|
||||||
|
private:
|
||||||
|
void scrollDownTextEdit();
|
||||||
|
void onShowMessage(QString, QString);
|
||||||
|
|
||||||
|
Ui::MainWindow *ui;
|
||||||
|
Worker *m_worker;
|
||||||
|
int const m_width;
|
||||||
|
QTimer *m_startTimer;
|
||||||
|
QTimer *m_exitTimer;
|
||||||
|
bool m_progressRunning;
|
||||||
|
//int m_progressValue;
|
||||||
|
UpdateDcEvent::UpdateStep m_updateStep;
|
||||||
|
};
|
||||||
|
#endif // MAINWINDOW_H
|
75
mainwindow.ui
Normal file
75
mainwindow.ui
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<ui version="4.0">
|
||||||
|
<class>MainWindow</class>
|
||||||
|
<widget class="QMainWindow" name="MainWindow">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>0</x>
|
||||||
|
<y>0</y>
|
||||||
|
<width>800</width>
|
||||||
|
<height>480</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="font">
|
||||||
|
<font>
|
||||||
|
<family>Source Code Pro</family>
|
||||||
|
</font>
|
||||||
|
</property>
|
||||||
|
<property name="windowTitle">
|
||||||
|
<string>MainWindow</string>
|
||||||
|
</property>
|
||||||
|
<widget class="QWidget" name="centralwidget">
|
||||||
|
<widget class="QWidget" name="layoutWidget">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>10</x>
|
||||||
|
<y>10</y>
|
||||||
|
<width>781</width>
|
||||||
|
<height>441</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
|
<item row="3" column="2">
|
||||||
|
<widget class="QPushButton" name="exit">
|
||||||
|
<property name="text">
|
||||||
|
<string>Exit</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="1">
|
||||||
|
<widget class="QProgressBar" name="updateProgress">
|
||||||
|
<property name="value">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0" rowspan="3" colspan="3">
|
||||||
|
<widget class="QTextEdit" name="updateStatus">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="font">
|
||||||
|
<font>
|
||||||
|
<family>Misc Fixed</family>
|
||||||
|
<pointsize>11</pointsize>
|
||||||
|
<bold>true</bold>
|
||||||
|
</font>
|
||||||
|
</property>
|
||||||
|
<property name="verticalScrollBarPolicy">
|
||||||
|
<enum>Qt::ScrollBarAsNeeded</enum>
|
||||||
|
</property>
|
||||||
|
<property name="horizontalScrollBarPolicy">
|
||||||
|
<enum>Qt::ScrollBarAsNeeded</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeAdjustPolicy">
|
||||||
|
<enum>QAbstractScrollArea::AdjustToContents</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</widget>
|
||||||
|
</widget>
|
||||||
|
<resources/>
|
||||||
|
<connections/>
|
||||||
|
</ui>
|
@@ -2,15 +2,17 @@
|
|||||||
|
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
#include <QString>
|
||||||
#define OUTPUT_LEN (20)
|
#include <QFileInfo>
|
||||||
|
#include <QMessageLogContext>
|
||||||
|
|
||||||
|
|
||||||
|
static char const *DBG_NAME[] = { "DBG ", "WARN ", "CRIT ", "FATAL", "INFO " };
|
||||||
static bool installedMsgHandler = false;
|
static bool installedMsgHandler = false;
|
||||||
static QtMsgType debugLevel = QtInfoMsg;
|
static int debugLevel = LOG_NOTICE;
|
||||||
|
|
||||||
QtMsgType getDebugLevel() { return debugLevel; }
|
int getDebugLevel() { return debugLevel; }
|
||||||
void setDebugLevel(QtMsgType newDebugLevel) {
|
void setDebugLevel(int newDebugLevel) {
|
||||||
debugLevel = newDebugLevel;
|
debugLevel = newDebugLevel;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,108 +43,53 @@ QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
|
|||||||
/// return app.exec();
|
/// return app.exec();
|
||||||
/// }
|
/// }
|
||||||
///
|
///
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
|
#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
||||||
void atbDebugOutput(QtMsgType type, const char *msg) {
|
|
||||||
switch (type) {
|
|
||||||
case QtDebugMsg: {
|
|
||||||
if (debugLevel <= QtDebugMsg) {
|
|
||||||
fprintf(stderr, "%*.*s Debug: %s\n", OUTPUT_LEN, OUTPUT_LEN,
|
|
||||||
QDateTime::currentDateTime().toString(Qt::ISODate).toStdString().c_str(), msg);
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case QtInfoMsg: {
|
|
||||||
if (debugLevel <= QtInfoMsg) {
|
|
||||||
fprintf(stderr, "%*.*s Info: %s\n", OUTPUT_LEN, OUTPUT_LEN,
|
|
||||||
QDateTime::currentDateTime().toString(Qt::ISODate).toStdString().c_str(), msg);
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case QtWarningMsg: {
|
|
||||||
if (debugLevel <= QtWarningMsg) {
|
|
||||||
fprintf(stderr, "%*.*s Warning: %s\n", OUTPUT_LEN, OUTPUT_LEN,
|
|
||||||
QDateTime::currentDateTime().toString(Qt::ISODate).toStdString().c_str(), msg);
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case QtCriticalMsg: {
|
|
||||||
if (debugLevel <= QtCriticalMsg) {
|
|
||||||
fprintf(stderr, "%*.*s Critical: %s\n", OUTPUT_LEN, OUTPUT_LEN,
|
|
||||||
QDateTime::currentDateTime().toString(Qt::ISODate).toStdString().c_str(), msg);
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case QtFatalMsg: {
|
|
||||||
if (debugLevel <= QtFatalMsg) {
|
|
||||||
fprintf(stderr, "%*.*s Fatal: %s\n", OUTPUT_LEN, OUTPUT_LEN,
|
|
||||||
QDateTime::currentDateTime().toString(Qt::ISODate).toStdString().c_str(), msg);
|
|
||||||
}
|
|
||||||
// abort();
|
|
||||||
} break;
|
|
||||||
default: {
|
|
||||||
fprintf(stderr, "%*.*s No ErrorLevel defined! %s\n", OUTPUT_LEN, OUTPUT_LEN,
|
|
||||||
QDateTime::currentDateTime().toString(Qt::ISODate).toStdString().c_str(), msg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
|
||||||
void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
|
void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
|
||||||
static constexpr const char *format = "dd.MM.yyyy hh:mm:ss";
|
Q_UNUSED(context);
|
||||||
QByteArray localMsg = msg.toLocal8Bit();
|
QString const localMsg = QString(DBG_NAME[type]) + msg.toLocal8Bit();
|
||||||
const char *file = context.file ? context.file : "";
|
|
||||||
const char *function = context.function ? context.function : "";
|
switch (debugLevel) {
|
||||||
const char *p = std::strstr(function, "::");
|
case LOG_DEBUG: { // debug-level message
|
||||||
if (p) {
|
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
||||||
function = p + 2;
|
} break;
|
||||||
}
|
case LOG_INFO: { // informational message
|
||||||
char const* output = std::strrchr(file, '/');
|
if (type != QtDebugMsg) {
|
||||||
if (output) {
|
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
||||||
file = output + 1;
|
|
||||||
}
|
|
||||||
qint64 const currentMSecsSinceEpoch = QDateTime::currentMSecsSinceEpoch();
|
|
||||||
int const fractional_part = currentMSecsSinceEpoch % 1000;
|
|
||||||
QDateTime const datetime = QDateTime::fromMSecsSinceEpoch(currentMSecsSinceEpoch);
|
|
||||||
switch (type) {
|
|
||||||
case QtDebugMsg: {
|
|
||||||
if (debugLevel <= QtDebugMsg) {
|
|
||||||
// fprintf(stderr, "%*.*s CTX %s (%s:%u) ->\n", OUTPUT_LEN, OUTPUT_LEN,
|
|
||||||
// "", function, file, context.line);
|
|
||||||
//fprintf(stderr, "%*.*s.%03d DEBG %s\n", OUTPUT_LEN, OUTPUT_LEN,
|
|
||||||
// datetime.toString(format).toStdString().c_str(), fractional_part,
|
|
||||||
// localMsg.constData());
|
|
||||||
fprintf(stderr, "%*.*s.%03d DEBUG %s (%s:%u)\n", OUTPUT_LEN, OUTPUT_LEN,
|
|
||||||
datetime.toString(format).toStdString().c_str(), fractional_part,
|
|
||||||
localMsg.constData(), file, context.line);
|
|
||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
case QtInfoMsg: {
|
case LOG_NOTICE: { // normal, but significant, condition
|
||||||
if (debugLevel <= QtInfoMsg) {
|
if (type != QtDebugMsg) {
|
||||||
fprintf(stderr, "%*.*s.%03d INFO %s (%s:%u)\n", OUTPUT_LEN, OUTPUT_LEN,
|
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
||||||
datetime.toString(format).toStdString().c_str(), fractional_part,
|
|
||||||
localMsg.constData(), file, context.line);
|
|
||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
case QtWarningMsg: {
|
case LOG_WARNING: { // warning conditions
|
||||||
if (debugLevel <= QtWarningMsg) {
|
if (type != QtInfoMsg && type != QtDebugMsg) {
|
||||||
fprintf(stderr, "%*.*s.%03d WARN %s (%s:%u)\n", OUTPUT_LEN, OUTPUT_LEN,
|
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
||||||
datetime.toString(format).toStdString().c_str(), fractional_part,
|
|
||||||
localMsg.constData(), file, context.line);
|
|
||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
case QtCriticalMsg: {
|
case LOG_ERR: { // error conditions
|
||||||
if (debugLevel <= QtCriticalMsg) {
|
if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
|
||||||
fprintf(stderr, "%*.*s.%03d CRIT %s (%s:%u)\n", OUTPUT_LEN, OUTPUT_LEN,
|
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
||||||
datetime.toString(format).toStdString().c_str(), fractional_part,
|
|
||||||
localMsg.constData(), file, context.line);
|
|
||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
case QtFatalMsg: {
|
case LOG_CRIT: { // critical conditions
|
||||||
if (debugLevel <= QtFatalMsg) {
|
if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
|
||||||
fprintf(stderr, "%*.*s.%03d FATAL %s (%s:%u)\n", OUTPUT_LEN, OUTPUT_LEN,
|
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
||||||
datetime.toString(format).toStdString().c_str(), fractional_part,
|
}
|
||||||
localMsg.constData(), file, context.line);
|
} break;
|
||||||
|
case LOG_ALERT: { // action must be taken immediately
|
||||||
|
if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
|
||||||
|
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
||||||
|
}
|
||||||
|
} break;
|
||||||
|
case LOG_EMERG: { // system is unusable
|
||||||
|
if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
|
||||||
|
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
default: {
|
default: {
|
||||||
fprintf(stderr, "%*.*s.%03d No ErrorLevel defined! %s\n", OUTPUT_LEN, OUTPUT_LEN,
|
//fprintf(stderr, "%s No ErrorLevel defined! %s\n",
|
||||||
datetime.toString(format).toStdString().c_str(), fractional_part,
|
// datetime.toStdString().c_str(), msg.toStdString().c_str());
|
||||||
msg.toStdString().c_str());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2,9 +2,12 @@
|
|||||||
#define MESSAGE_HANDLER_H_INCLUDED
|
#define MESSAGE_HANDLER_H_INCLUDED
|
||||||
|
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
|
#ifdef __linux__
|
||||||
|
#include <syslog.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
QtMsgType getDebugLevel();
|
int getDebugLevel();
|
||||||
void setDebugLevel(QtMsgType newDebugLevel);
|
void setDebugLevel(int newDebugLevel);
|
||||||
|
|
||||||
bool messageHandlerInstalled();
|
bool messageHandlerInstalled();
|
||||||
QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
|
QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
|
||||||
|
2010
plugins/interfaces.h
2010
plugins/interfaces.h
File diff suppressed because it is too large
Load Diff
BIN
plugins/libCAmaster.so
Executable file
BIN
plugins/libCAmaster.so
Executable file
Binary file not shown.
124
process/command.cpp
Normal file
124
process/command.cpp
Normal file
@@ -0,0 +1,124 @@
|
|||||||
|
#include "command.h"
|
||||||
|
|
||||||
|
#include <QProcess>
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QDir>
|
||||||
|
#include <QRegularExpression>
|
||||||
|
#include <QDateTime>
|
||||||
|
|
||||||
|
Command::Command(QString const &command, int start_timeout, int finish_timeout)
|
||||||
|
: m_command(command.trimmed())
|
||||||
|
, m_commandResult("")
|
||||||
|
, m_waitForStartTimeout(start_timeout)
|
||||||
|
, m_waitForFinishTimeout(finish_timeout)
|
||||||
|
, m_exitCode(-1) {
|
||||||
|
}
|
||||||
|
|
||||||
|
QString Command::getCommandResult() const {
|
||||||
|
return m_commandResult;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Command::readyReadStandardOutput() {
|
||||||
|
QProcess *p = (QProcess *)sender();
|
||||||
|
m_commandResult += p->readAllStandardOutput();
|
||||||
|
// qCritical() << m_commandResult;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Command::readyReadStandardError() {
|
||||||
|
QProcess *p = (QProcess *)sender();
|
||||||
|
QByteArray buf = p->readAllStandardError();
|
||||||
|
qCritical() << buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Command::finished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) {
|
||||||
|
QProcess *p = (QProcess *)sender();
|
||||||
|
// read all remaining data sent to the process, just in case
|
||||||
|
QString d = p->readAllStandardOutput();
|
||||||
|
if (!d.isEmpty()) {
|
||||||
|
m_commandResult += d;
|
||||||
|
}
|
||||||
|
disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardOutput()));
|
||||||
|
disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardError()));
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Command::execute(QString workingDirectory, QStringList args) {
|
||||||
|
|
||||||
|
if (!QDir::setCurrent(workingDirectory)) {
|
||||||
|
qCritical() << "SET WORKING_DIRECTORY" << workingDirectory
|
||||||
|
<< "FAILED FOR" << m_command;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
QScopedPointer<QProcess> p(new QProcess(this));
|
||||||
|
p->setWorkingDirectory(workingDirectory);
|
||||||
|
p->setProcessChannelMode(QProcess::MergedChannels);
|
||||||
|
|
||||||
|
connect(&(*p), SIGNAL(readyReadStandardOutput()), this, SLOT(readyReadStandardOutput()));
|
||||||
|
connect(&(*p), SIGNAL(readyReadStandardError()), this, SLOT(readyReadStandardError()));
|
||||||
|
|
||||||
|
if (!args.isEmpty()) {
|
||||||
|
qDebug() << "START COMMAND" << m_command << "WITH ARGS" << args
|
||||||
|
<< "IN" << p->workingDirectory();
|
||||||
|
p->start(m_command, args);
|
||||||
|
} else {
|
||||||
|
qDebug() << "START COMMAND" << m_command
|
||||||
|
<< "IN" << p->workingDirectory();
|
||||||
|
p->start(m_command);
|
||||||
|
}
|
||||||
|
|
||||||
|
qint64 const start = QDateTime::currentDateTime().toMSecsSinceEpoch();
|
||||||
|
|
||||||
|
if (p->waitForStarted(m_waitForStartTimeout)) {
|
||||||
|
qDebug() << "PROCESS" << m_command << "STARTED IN" << p->workingDirectory();
|
||||||
|
if (p->state() == QProcess::ProcessState::Running) {
|
||||||
|
qDebug() << "PROCESS" << m_command << "RUNNING IN" << p->workingDirectory();
|
||||||
|
// wait forever for git/opkg-commands to finish
|
||||||
|
int wait = m_waitForFinishTimeout;
|
||||||
|
if (m_command.trimmed().startsWith("git", Qt::CaseInsensitive) ||
|
||||||
|
m_command.trimmed().startsWith("opkg", Qt::CaseInsensitive)) {
|
||||||
|
wait = -1;
|
||||||
|
}
|
||||||
|
bool const no_timeout = p->waitForFinished(wait);
|
||||||
|
if (no_timeout) {
|
||||||
|
qDebug() << "PROCESS" << m_command << "FINISHED IN" << p->workingDirectory();
|
||||||
|
if (p->exitStatus() == QProcess::NormalExit) {
|
||||||
|
if ((m_exitCode = p->exitCode()) == 0) {
|
||||||
|
qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
|
||||||
|
qDebug() << "EXECUTED" << m_command
|
||||||
|
<< QString("(runtime %1ms)").arg(end-start)
|
||||||
|
<< "with code" << m_exitCode
|
||||||
|
<< "IN" << p->workingDirectory();
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
|
||||||
|
qCritical() << "EXECUTED" << m_command
|
||||||
|
<< QString("(runtime %1ms)").arg(end-start)
|
||||||
|
<< "with code" << m_exitCode
|
||||||
|
<< "IN" << p->workingDirectory();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
|
||||||
|
qCritical() << "PROCESS" << m_command << "CRASHED with code"
|
||||||
|
<< p->exitCode()
|
||||||
|
<< QString("(after %1ms)").arg(end-start)
|
||||||
|
<< "IN" << p->workingDirectory();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
|
||||||
|
qCritical() << "PROCESS" << m_command
|
||||||
|
<< "DID NOT FINISH WITH" << wait
|
||||||
|
<< "MS IN" << p->workingDirectory()
|
||||||
|
<< QString("(runtime %1ms)").arg(end-start);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
qCritical() << "WRONG PROCESS STATE" << p->state()
|
||||||
|
<< "IN" << p->workingDirectory();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
|
||||||
|
qCritical() << "PROCESS" << m_command << "TIMEOUT AT START"
|
||||||
|
<< QString("(runtime %1ms)").arg(end-start)
|
||||||
|
<< "IN" << p->workingDirectory();
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
35
process/command.h
Normal file
35
process/command.h
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
#ifndef COMMAND_H_INCLUDED
|
||||||
|
#define COMMAND_H_INCLUDED
|
||||||
|
#endif // COMMAND_H_INCLUDED
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QCoreApplication>
|
||||||
|
#include <QString>
|
||||||
|
#include <QStringList>
|
||||||
|
#include <QProcess>
|
||||||
|
|
||||||
|
|
||||||
|
class Command : public QObject {
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
QString m_command;
|
||||||
|
QString m_commandResult;
|
||||||
|
int m_waitForStartTimeout;
|
||||||
|
int m_waitForFinishTimeout;
|
||||||
|
int m_exitCode;
|
||||||
|
public:
|
||||||
|
explicit Command(QString const &command,
|
||||||
|
int start_timeout = 100000,
|
||||||
|
int finish_timeout = 100000);
|
||||||
|
|
||||||
|
QString getCommandResult() const;
|
||||||
|
QString command() const { return m_command; }
|
||||||
|
|
||||||
|
bool execute(QString workingDirectory, QStringList args = QStringList());
|
||||||
|
int exitCode() const { return m_exitCode; }
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void readyReadStandardOutput();
|
||||||
|
void readyReadStandardError();
|
||||||
|
void finished(int exitCode, QProcess::ExitStatus exitStatus);
|
||||||
|
};
|
20
progress_event.cpp
Normal file
20
progress_event.cpp
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
#include "progress_event.h"
|
||||||
|
|
||||||
|
QEvent::Type ProgressEvent::customEventType = QEvent::None;
|
||||||
|
|
||||||
|
ProgressEvent::ProgressEvent(QObject const *sender, int progressPercent)
|
||||||
|
: QEvent(ProgressEvent::type())
|
||||||
|
, m_sender(sender)
|
||||||
|
, m_progressPercent(progressPercent) {
|
||||||
|
}
|
||||||
|
|
||||||
|
ProgressEvent::~ProgressEvent() {
|
||||||
|
}
|
||||||
|
|
||||||
|
QEvent::Type ProgressEvent::type() {
|
||||||
|
if (customEventType == QEvent::None) {
|
||||||
|
int generatedType = QEvent::registerEventType();
|
||||||
|
customEventType = static_cast<QEvent::Type>(generatedType);
|
||||||
|
}
|
||||||
|
return customEventType;
|
||||||
|
}
|
26
progress_event.h
Normal file
26
progress_event.h
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
#ifndef PROGRESS_EVENT_H_INCLUDED
|
||||||
|
#define PROGRESS_EVENT_H_INCLUDED
|
||||||
|
|
||||||
|
#include <QEvent>
|
||||||
|
|
||||||
|
class ProgressEvent : public QEvent {
|
||||||
|
|
||||||
|
QObject const *m_sender;
|
||||||
|
int m_progressPercent;
|
||||||
|
public:
|
||||||
|
explicit ProgressEvent(QObject const *sender, int progressPercent);
|
||||||
|
virtual ~ProgressEvent();
|
||||||
|
static QEvent::Type type();
|
||||||
|
|
||||||
|
QObject const *sender() { return m_sender; }
|
||||||
|
QObject const *sender() const { return m_sender; }
|
||||||
|
|
||||||
|
void setProgress(int progressPercent) { m_progressPercent = progressPercent; }
|
||||||
|
int progressPercent() { return m_progressPercent; }
|
||||||
|
int progressPercent() const { return m_progressPercent; }
|
||||||
|
private:
|
||||||
|
static QEvent::Type customEventType;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif // PROGRESS_EVENT_H_INCLUDED
|
871
update.cpp
Normal file
871
update.cpp
Normal file
@@ -0,0 +1,871 @@
|
|||||||
|
#include "update.h"
|
||||||
|
#include "worker.h"
|
||||||
|
#include "utils.h"
|
||||||
|
#include "update_dc_event.h"
|
||||||
|
#include "mainwindow.h"
|
||||||
|
|
||||||
|
#include <QCoreApplication>
|
||||||
|
#include <QApplication>
|
||||||
|
#include <QFile>
|
||||||
|
#include <QTemporaryFile>
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QTextStream>
|
||||||
|
#include <QRegularExpression>
|
||||||
|
#include <QRegExp>
|
||||||
|
#include <QApplication>
|
||||||
|
|
||||||
|
#if defined (Q_OS_UNIX) || defined (Q_OS_LINUX)
|
||||||
|
#include "unistd.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "plugins/interfaces.h"
|
||||||
|
|
||||||
|
#include <QSharedMemory>
|
||||||
|
#include <QScopedPointer>
|
||||||
|
#include <QDir>
|
||||||
|
#include <QThread>
|
||||||
|
#include <QDateTime>
|
||||||
|
#include <QPluginLoader>
|
||||||
|
#include <QMap>
|
||||||
|
|
||||||
|
#define UPDATE_OPKG (1)
|
||||||
|
#define UPDATE_DC (0)
|
||||||
|
|
||||||
|
static const QMap<QString, int> baudrateMap = {
|
||||||
|
{"1200" , 0}, {"9600" , 1}, {"19200" , 2}, {"38400" , 3},
|
||||||
|
{"57600" , 4}, {"115200" , 5}
|
||||||
|
};
|
||||||
|
|
||||||
|
QPluginLoader Update::pluginLoader;
|
||||||
|
|
||||||
|
hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
|
||||||
|
hwinf *hw = nullptr;
|
||||||
|
if (plugInDir.exists()) {
|
||||||
|
QString pluginLibName(fname);
|
||||||
|
pluginLibName = plugInDir.absoluteFilePath(pluginLibName);
|
||||||
|
QFileInfo info(pluginLibName);
|
||||||
|
if (info.exists()) {
|
||||||
|
pluginLibName = plugInDir.absoluteFilePath(pluginLibName);
|
||||||
|
pluginLoader.setFileName(pluginLibName);
|
||||||
|
// static QPluginLoader pluginLoader(pluginLibName);
|
||||||
|
if (!pluginLoader.load()) {
|
||||||
|
qCritical() << "in directory" << plugInDir.absolutePath();
|
||||||
|
qCritical() << "cannot load plugin" << pluginLoader.fileName();
|
||||||
|
qCritical() << pluginLoader.errorString();
|
||||||
|
exit(-1);
|
||||||
|
}
|
||||||
|
if (!pluginLoader.isLoaded()) {
|
||||||
|
qCritical() << pluginLoader.errorString();
|
||||||
|
exit(-2);
|
||||||
|
}
|
||||||
|
QObject *plugin = pluginLoader.instance();
|
||||||
|
if (!plugin) {
|
||||||
|
qCritical() << "cannot start instance";
|
||||||
|
exit(-3);
|
||||||
|
}
|
||||||
|
if (! (hw = qobject_cast<hwinf *>(plugin))) {
|
||||||
|
qCritical() << "cannot cast plugin" << plugin << "to hwinf";
|
||||||
|
exit(-4);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
qCritical() << pluginLibName << "does not exist";
|
||||||
|
exit(-5);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
qCritical() << "plugins directory" << plugInDir.absolutePath()
|
||||||
|
<< "does not exist";
|
||||||
|
exit(-6);
|
||||||
|
}
|
||||||
|
return hw;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Update::unloadDCPlugin() {
|
||||||
|
if (pluginLoader.unload()) {
|
||||||
|
qCritical() << "unloaded plugin" << pluginLoader.fileName();
|
||||||
|
// Note: will re-instantiate the library !
|
||||||
|
// QObject *rootObject = pluginLoader.instance();
|
||||||
|
// if (rootObject) {
|
||||||
|
// qCritical() << "reloaded plugin: root object again available";
|
||||||
|
// return false;
|
||||||
|
// }
|
||||||
|
// qCritical()unloaded plugin: root object gone";
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Update::Update(Worker *worker,
|
||||||
|
QString customerRepository,
|
||||||
|
QString customerNrStr,
|
||||||
|
QString branchName,
|
||||||
|
QString plugInDir,
|
||||||
|
QString pluginName,
|
||||||
|
QString workingDir,
|
||||||
|
bool dryRun,
|
||||||
|
QObject *parent,
|
||||||
|
char const *serialInterface,
|
||||||
|
char const *baudrate)
|
||||||
|
: QObject(parent)
|
||||||
|
, m_hw(loadDCPlugin(QDir(plugInDir), pluginName))
|
||||||
|
, m_worker(worker)
|
||||||
|
, m_serialInterface(serialInterface)
|
||||||
|
, m_baudrate(baudrate)
|
||||||
|
, m_customerRepository(customerRepository)
|
||||||
|
, m_customerNrStr(customerNrStr)
|
||||||
|
, m_branchName(branchName)
|
||||||
|
, m_pluginName(pluginName)
|
||||||
|
, m_workingDir(workingDir)
|
||||||
|
, m_dryRun(dryRun) {
|
||||||
|
|
||||||
|
qInfo() << "UPDATE: m_serialInterface ..." << m_serialInterface;
|
||||||
|
qInfo() << "UPDATE: m_baudrate ..." << m_baudrate;
|
||||||
|
qInfo() << "UPDATE: m_customerRepository ..." << m_customerRepository;
|
||||||
|
qInfo() << "UPDATE: m_customerNr ..........." << m_customerNrStr;
|
||||||
|
qInfo() << "UPDATE: m_branchName ..........." << m_branchName;
|
||||||
|
qInfo() << "UPDATE: m_pluginName ..........." << m_pluginName;
|
||||||
|
qInfo() << "UPDATE: m_workingDirectory ....." << m_workingDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
Update::~Update() {
|
||||||
|
}
|
||||||
|
|
||||||
|
Update::DownloadResult Update::sendStatus(int ret) const {
|
||||||
|
switch (ret) { // return values of dc are:
|
||||||
|
case 0: // 0: no answer by now
|
||||||
|
return DownloadResult::NOP; // 1: error
|
||||||
|
case 10: // 10: success
|
||||||
|
return DownloadResult::OK;
|
||||||
|
default:;
|
||||||
|
}
|
||||||
|
return DownloadResult::ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
Update::DownloadResult Update::sendNextAddress(int bNum) const {
|
||||||
|
// sends address only if blockNumber is one of 0, 1024, 2048, 3072, 4096
|
||||||
|
int noAnswerCount = 0;
|
||||||
|
int errorCount = 0;
|
||||||
|
if ( bNum==0 || bNum==1024 || bNum==2048 || bNum==3072 || bNum==4096 ) {
|
||||||
|
// qDebug() << "addr-block" << bNum << "...";
|
||||||
|
while (noAnswerCount <= 250) {
|
||||||
|
m_hw->bl_sendAddress(bNum);
|
||||||
|
QThread::msleep(100);
|
||||||
|
DownloadResult const res = sendStatus(m_hw->bl_wasSendingAddOK());
|
||||||
|
if (res != DownloadResult::NOP) {
|
||||||
|
if (res == DownloadResult::ERROR) {
|
||||||
|
if (++errorCount >= 10) {
|
||||||
|
qCritical() << "addr-block" << bNum << "...FAILED";
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
} else { // res == DownloadResult::OK
|
||||||
|
// qInfo() << "addr-block" << bNum << "...OK";
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
noAnswerCount += 1; // no answer by now
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// wait max. about 3 seconds
|
||||||
|
return DownloadResult::TIMEOUT;
|
||||||
|
}
|
||||||
|
// blockNumber is not one of 0, 1024, 2048, 3072, 4096 -> do nothing
|
||||||
|
return DownloadResult::NOP;
|
||||||
|
}
|
||||||
|
|
||||||
|
Update::DownloadResult Update::sendNextDataBlock(QByteArray const &binary,
|
||||||
|
int bNum) const {
|
||||||
|
uint8_t local[66];
|
||||||
|
int const bAddr = bNum * 64;
|
||||||
|
int noAnswerCount = 0;
|
||||||
|
int errorCount = 0;
|
||||||
|
|
||||||
|
memcpy(local, binary.constData() + bAddr, 64);
|
||||||
|
local[64] = local[65] = 0x00;
|
||||||
|
|
||||||
|
// QByteArray b((const char *)(&local[0]), 64);
|
||||||
|
// qCritical() << "SNDB" << bNum << b.size() << b.toHex();
|
||||||
|
|
||||||
|
while (noAnswerCount <= 250) {
|
||||||
|
m_hw->bl_sendDataBlock(64, local);
|
||||||
|
QThread::msleep(10);
|
||||||
|
DownloadResult const res = sendStatus(m_hw->bl_wasSendingDataOK());
|
||||||
|
if (res != DownloadResult::NOP) {
|
||||||
|
if (res == DownloadResult::ERROR) {
|
||||||
|
if (++errorCount >= 10) {
|
||||||
|
qCritical() << "data for block" << bNum << "...FAILED";
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// qInfo() << "data for block" << bNum << "OK";
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
noAnswerCount += 1; // no answer by now
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// wait max. about 3 seconds
|
||||||
|
return DownloadResult::TIMEOUT;
|
||||||
|
}
|
||||||
|
|
||||||
|
Update::DownloadResult Update::dc_downloadBinary(QByteArray const &b) const {
|
||||||
|
int const nBlocks = (((b.size())%64)==0) ? (b.size()/64) : (b.size()/64)+1;
|
||||||
|
|
||||||
|
// fill lst block of data to be sent with 0xFF
|
||||||
|
QByteArray ba = b.leftJustified(nBlocks*64, (char)(0xFF));
|
||||||
|
|
||||||
|
qInfo() << "total number of bytes to send to dc" << ba.size();
|
||||||
|
qInfo() << "total number of blocks to send to dc" << nBlocks;
|
||||||
|
|
||||||
|
int bNum = 0;
|
||||||
|
DownloadResult res = DownloadResult::OK;
|
||||||
|
fprintf(stderr, "\n64-byte block %04d ", bNum);
|
||||||
|
while (res != DownloadResult::ERROR && bNum < nBlocks) {
|
||||||
|
if ((res = sendNextAddress(bNum)) != DownloadResult::ERROR) {
|
||||||
|
if ((res = sendNextDataBlock(ba, bNum)) != DownloadResult::ERROR) {
|
||||||
|
bNum += 1;
|
||||||
|
fprintf(stderr, ".");
|
||||||
|
if ((bNum % 80) == 0) {
|
||||||
|
fprintf(stderr, "\n64-byte block %04d ", bNum);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fprintf(stderr, "\nlast 64-byte block %04d\n", bNum);
|
||||||
|
|
||||||
|
int const rest = ba.size() % 64;
|
||||||
|
int const offset = ba.size() - rest;
|
||||||
|
char const *startAddress = ba.constData() + offset;
|
||||||
|
|
||||||
|
if (rest > 0) {
|
||||||
|
// SHOULD NEVER HAPPEN !!!
|
||||||
|
uint8_t local[66];
|
||||||
|
memset(local, 0xFF, sizeof(local));
|
||||||
|
memcpy(local, startAddress, rest);
|
||||||
|
qCritical() << "ERROR SEND REMAINING" << rest << "BYTES";
|
||||||
|
m_hw->bl_sendDataBlock(64, local);
|
||||||
|
}
|
||||||
|
|
||||||
|
m_hw->bl_sendLastBlock();
|
||||||
|
qInfo() << "last result" << (int)sendStatus(m_hw->bl_wasSendingDataOK());
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Update::startBootloader() const { // deprecated
|
||||||
|
return false;
|
||||||
|
#if 0
|
||||||
|
int nStartTry = 5;
|
||||||
|
while (--nStartTry >= 0) {
|
||||||
|
m_hw->bl_startBL();
|
||||||
|
QThread::msleep(500);
|
||||||
|
int nCheckTry = 10;
|
||||||
|
while (--nCheckTry >= 0) {
|
||||||
|
m_hw->bl_checkBL();
|
||||||
|
QThread::msleep(500);
|
||||||
|
if (m_hw->bl_isUp()) {
|
||||||
|
qInfo() << "starting bootloader...OK";
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
qCritical() << "bootloader not up ("
|
||||||
|
<< nStartTry << "," << nCheckTry << ")" << QThread::currentThread();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
qCritical() << "starting bootloader...FAILED" << QThread::currentThread();
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Update::stopBootloader() const {
|
||||||
|
// stop bootloader: this MUST work -> otherwise the PSA has to be restarted
|
||||||
|
// manually
|
||||||
|
emit m_worker->showErrorMessage("dc update", "stopping bootloader...");
|
||||||
|
|
||||||
|
int nTryFinalize = 1; // could do this in an endless loop
|
||||||
|
|
||||||
|
do {
|
||||||
|
// in principle, any value except BL_STOP will do, as we want to detect
|
||||||
|
// change to BL_STOP
|
||||||
|
m_worker->mainWindow()->setUpdateStep(UpdateDcEvent::UpdateStep::BL_CHECK);
|
||||||
|
|
||||||
|
QApplication::postEvent(
|
||||||
|
m_worker->mainWindow(),
|
||||||
|
new UpdateDcEvent(m_worker, UpdateDcEvent::UpdateStep::BL_STOP, nTryFinalize));
|
||||||
|
|
||||||
|
QThread::sleep(1);
|
||||||
|
|
||||||
|
int const cntLimit = 20;
|
||||||
|
int cnt = 0;
|
||||||
|
while (++cnt < cntLimit &&
|
||||||
|
m_worker->mainWindow()->updateStep() != UpdateDcEvent::UpdateStep::BL_STOP) {
|
||||||
|
// wait until bl_stopBL() has been sent
|
||||||
|
QThread::msleep(500);
|
||||||
|
}
|
||||||
|
|
||||||
|
QApplication::postEvent(
|
||||||
|
m_worker->mainWindow(),
|
||||||
|
new UpdateDcEvent(m_worker, UpdateDcEvent::UpdateStep::BL_CHECK, nTryFinalize));
|
||||||
|
QThread::sleep(1);
|
||||||
|
|
||||||
|
QApplication::postEvent(
|
||||||
|
m_worker->mainWindow(),
|
||||||
|
new UpdateDcEvent(m_worker, UpdateDcEvent::UpdateStep::BL_IS_UP, nTryFinalize));
|
||||||
|
QThread::sleep(1);
|
||||||
|
|
||||||
|
cnt = 0;
|
||||||
|
while (++cnt < cntLimit &&
|
||||||
|
m_worker->mainWindow()->updateStep() != UpdateDcEvent::UpdateStep::BL_IS_DOWN) {
|
||||||
|
// wait until done
|
||||||
|
QThread::msleep(200);
|
||||||
|
}
|
||||||
|
|
||||||
|
} while (++nTryFinalize <= MainWindow::BL_STOP_COUNT &&
|
||||||
|
m_worker->mainWindow()->updateStep() != UpdateDcEvent::UpdateStep::BL_IS_DOWN);
|
||||||
|
|
||||||
|
return (m_worker->mainWindow()->updateStep() == UpdateDcEvent::UpdateStep::BL_IS_DOWN);
|
||||||
|
}
|
||||||
|
|
||||||
|
// br is a index into a table, used for historical reasons.
|
||||||
|
bool Update::openSerial(int br, QString baudrate, QString comPort) const {
|
||||||
|
qDebug() << "opening serial" << br << baudrate << comPort << "...";
|
||||||
|
if (m_hw->dc_openSerial(br, baudrate, comPort, 1) == true) { // 1 for connect
|
||||||
|
Utils::printInfoMsg(
|
||||||
|
QString("OPENING SERIAL %1").arg(br)
|
||||||
|
+ " " + baudrate + " " + comPort + "...OK");
|
||||||
|
|
||||||
|
// m_hw->dc_autoRequest(true);
|
||||||
|
m_hw->dc_autoRequest(false);
|
||||||
|
QThread::sleep(1);
|
||||||
|
|
||||||
|
Utils::printInfoMsg(QString("IS PORT OPEN %1").arg(m_hw->dc_isPortOpen()));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
Utils::printCriticalErrorMsg(
|
||||||
|
QString("OPENING SERIAL %1").arg(br)
|
||||||
|
+ " " + baudrate + " " + comPort + "...FAILED");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Update::closeSerial() const {
|
||||||
|
qInfo() << "CLOSED SERIAL" << m_baudrate << m_serialInterface;
|
||||||
|
m_hw->dc_closeSerial();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Update::isSerialOpen() const {
|
||||||
|
return m_hw->dc_isPortOpen();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Update::resetDeviceController() const { // deprecated
|
||||||
|
return false;
|
||||||
|
#if 0
|
||||||
|
qDebug() << "resetting device controller...";
|
||||||
|
m_hw->bl_rebootDC();
|
||||||
|
// wait maximally 3 seconds, before starting bootloader
|
||||||
|
qInfo() << "resetting device controller...OK";
|
||||||
|
return true;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
QByteArray Update::loadBinaryDCFile(QString filename) const {
|
||||||
|
qDebug() << "loading dc binary" << filename << "...";
|
||||||
|
|
||||||
|
QFile file(filename); // closed in destructor call
|
||||||
|
if (!file.exists()) {
|
||||||
|
qCritical() << file.fileName() << "does not exist";
|
||||||
|
return QByteArray();
|
||||||
|
}
|
||||||
|
if (!file.open(QIODevice::ReadOnly)) {
|
||||||
|
qCritical() << "cannot open file" << file.fileName();
|
||||||
|
return QByteArray();
|
||||||
|
}
|
||||||
|
qInfo() << "loading dc binary" << filename << "...OK";
|
||||||
|
return file.readAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Update::downloadBinaryToDC(QString const &bFile) const {
|
||||||
|
qDebug() << "sending" << bFile << "to dc...";
|
||||||
|
QByteArray const dcBinary = loadBinaryDCFile(bFile);
|
||||||
|
if (dcBinary.size() > 0) {
|
||||||
|
if (dc_downloadBinary(dcBinary) != DownloadResult::OK) {
|
||||||
|
qCritical() << "sending" << bFile << "to dc...FAILED";
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
qInfo() << "sending" << bFile << "to dc...OK";
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
qCritical() << "sending" << bFile << "to dc...FAILED";
|
||||||
|
qCritical() << "loading binary" << bFile << "FAILED";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// USING THE DC BOOTLOADER
|
||||||
|
//
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
1 : bl_reboot() // send to application, want DC2 to reset (in order to
|
||||||
|
// start the bootloader)
|
||||||
|
//
|
||||||
|
// NOTE: this function is NOT reliable !!! Sometimes it
|
||||||
|
// simply does not work, in which case bl_startBL,
|
||||||
|
// bl_checkBL and bl_isUp do not work as well.
|
||||||
|
// Alas, there is no feedback if bl_reboot worked!
|
||||||
|
//
|
||||||
|
// NOTE: this function can be called only once per
|
||||||
|
// minute, because once called again, the controller
|
||||||
|
// performs some self-checks consuming some time.
|
||||||
|
//
|
||||||
|
// NOTE: after a successful bl_reboot(), the device is
|
||||||
|
// waiting about 4 seconds in the bootloader. To stay in
|
||||||
|
// the bootloader, we have to send the command
|
||||||
|
// bl_startBL(), which is kind of a misnomer, as it
|
||||||
|
// should be bl_doNotLeaveBL().
|
||||||
|
//
|
||||||
|
2 : bl_startBL(): // send within 4s after DC power-on, otherwise
|
||||||
|
// bootloader is left.
|
||||||
|
//
|
||||||
|
// NOTE: a running bootloader is a MUST for the download
|
||||||
|
// process of a device controller firmware as it does
|
||||||
|
// the actual writing of the memory (the bl_reboot()
|
||||||
|
// from above erases the available memory).
|
||||||
|
//
|
||||||
|
3 : bl_check(): // send command to verify if bl is up
|
||||||
|
//
|
||||||
|
// NOTE: this command is kind of a request that we want
|
||||||
|
// to check if the bootloader is up. The device
|
||||||
|
// (actually the bootloader) responds with its version.
|
||||||
|
//
|
||||||
|
4 : bl_isUp(): // returns true if bl is up and running
|
||||||
|
//
|
||||||
|
// NOTE: we know what the bootloader version actually is
|
||||||
|
// as the bootloader does not change. By comparing the
|
||||||
|
// string received in the previous step with this known
|
||||||
|
// version string we know if the bootloader is up.
|
||||||
|
//
|
||||||
|
// NOTE FOR ALL PREVIOUS STEPS: execute them in their
|
||||||
|
// own slots each to be sure to receive any possible
|
||||||
|
// responds from the device.
|
||||||
|
//
|
||||||
|
5 : bl_sendAddress(blockNumber)
|
||||||
|
// send start address, nr of 64-byte block, start with 0
|
||||||
|
// will be sent only for following block-numbers:
|
||||||
|
// 0, 1024, 2048, 3072 and 4096, so basically every
|
||||||
|
// 64kByte.
|
||||||
|
// for other addresses nothing happens
|
||||||
|
|
||||||
|
6 : bl_wasSendingAddOK()
|
||||||
|
// return val: 0: no response by now
|
||||||
|
// 1: error
|
||||||
|
// 10: OK
|
||||||
|
|
||||||
|
7 : bl_sendDataBlock()
|
||||||
|
// send 64 byte from bin file
|
||||||
|
|
||||||
|
8 : bl_sendLastBlock()
|
||||||
|
// send this command after all data are transferred
|
||||||
|
|
||||||
|
9 : bl_wasSendingDataOK()
|
||||||
|
// return val: 0: no response by now
|
||||||
|
// 1: error
|
||||||
|
// 10: OK
|
||||||
|
|
||||||
|
10 : bl_stopBL() // leave bl and start (the new) application
|
||||||
|
//
|
||||||
|
// NOTE: this function MUST work under all conditions.
|
||||||
|
// Alas, there is no direct result for this command, so
|
||||||
|
// the only way of knowing it was successful is to ask
|
||||||
|
// the device if the bootloader is still running.
|
||||||
|
// There is no problem to repeat this command until the
|
||||||
|
// bootloader is really not running anymore.
|
||||||
|
*/
|
||||||
|
bool Update::updateBinary(char const *fileToSendToDC) {
|
||||||
|
qInfo() << "UPDATING DEVICE CONTROLLER FIRMWARE BINARY" << fileToSendToDC;
|
||||||
|
QFile fn(fileToSendToDC);
|
||||||
|
bool r;
|
||||||
|
if ((r = fn.exists()) == true) {
|
||||||
|
QFileInfo fi(fn);
|
||||||
|
if ((r = updateDC(fileToSendToDC)) == true) {
|
||||||
|
Utils::printInfoMsg(
|
||||||
|
QString(" UPDATING BINARY ") + fi.fileName()
|
||||||
|
+ QString(" (size=%1").arg(fi.size()) + ") DONE");
|
||||||
|
} else {
|
||||||
|
Utils::printCriticalErrorMsg(
|
||||||
|
QString(" UPDATING BINARY ") + fi.fileName()
|
||||||
|
+ QString(" (size=%1").arg(fi.size()) + ") FAILED");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Utils::printCriticalErrorMsg(
|
||||||
|
QString(fileToSendToDC) + " DOES NOT EXIST -> NO UPDATE OF DC FIRMWARE");
|
||||||
|
}
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Update::updateDC(QString bFile) const {
|
||||||
|
qDebug() << "IN UPDATEDC: UPDATING DC: FILE TO SEND" << bFile;
|
||||||
|
|
||||||
|
m_worker->mainWindow()->setUpdateStep(UpdateDcEvent::UpdateStep::NONE);
|
||||||
|
|
||||||
|
QApplication::postEvent( // step 1: reset device controller
|
||||||
|
m_worker->mainWindow(),
|
||||||
|
new UpdateDcEvent(m_worker, UpdateDcEvent::UpdateStep::DC_REBOOT, 1));
|
||||||
|
QThread::sleep(1);
|
||||||
|
|
||||||
|
for (int i=1; i <= MainWindow::BL_START_COUNT; ++i) {
|
||||||
|
QApplication::postEvent( // step 2: start bootloader (5x)
|
||||||
|
m_worker->mainWindow(),
|
||||||
|
new UpdateDcEvent(m_worker, UpdateDcEvent::UpdateStep::BL_START, i));
|
||||||
|
QThread::sleep(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
int const cntLimit = 100; // wait until its for sure that bl_startBL()
|
||||||
|
int cnt = 0; // has been excuted
|
||||||
|
while (++cnt < cntLimit &&
|
||||||
|
m_worker->mainWindow()->updateStep() != UpdateDcEvent::UpdateStep::BL_START) {
|
||||||
|
// wait until all bl_startBL() are done
|
||||||
|
QThread::msleep(200);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cnt == cntLimit) {
|
||||||
|
// start events not received ???
|
||||||
|
Utils::printCriticalErrorMsg("BL_START EVENT NOT RECEIVED AFTER 20 SECS");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
m_worker->mainWindow()->setUpdateStep(UpdateDcEvent::UpdateStep::BL_CHECK);
|
||||||
|
|
||||||
|
for (int i=1; i <= MainWindow::BL_IS_UP_COUNT; ++i) {
|
||||||
|
QApplication::postEvent(m_worker->mainWindow(), new UpdateDcEvent(m_worker, UpdateDcEvent::UpdateStep::BL_CHECK, i));
|
||||||
|
QThread::sleep(1);
|
||||||
|
QApplication::postEvent(m_worker->mainWindow(), new UpdateDcEvent(m_worker, UpdateDcEvent::UpdateStep::BL_IS_UP, i));
|
||||||
|
if (m_worker->mainWindow()->updateStep() == UpdateDcEvent::UpdateStep::BL_IS_UP) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
QThread::sleep(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
cnt = 0;
|
||||||
|
while (++cnt < cntLimit &&
|
||||||
|
m_worker->mainWindow()->updateStep() != UpdateDcEvent::UpdateStep::BL_IS_UP) {
|
||||||
|
// wait until all bl_startBL() are done
|
||||||
|
QThread::msleep(200);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cnt == cntLimit) {
|
||||||
|
// really not up
|
||||||
|
Utils::printCriticalErrorMsg("BL_IS_UP EVENT NOT RECEIVED AFTER 20 SECS");
|
||||||
|
stopBootloader(); // try to stop bootloader whichhas been already started
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (m_worker->mainWindow()->updateStep() == UpdateDcEvent::UpdateStep::BL_IS_UP) {
|
||||||
|
// bootloader MUST be running to download device-controller
|
||||||
|
#if 0
|
||||||
|
if (!downloadBinaryToDC(bFile)) {
|
||||||
|
Utils::printCriticalErrorMsg(
|
||||||
|
QString("UPDATING DC: ") + bFile + " ...DOWNLOAD FAILED");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
} else {
|
||||||
|
Utils::printCriticalErrorMsg(
|
||||||
|
QString("UPDATING DC: ") + bFile + " BOOT LOADER NOT RUNNING -> NO DOWNLOAD ("
|
||||||
|
+ QThread::currentThread()->objectName() + ")");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// do this unconditionally, even if bootloader is not running at all ->
|
||||||
|
// the controller possibly tells us nonsense.
|
||||||
|
if (!stopBootloader()) {
|
||||||
|
Utils::printCriticalErrorMsg(
|
||||||
|
QString("UPDATING DC: ") + bFile + " BOOT LOADER STILL RUNNING ("
|
||||||
|
+ QThread::currentThread()->objectName() + ")");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Utils::printInfoMsg(QString("UPDATING DC: ") + bFile + " ...OK");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString Update::jsonType(enum FileTypeJson type) {
|
||||||
|
switch (type) {
|
||||||
|
case FileTypeJson::CASH: return "CASH";
|
||||||
|
case FileTypeJson::CONFIG: return "CONFIG";
|
||||||
|
case FileTypeJson::PRINTER: return "PRINTER";
|
||||||
|
case FileTypeJson::SERIAL: return "SERIAL";
|
||||||
|
case FileTypeJson::DEVICE: return "DEVICE";
|
||||||
|
case FileTypeJson::TIME: return "TIME";
|
||||||
|
}
|
||||||
|
return "N/A";
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Update::downloadJson(enum FileTypeJson type,
|
||||||
|
int templateIdx,
|
||||||
|
QString jsFileToSendToDC) const {
|
||||||
|
|
||||||
|
|
||||||
|
Utils::printInfoMsg(
|
||||||
|
QString("UPDATING JSON-FILE=%1, TEMPLATE-INDEX=%2, JSON-TYPE=%3")
|
||||||
|
.arg(jsFileToSendToDC)
|
||||||
|
.arg(templateIdx)
|
||||||
|
.arg(jsonType(type)));
|
||||||
|
|
||||||
|
m_hw->dc_autoRequest(true); // downloading Json needs the AutoEmission flag
|
||||||
|
qDebug() << "SET AUTO-REQUEST=TRUE";
|
||||||
|
QThread::sleep(1); // make sure the auto-request flag is acknowledged
|
||||||
|
|
||||||
|
bool ready = false;
|
||||||
|
int nTry = 25;
|
||||||
|
while ((ready = m_hw->sys_ready4sending()) == false) {
|
||||||
|
QThread::msleep(200);
|
||||||
|
if (--nTry <= 0) {
|
||||||
|
Utils::printCriticalErrorMsg("SYS NOT READY FOR SENDING AFTER 5 SECONDS");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ret = false;
|
||||||
|
if (ready) {
|
||||||
|
QFile file(jsFileToSendToDC);
|
||||||
|
QFileInfo fi(jsFileToSendToDC); // max. size of template file is 800 bytes
|
||||||
|
if (file.exists()) {
|
||||||
|
if (file.open(QIODevice::ReadOnly)) {
|
||||||
|
if (fi.size() <= 800) {
|
||||||
|
QByteArray ba = file.readAll();
|
||||||
|
// kindOfFile: 1=config, 2=device, 3=cash, 4=serial, 5=time, 6=printer
|
||||||
|
// nrOfTemplate=1...32 if kindOfFile==6
|
||||||
|
// content = content of the Json file, max 800byte ascii signs
|
||||||
|
if (m_hw->sys_sendJsonFileToDc((uint8_t)(type),
|
||||||
|
templateIdx,
|
||||||
|
(uint8_t *)ba.data())) {
|
||||||
|
QThread::sleep(1);
|
||||||
|
ret = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Utils::printCriticalErrorMsg(
|
||||||
|
QString("SIZE OF %1 TOO BIG (%2 BYTES)")
|
||||||
|
.arg(jsFileToSendToDC).arg(fi.size()));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Utils::printCriticalErrorMsg(
|
||||||
|
QString("CAN NOT OPEN ") + jsFileToSendToDC + " FOR READING");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Utils::printCriticalErrorMsg(
|
||||||
|
QString(jsFileToSendToDC) + " DOES NOT EXIST");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
m_hw->dc_autoRequest(false);
|
||||||
|
qDebug() << "SET AUTO-REQUEST=FALSE";
|
||||||
|
QThread::sleep(1); // make sure the auto-request flag is acknowledged
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Update::updatePrinterTemplate(int templateIdx, QString jsFile) const {
|
||||||
|
return downloadJson(FileTypeJson::PRINTER, templateIdx, jsFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Update::updateConfig(QString jsFile) {
|
||||||
|
return downloadJson(FileTypeJson::CONFIG, 0, jsFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Update::updateCashConf(QString jsFile) {
|
||||||
|
return downloadJson(FileTypeJson::CASH, 0, jsFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Update::updateDeviceConf(QString jsFile) {
|
||||||
|
return downloadJson(FileTypeJson::DEVICE, 0, jsFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
QStringList Update::split(QString line, QChar sep) {
|
||||||
|
QStringList lst;
|
||||||
|
QString next;
|
||||||
|
int start = 0, end;
|
||||||
|
|
||||||
|
while ((end = line.indexOf(sep, start)) != -1) {
|
||||||
|
next = line.mid(start, end - start).trimmed();
|
||||||
|
lst << next;
|
||||||
|
start = end + 1;
|
||||||
|
}
|
||||||
|
next = line.mid(start, end - start).trimmed();
|
||||||
|
lst << next;
|
||||||
|
|
||||||
|
return lst;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Update::readyReadStandardOutput() {
|
||||||
|
QProcess *p = (QProcess *)sender();
|
||||||
|
QByteArray buf = p->readAllStandardOutput();
|
||||||
|
qCritical() << buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Update::readyReadStandardError() {
|
||||||
|
QProcess *p = (QProcess *)sender();
|
||||||
|
QByteArray buf = p->readAllStandardError();
|
||||||
|
qCritical() << buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Update::finished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) {
|
||||||
|
QProcess *p = (QProcess *)sender();
|
||||||
|
disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardOutput()));
|
||||||
|
disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardError()));
|
||||||
|
}
|
||||||
|
|
||||||
|
QStringList Update::getDcSoftAndHardWareVersion() {
|
||||||
|
m_hw->dc_autoRequest(true);
|
||||||
|
QThread::sleep(1); // make sure the timer-slots are active
|
||||||
|
|
||||||
|
for (int i=0; i < 3; ++i) { // send explicit reuests to get
|
||||||
|
// current SW/HW-versions
|
||||||
|
m_hw->request_DC2_SWversion();
|
||||||
|
m_hw->request_DC2_HWversion();
|
||||||
|
QThread::sleep(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
QString const &hwVersion = m_hw->dc_getHWversion().toLower().trimmed();
|
||||||
|
QString const &swVersion = m_hw->dc_getSWversion().toLower().trimmed();
|
||||||
|
|
||||||
|
m_hw->dc_autoRequest(false);
|
||||||
|
QThread::sleep(1); // make sure the timer-slots are inactive
|
||||||
|
|
||||||
|
if (!hwVersion.isEmpty() && !swVersion.isEmpty()) {
|
||||||
|
return QStringList() << hwVersion << swVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
return QStringList() << "DC HW-version not available"
|
||||||
|
<< "DC SW-version not available";
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
|
||||||
|
int tries = 20;
|
||||||
|
while (!m_hw->sys_areDCdataValid()) { // must deliver 'true', only then are all
|
||||||
|
// data from hwapi valid
|
||||||
|
if (--tries < 0) {
|
||||||
|
qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
m_hw->dc_autoRequest(true);
|
||||||
|
QThread::msleep(500);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool res = false;
|
||||||
|
QList<QString>::const_iterator it;
|
||||||
|
for (it = filesToWorkOn.cbegin(); it != filesToWorkOn.cend(); ++it) {
|
||||||
|
m_worker->startProgressLoop();
|
||||||
|
QString const &fToWorkOn = QDir::cleanPath(m_customerRepository + QDir::separator() + it->trimmed());
|
||||||
|
#if UPDATE_DC == 1
|
||||||
|
static const QRegularExpression version("^.*dc2c[.][0-9]{1,2}[.][0-9]{1,2}[.]bin.*$");
|
||||||
|
if (fToWorkOn.contains(version)) {
|
||||||
|
Utils::printInfoMsg("DO-UPDATE FILE-TO-WORK-ON " + fToWorkOn);
|
||||||
|
|
||||||
|
QFile fn(fToWorkOn);
|
||||||
|
QFileInfo finfo(fn);
|
||||||
|
if (!fn.exists()) { // check for broken link
|
||||||
|
Utils::printCriticalErrorMsg("DO-UPDATE FILE-TO-WORK-ON "
|
||||||
|
+ fToWorkOn + " DOES NOT EXIST");
|
||||||
|
res = false;
|
||||||
|
} else {
|
||||||
|
bool updateBinaryRes = true;
|
||||||
|
|
||||||
|
qInfo() << "DOWNLOADING" << finfo.completeBaseName() << "TO DC";
|
||||||
|
m_hw->dc_autoRequest(false);// default: turn auto-request setting off
|
||||||
|
QThread::sleep(1); // wait to be sure that there are no more
|
||||||
|
// commands sent to dc-hardware
|
||||||
|
qInfo() << "SET AUTO-REQUEST=FALSE";
|
||||||
|
|
||||||
|
if ((updateBinaryRes = updateBinary(fToWorkOn.toStdString().c_str())) == true) {
|
||||||
|
qCritical() << "downloaded binary" << fToWorkOn;
|
||||||
|
++displayIndex;
|
||||||
|
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(2, ' ') + QString(")")
|
||||||
|
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
|
Worker::UPDATE_STEP_DONE);
|
||||||
|
}
|
||||||
|
|
||||||
|
m_hw->dc_autoRequest(true); // turn auto-request setting on
|
||||||
|
qInfo() << "SET AUTO-REQUEST=TRUE";
|
||||||
|
|
||||||
|
QStringList const &versions = Update::getDcSoftAndHardWareVersion();
|
||||||
|
if (versions.size() >= 2) {
|
||||||
|
if (updateBinaryRes == true) {
|
||||||
|
qInfo() << "dc-hardware-version (UPDATED)" << versions[0];
|
||||||
|
qInfo() << "dc-firmware-version (UPDATED)" << versions[1];
|
||||||
|
} else {
|
||||||
|
qInfo() << "dc-hardware-version (NOT UPDATED)" << versions[0];
|
||||||
|
qInfo() << "dc-firmware-version (NOT UPDATED)" << versions[1];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
res = updateBinaryRes;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
if (fToWorkOn.contains("DC2C_print", Qt::CaseInsensitive)
|
||||||
|
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
||||||
|
res = true;
|
||||||
|
int i = fToWorkOn.indexOf("DC2C_print", Qt::CaseInsensitive);
|
||||||
|
int const templateIdx = fToWorkOn.mid(i).midRef(10, 2).toInt();
|
||||||
|
if ((templateIdx < 1) || (templateIdx > 32)) {
|
||||||
|
qCritical() << "WRONG TEMPLATE INDEX" << templateIdx;
|
||||||
|
res = false;
|
||||||
|
} else {
|
||||||
|
if ((res = updatePrinterTemplate(templateIdx, fToWorkOn))) {
|
||||||
|
Utils::printInfoMsg(
|
||||||
|
QString("DOWNLOADED PRINTER TEMPLATE %1 WITH INDEX=%2")
|
||||||
|
.arg(fToWorkOn)
|
||||||
|
.arg(templateIdx));
|
||||||
|
++displayIndex;
|
||||||
|
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
||||||
|
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
|
Worker::UPDATE_STEP_DONE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (fToWorkOn.contains("DC2C_cash", Qt::CaseInsensitive)
|
||||||
|
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
||||||
|
res = true;
|
||||||
|
if ((res = updateCashConf(fToWorkOn))) {
|
||||||
|
Utils::printInfoMsg(QString("DOWNLOADED CASH TEMPLATE %1").arg(fToWorkOn));
|
||||||
|
++displayIndex;
|
||||||
|
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
||||||
|
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
|
Worker::UPDATE_STEP_DONE);
|
||||||
|
}
|
||||||
|
} else if (fToWorkOn.contains("DC2C_conf", Qt::CaseInsensitive)
|
||||||
|
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
||||||
|
res = true;
|
||||||
|
if ((res= updateConfig(fToWorkOn))) {
|
||||||
|
Utils::printInfoMsg(QString("DOWNLOADED CONFIG TEMPLATE %1").arg(fToWorkOn));
|
||||||
|
++displayIndex;
|
||||||
|
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
||||||
|
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
|
Worker::UPDATE_STEP_DONE);
|
||||||
|
}
|
||||||
|
} else if (fToWorkOn.contains("DC2C_device", Qt::CaseInsensitive)
|
||||||
|
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
||||||
|
res = true;
|
||||||
|
if ((res = updateDeviceConf(fToWorkOn))) {
|
||||||
|
Utils::printInfoMsg(QString("DOWNLOADED DEVICE TEMPLATE %1").arg(fToWorkOn));
|
||||||
|
++displayIndex;
|
||||||
|
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
||||||
|
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
|
Worker::UPDATE_STEP_DONE);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
qCritical() << "UNKNOWN JSON FILE NAME" << fToWorkOn;
|
||||||
|
res = false;
|
||||||
|
}
|
||||||
|
// m_worker->stopProgressLoop();
|
||||||
|
// m_worker->setProgress(100);
|
||||||
|
|
||||||
|
if (res == false) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} // for (it = openLines.cbegin(); it != openLines.end(); ++it) {
|
||||||
|
|
||||||
|
m_hw->dc_autoRequest(true); // ALWAYS turn autoRequest ON
|
||||||
|
qDebug() << "SET AUTO-REQUEST=TRUE";
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
105
update.h
Normal file
105
update.h
Normal file
@@ -0,0 +1,105 @@
|
|||||||
|
#ifndef UPDATE_H_INCLUDED
|
||||||
|
#define UPDATE_H_INCLUDED
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QString>
|
||||||
|
#include <QFile>
|
||||||
|
#include <QDir>
|
||||||
|
#include <QByteArray>
|
||||||
|
#include <QProcess>
|
||||||
|
#include <QPluginLoader>
|
||||||
|
|
||||||
|
#include "plugins/interfaces.h"
|
||||||
|
|
||||||
|
#ifdef PTU5
|
||||||
|
#define SERIAL_PORT "ttymxc2"
|
||||||
|
#else
|
||||||
|
#define SERIAL_PORT "ttyUSB0"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
class Worker;
|
||||||
|
class Update : public QObject {
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
hwinf *m_hw = nullptr;
|
||||||
|
Worker *m_worker = nullptr;
|
||||||
|
char const *m_serialInterface;
|
||||||
|
char const *m_baudrate;
|
||||||
|
QString m_customerRepository;
|
||||||
|
QString m_customerNrStr;
|
||||||
|
QString m_branchName;
|
||||||
|
QString m_pluginName;
|
||||||
|
QString m_workingDir;
|
||||||
|
bool m_maintenanceMode;
|
||||||
|
bool m_dryRun;
|
||||||
|
|
||||||
|
static QPluginLoader pluginLoader;
|
||||||
|
|
||||||
|
public:
|
||||||
|
enum class DownloadResult {OK, ERROR, TIMEOUT, NOP};
|
||||||
|
enum class FileTypeJson {CONFIG=1, DEVICE=2, CASH=3, SERIAL=4, TIME=5, PRINTER=6};
|
||||||
|
|
||||||
|
static hwinf *loadDCPlugin(QDir const &plugInDir, QString const &fn);
|
||||||
|
static bool unloadDCPlugin();
|
||||||
|
static QStringList split(QString line, QChar sep = ',');
|
||||||
|
|
||||||
|
|
||||||
|
explicit Update(Worker *worker,
|
||||||
|
QString customerRepository,
|
||||||
|
QString customerNrStr,
|
||||||
|
QString branchName,
|
||||||
|
QString plugInDir,
|
||||||
|
QString pluginName,
|
||||||
|
QString workingDir,
|
||||||
|
bool dryRun = false,
|
||||||
|
QObject *parent = nullptr,
|
||||||
|
char const *serialInterface = SERIAL_PORT,
|
||||||
|
char const *baudrate = "115200");
|
||||||
|
virtual ~Update() override;
|
||||||
|
bool doUpdate(int &displayIndex, QStringList const &linesToWorkOn);
|
||||||
|
|
||||||
|
hwinf *hw() { return m_hw; }
|
||||||
|
hwinf const *hw() const { return m_hw; }
|
||||||
|
|
||||||
|
//QString customerId() { return m_customerId; }
|
||||||
|
//QString const customerId() const { return m_customerId; }
|
||||||
|
|
||||||
|
QString branchName() { return m_branchName; }
|
||||||
|
QString const branchName() const { return m_branchName; }
|
||||||
|
|
||||||
|
//QString repositoryPath() { return m_repositoryPath; }
|
||||||
|
//QString const repositoryPath() const { return m_repositoryPath; }
|
||||||
|
|
||||||
|
private:
|
||||||
|
static QString jsonType(enum FileTypeJson type);
|
||||||
|
|
||||||
|
DownloadResult sendStatus(int ret) const;
|
||||||
|
DownloadResult sendNextAddress(int bNum) const;
|
||||||
|
DownloadResult sendNextDataBlock(QByteArray const &b, int bNum) const;
|
||||||
|
DownloadResult dc_downloadBinary(QByteArray const &binary) const;
|
||||||
|
|
||||||
|
bool startBootloader() const;
|
||||||
|
bool stopBootloader() const;
|
||||||
|
bool openSerial(int br, QString baudrate, QString comPort) const;
|
||||||
|
void closeSerial() const;
|
||||||
|
bool isSerialOpen() const;
|
||||||
|
bool resetDeviceController() const;
|
||||||
|
QByteArray loadBinaryDCFile(QString filename) const;
|
||||||
|
bool downloadBinaryToDC(QString const &bFile) const;
|
||||||
|
bool updateDC(QString bFile) const;
|
||||||
|
bool updatePrinterTemplate(int templateIdx, QString fname) const;
|
||||||
|
bool updateBinary(char const *fileToSendToDC);
|
||||||
|
bool updateConfig(QString jsFileToSendToDC);
|
||||||
|
bool updateCashConf(QString jsFileToSendToDC);
|
||||||
|
bool updateDeviceConf(QString jsFileToSendToDC);
|
||||||
|
bool downloadJson(enum FileTypeJson type, int templateIdx,
|
||||||
|
QString jsFileToSendToDC) const;
|
||||||
|
QStringList getDcSoftAndHardWareVersion();
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void readyReadStandardOutput();
|
||||||
|
void readyReadStandardError();
|
||||||
|
void finished(int exitCode, QProcess::ExitStatus exitStatus);
|
||||||
|
|
||||||
|
};
|
||||||
|
#endif // UPDATE_H_INCLUDED
|
25
update_dc_event.cpp
Normal file
25
update_dc_event.cpp
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
#include "update_dc_event.h"
|
||||||
|
|
||||||
|
QEvent::Type UpdateDcEvent::customEventType = QEvent::None;
|
||||||
|
|
||||||
|
UpdateDcEvent::UpdateDcEvent(QObject const *sender,
|
||||||
|
UpdateStep updateStep,
|
||||||
|
int count,
|
||||||
|
QDateTime const &sendDateTime)
|
||||||
|
: QEvent(UpdateDcEvent::type())
|
||||||
|
, m_sender(sender)
|
||||||
|
, m_updateStep(updateStep)
|
||||||
|
, m_count(count)
|
||||||
|
, m_sendDateTime(sendDateTime) {
|
||||||
|
}
|
||||||
|
|
||||||
|
UpdateDcEvent::~UpdateDcEvent() {
|
||||||
|
}
|
||||||
|
|
||||||
|
QEvent::Type UpdateDcEvent::type() {
|
||||||
|
if (customEventType == QEvent::None) {
|
||||||
|
int generatedType = QEvent::registerEventType();
|
||||||
|
customEventType = static_cast<QEvent::Type>(generatedType);
|
||||||
|
}
|
||||||
|
return customEventType;
|
||||||
|
}
|
40
update_dc_event.h
Normal file
40
update_dc_event.h
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
#ifndef UPDATE_DC_EVENT_H_INCLUDED
|
||||||
|
#define UPDATE_DC_EVENT_H_INCLUDED
|
||||||
|
|
||||||
|
#include <QEvent>
|
||||||
|
#include <QDateTime>
|
||||||
|
|
||||||
|
class UpdateDcEvent : public QEvent {
|
||||||
|
public:
|
||||||
|
enum UpdateStep { NONE, DC_REBOOT, BL_START, BL_CHECK, BL_CHECK_AFTER_STOP, BL_IS_UP, BL_IS_DOWN, BL_STOP};
|
||||||
|
|
||||||
|
private:
|
||||||
|
QObject const *m_sender;
|
||||||
|
UpdateStep m_updateStep;
|
||||||
|
int m_count;
|
||||||
|
QDateTime m_sendDateTime;
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit UpdateDcEvent(QObject const *sender, UpdateStep updateStep,
|
||||||
|
int count,
|
||||||
|
QDateTime const &sendDateTime = QDateTime::currentDateTime());
|
||||||
|
virtual ~UpdateDcEvent();
|
||||||
|
static QEvent::Type type();
|
||||||
|
|
||||||
|
QObject const *sender() { return m_sender; }
|
||||||
|
QObject const *sender() const { return m_sender; }
|
||||||
|
|
||||||
|
void setUpdateStep(UpdateStep updateStep) { m_updateStep = updateStep; }
|
||||||
|
UpdateStep updateStep() { return m_updateStep; }
|
||||||
|
UpdateStep updateStep() const { return m_updateStep; }
|
||||||
|
int count() const { return m_count; }
|
||||||
|
void setCount(int count) { m_count = count; }
|
||||||
|
QDateTime &sendDateTime() { return m_sendDateTime; }
|
||||||
|
QDateTime const &sendDateTime() const { return m_sendDateTime; }
|
||||||
|
|
||||||
|
private:
|
||||||
|
static QEvent::Type customEventType;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif // PROGRESS_EVENT_H_INCLUDED
|
304
utils.cpp
Normal file
304
utils.cpp
Normal file
@@ -0,0 +1,304 @@
|
|||||||
|
#include "utils.h"
|
||||||
|
#include "message_handler.h"
|
||||||
|
#include "git/git_client.h"
|
||||||
|
|
||||||
|
|
||||||
|
#if defined (Q_OS_UNIX) || defined (Q_OS_LINUX)
|
||||||
|
#include "unistd.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <QFile>
|
||||||
|
#include <QTextStream>
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QDir>
|
||||||
|
#include <QDirIterator>
|
||||||
|
#include <QRegularExpression>
|
||||||
|
|
||||||
|
#include <fstream>
|
||||||
|
|
||||||
|
int Utils::read1stLineOfFile(QString fileName) {
|
||||||
|
QFile f(fileName);
|
||||||
|
if (f.exists()) {
|
||||||
|
if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
||||||
|
QTextStream in(&f);
|
||||||
|
in.setCodec("UTF-8");
|
||||||
|
while(!in.atEnd()) {
|
||||||
|
return in.readLine().toInt();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString Utils::zoneName(quint8 i) {
|
||||||
|
static constexpr char const *zName[] = {
|
||||||
|
"",
|
||||||
|
"purple",
|
||||||
|
"blue",
|
||||||
|
"yellow",
|
||||||
|
"green",
|
||||||
|
"yellow (mars)",
|
||||||
|
"green (mars)"
|
||||||
|
};
|
||||||
|
if (i < (sizeof(zName)/sizeof(char const *))) {
|
||||||
|
return zName[i];
|
||||||
|
}
|
||||||
|
return "N/A";
|
||||||
|
}
|
||||||
|
|
||||||
|
void Utils::printCriticalErrorMsg(QString const &errorMsg, bool upper, bool lower) {
|
||||||
|
if (upper) qCritical() << QString(80, 'E');
|
||||||
|
|
||||||
|
qCritical() << errorMsg;
|
||||||
|
|
||||||
|
if (lower) qCritical() << QString(80, 'E');
|
||||||
|
}
|
||||||
|
|
||||||
|
void Utils::printCriticalErrorMsg(QStringList const &errorMsg) {
|
||||||
|
qCritical() << QString(80, 'E');
|
||||||
|
for (int i = 0; i < errorMsg.size(); ++i) {
|
||||||
|
qCritical() << errorMsg.at(i);
|
||||||
|
}
|
||||||
|
qCritical() << QString(80, 'E');
|
||||||
|
}
|
||||||
|
|
||||||
|
void Utils::printUpdateStatusMsg(QDebug debug, QStringList const &updateMsg) {
|
||||||
|
//if (updateMsg.size() > 1) {
|
||||||
|
// qCritical() << QString(80, 'U');
|
||||||
|
//}
|
||||||
|
|
||||||
|
Q_UNUSED(debug);
|
||||||
|
|
||||||
|
for (int i = 0; i < updateMsg.size(); ++i) {
|
||||||
|
qInfo() << updateMsg.at(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
//if (updateMsg.size() > 1) {
|
||||||
|
// qCritical() << QString(80, 'U');
|
||||||
|
//}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Utils::printUpdateStatusMsg(QStringList const &updateMsg) {
|
||||||
|
//if (updateMsg.size() > 1) {
|
||||||
|
// qCritical() << QString(80, 'U');
|
||||||
|
//}
|
||||||
|
|
||||||
|
for (int i = 0; i < updateMsg.size(); ++i) {
|
||||||
|
qCritical() << updateMsg.at(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
//if (updateMsg.size() > 1) {
|
||||||
|
// qCritical() << QString(80, 'U');
|
||||||
|
//}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Utils::printUpdateStatusMsg(QString const &updateMsg, bool upper, bool lower) {
|
||||||
|
if (upper) qCritical() << QString(80, 'U');
|
||||||
|
|
||||||
|
qCritical() << updateMsg;
|
||||||
|
|
||||||
|
if (lower) qCritical() << QString(80, 'U');
|
||||||
|
}
|
||||||
|
|
||||||
|
void Utils::printUpdateStatusMsg(QDebug debug, QString const &updateMsg,
|
||||||
|
bool upper, bool lower) {
|
||||||
|
if (upper) debug << QString(80, 'U');
|
||||||
|
|
||||||
|
qInfo() << updateMsg;
|
||||||
|
|
||||||
|
if (lower) debug << QString(80, 'U');
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void Utils::printInfoMsg(QString const &infoMsg, bool upper, bool lower) {
|
||||||
|
if (upper) qCritical() << QString(80, 'I');
|
||||||
|
|
||||||
|
qCritical() << infoMsg;
|
||||||
|
|
||||||
|
if (lower) qCritical() << QString(80, 'I');
|
||||||
|
}
|
||||||
|
|
||||||
|
void Utils::printInfoMsg(QStringList const &infoMsg) {
|
||||||
|
//if (infoMsg.size() > 1) {
|
||||||
|
// qCritical() << QString(80, 'I');
|
||||||
|
//}
|
||||||
|
|
||||||
|
for (int i = 0; i < infoMsg.size(); ++i) {
|
||||||
|
qCritical() << infoMsg.at(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
//if (infoMsg.size() > 1) {
|
||||||
|
// qCritical() << QString(80, 'I');
|
||||||
|
//}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Utils::printLineEditInfo(QStringList const &lines) {
|
||||||
|
if (getDebugLevel() == LOG_DEBUG) {
|
||||||
|
for (int i=0; i<lines.size(); ++i) {
|
||||||
|
qInfo() << lines.at(i);
|
||||||
|
} qInfo() << ""; qInfo() << "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QString Utils::getTariffLoadTime(QString fileName) {
|
||||||
|
QFileInfo fInfo(fileName);
|
||||||
|
if (fInfo.exists()) {
|
||||||
|
QDateTime lastModifiedTime = fInfo.lastModified();
|
||||||
|
if (lastModifiedTime.isValid()) {
|
||||||
|
return lastModifiedTime.toString(Qt::ISODateWithMs);
|
||||||
|
} else {
|
||||||
|
printCriticalErrorMsg(fileName + " HAS INVALID MODIFIED-TIME");
|
||||||
|
QDateTime birthTime = fInfo.birthTime();
|
||||||
|
if (birthTime.isValid()) {
|
||||||
|
return birthTime.toString(Qt::ISODateWithMs);
|
||||||
|
} else {
|
||||||
|
printCriticalErrorMsg(fileName + " HAS INVALID BIRTH-TIME");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
printCriticalErrorMsg(fileName + " DOES NOT EXIST");
|
||||||
|
}
|
||||||
|
return "N/A";
|
||||||
|
}
|
||||||
|
|
||||||
|
QString Utils::rstrip(QString const &str) {
|
||||||
|
int n = str.size() - 1;
|
||||||
|
for (; n >= 0; --n) {
|
||||||
|
if (!str.at(n).isSpace()) {
|
||||||
|
return str.left(n + 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2,
|
||||||
|
QStringList const &nameFilters) {
|
||||||
|
if (!dir1.exists()) {
|
||||||
|
printCriticalErrorMsg(dir1.dirName() + " DOES NOT EXIST");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (!dir2.exists()) {
|
||||||
|
printCriticalErrorMsg(dir2.dirName() + " DOES NOT EXIST");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (dir1.absolutePath() == dir2.absolutePath()) {
|
||||||
|
printCriticalErrorMsg(dir1.dirName() + " AND "+ dir2.dirName() + " HAVE SAME PATH");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// files, sorted by name
|
||||||
|
QFileInfoList const &lst1 = dir1.entryInfoList(nameFilters, QDir::Files, QDir::Name);
|
||||||
|
QFileInfoList const &lst2 = dir2.entryInfoList(nameFilters, QDir::Files, QDir::Name);
|
||||||
|
|
||||||
|
QStringList fileNameLst1{};
|
||||||
|
QStringList fileNameLst2{};
|
||||||
|
QListIterator<QFileInfo> i1(lst1);
|
||||||
|
while (i1.hasNext()) {
|
||||||
|
fileNameLst1 << i1.next().fileName();
|
||||||
|
}
|
||||||
|
QListIterator<QFileInfo> i2(lst2);
|
||||||
|
while (i2.hasNext()) {
|
||||||
|
fileNameLst2 << i2.next().fileName();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fileNameLst1.isEmpty()) {
|
||||||
|
qCritical() << "DIR1" << dir1.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (fileNameLst2.isEmpty()) {
|
||||||
|
qCritical() << "DIR1" << dir2.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (fileNameLst1 != fileNameLst2) {
|
||||||
|
printCriticalErrorMsg(dir1.dirName() + " AND " + dir2.dirName()
|
||||||
|
+ " DIFFER: [" + fileNameLst1.join(',') + "],["
|
||||||
|
+ fileNameLst2.join(',') + "]");
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
printInfoMsg(dir1.dirName() + " AND " + dir2.dirName()
|
||||||
|
+ " ARE EQUAL: [" + fileNameLst1.join(',') + "]");
|
||||||
|
}
|
||||||
|
|
||||||
|
QStringList gitBlobLst1{};
|
||||||
|
QStringList gitBlobLst2{};
|
||||||
|
QListIterator<QFileInfo> i3(lst1);
|
||||||
|
while (i3.hasNext()) {
|
||||||
|
gitBlobLst1 << GitClient::gitBlob(i3.next().fileName());
|
||||||
|
}
|
||||||
|
QListIterator<QFileInfo> i4(lst2);
|
||||||
|
while (i4.hasNext()) {
|
||||||
|
gitBlobLst2 << GitClient::gitBlob(i4.next().fileName());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (gitBlobLst1.isEmpty()) {
|
||||||
|
qCritical() << "DIR1" << dir1.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (gitBlobLst2.isEmpty()) {
|
||||||
|
qCritical() << "DIR1" << dir2.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (gitBlobLst1 != gitBlobLst2) {
|
||||||
|
printCriticalErrorMsg(dir1.dirName() + " AND " + dir2.dirName()
|
||||||
|
+ " DIFFER: [" + gitBlobLst1.join(',') + "],["
|
||||||
|
+ gitBlobLst2.join(',') + "]");
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
printInfoMsg(dir1.dirName() + " AND " + dir2.dirName()
|
||||||
|
+ " CONTAIN SAME GIT-BLOBS FOR FILES: [" + fileNameLst1.join(',') + "]");
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString Utils::getParentName() { // get name of parent process
|
||||||
|
QString ppid = QString("/proc/%1/status").arg(getppid());
|
||||||
|
std::ifstream f(ppid.toStdString().c_str());
|
||||||
|
if (f.is_open()) {
|
||||||
|
std::string next;
|
||||||
|
while (std::getline(f, next)) {
|
||||||
|
QString line = QString(next.c_str()).simplified();
|
||||||
|
if (line.startsWith("Name")) {
|
||||||
|
int const idx = line.indexOf(QChar(':'));
|
||||||
|
if (idx != -1) {
|
||||||
|
return line.mid(idx+1).trimmed();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Utils::isATBQTRunning() {
|
||||||
|
QDirIterator it("/proc",
|
||||||
|
QStringList() << "status",
|
||||||
|
QDir::Files,
|
||||||
|
QDirIterator::Subdirectories);
|
||||||
|
while (it.hasNext()) {
|
||||||
|
QString const &nextStatusFile = it.next();
|
||||||
|
static const QRegularExpression re("^/proc/[0-9]{1,}/status");
|
||||||
|
QRegularExpressionMatch match = re.match(nextStatusFile);
|
||||||
|
if (match.hasMatch()) {
|
||||||
|
std::ifstream f(nextStatusFile.toStdString().c_str());
|
||||||
|
if (f.is_open()) {
|
||||||
|
std::string next;
|
||||||
|
while (std::getline(f, next)) {
|
||||||
|
QString line = QString(next.c_str()).simplified();
|
||||||
|
if (line.startsWith("Name")) {
|
||||||
|
int const idx = line.indexOf(QChar(':'));
|
||||||
|
if (idx != -1) {
|
||||||
|
QString const binary = line.mid(idx+1).trimmed();
|
||||||
|
if (binary == "ATBQT") {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
35
utils.h
Normal file
35
utils.h
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
#ifndef UTILS_H_INCLUDED
|
||||||
|
#define UTILS_H_INCLUDED
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QString>
|
||||||
|
#include <QStringList>
|
||||||
|
#include <QFile>
|
||||||
|
#include <QFileInfo>
|
||||||
|
#include <QDateTime>
|
||||||
|
#include <QDir>
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
|
namespace Utils {
|
||||||
|
int read1stLineOfFile(QString fileName);
|
||||||
|
QString zoneName(quint8 i);
|
||||||
|
void printCriticalErrorMsg(QString const &errorMsg, bool upper=false, bool lower=false);
|
||||||
|
void printCriticalErrorMsg(QStringList const &errorMsg);
|
||||||
|
void printInfoMsg(QString const &infoMsg, bool upper=false, bool lower=false);
|
||||||
|
void printInfoMsg(QStringList const &infoMsg);
|
||||||
|
void printUpdateStatusMsg(QDebug debug, QStringList const &updateMsg);
|
||||||
|
void printUpdateStatusMsg(QStringList const &updateMsg);
|
||||||
|
void printUpdateStatusMsg(QString const &updateMsg, bool upper=false, bool lower=false);
|
||||||
|
void printUpdateStatusMsg(QDebug debug, QString const &updateMsg, bool upper=false, bool lower=false);
|
||||||
|
void printLineEditInfo(QStringList const &lines);
|
||||||
|
QString getTariffLoadTime(QString fileName);
|
||||||
|
QString rstrip(QString const &str);
|
||||||
|
bool sameFilesInDirs(QDir const &dir1, QDir const &dir2,
|
||||||
|
QStringList const &nameFilters = {"*.json"});
|
||||||
|
|
||||||
|
|
||||||
|
QString getParentName();
|
||||||
|
bool isATBQTRunning();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // UTILS_H_INCLUDED
|
1107
worker.cpp
Normal file
1107
worker.cpp
Normal file
File diff suppressed because it is too large
Load Diff
13
worker_thread.cpp
Normal file
13
worker_thread.cpp
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
#include "worker_thread.h"
|
||||||
|
|
||||||
|
WorkerThread::WorkerThread(QString const &name,
|
||||||
|
QObject *parent) : QThread(parent) {
|
||||||
|
this->setObjectName(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
WorkerThread::~WorkerThread() {
|
||||||
|
}
|
||||||
|
|
||||||
|
//void WorkerThread::run() {
|
||||||
|
//
|
||||||
|
//}
|
17
worker_thread.h
Normal file
17
worker_thread.h
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
#ifndef WORKER_THREAD_H_INCLUDED
|
||||||
|
#define WORKER_THREAD_H_INCLUDED
|
||||||
|
|
||||||
|
#include <QThread>
|
||||||
|
#include <QString>
|
||||||
|
|
||||||
|
class WorkerThread : public QThread {
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
WorkerThread(QString const &name, QObject *parent = nullptr);
|
||||||
|
virtual ~WorkerThread();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
// virtual void run();
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // WORKER_THREAD_H_INCLUDED
|
Reference in New Issue
Block a user