Compare commits
2 Commits
dc-downloa
...
master
Author | SHA1 | Date | |
---|---|---|---|
a240711946 | |||
75fdca95d9 |
@ -103,7 +103,9 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# Move final processing to subclass UpdateProcessRunning.
|
# Move final processing to subclass UpdateProcessRunning.
|
||||||
# Disable EXIT-button for the whole update-process, except for the
|
# Disable EXIT-button for the whole update-process, except for the
|
||||||
# checking of the ISMAS-trigger-button (aka WAIT-button).
|
# checking of the ISMAS-trigger-button (aka WAIT-button).
|
||||||
VERSION="1.4.0"
|
# 1.4.1 : Sync files in the customer repository (under ./etc) as the very
|
||||||
|
# first step
|
||||||
|
VERSION="1.4.1"
|
||||||
# PLANNED TODOS:
|
# PLANNED TODOS:
|
||||||
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||||
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
||||||
@ -117,7 +119,6 @@ VERSION="1.4.0"
|
|||||||
# ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
|
# ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
|
||||||
# Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
|
# Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
|
||||||
# ausgefuehrt.
|
# ausgefuehrt.
|
||||||
# 4: rsync: immer alle Dateien soiegeln (bis auf opkg-commands)
|
|
||||||
# 5: Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
|
# 5: Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
|
||||||
# installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
|
# installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
|
||||||
# 6: rsync: explizites Binary, nicht das in busybox enthaltene.
|
# 6: rsync: explizites Binary, nicht das in busybox enthaltene.
|
||||||
@ -133,9 +134,6 @@ VERSION="1.4.0"
|
|||||||
# Stellung des WAIT-Button. Grund: es koennte sein, dass andernfalls ein
|
# Stellung des WAIT-Button. Grund: es koennte sein, dass andernfalls ein
|
||||||
# PSA weit hiter anderen steht, und dann ploetzlich einmal alle vorher-
|
# PSA weit hiter anderen steht, und dann ploetzlich einmal alle vorher-
|
||||||
# gehenden Aenderungen anzieht, die gar nicht fuer ihn gemeint waren.
|
# gehenden Aenderungen anzieht, die gar nicht fuer ihn gemeint waren.
|
||||||
# 10: Bei einer Neuinstallation (Neuhauser) immer JSON files runterladen,
|
|
||||||
# Tariff-Files syncen (d.h. nur wenn noch kein Repo vorhanden ist), und
|
|
||||||
# zwar auch ohne WAIT-Button.
|
|
||||||
# 11: Das Edit-Fenster teilen um die Anzeige zu verbessern.
|
# 11: Das Edit-Fenster teilen um die Anzeige zu verbessern.
|
||||||
# 12: Bei einem Update muss immer ersichtlich sein, warum es ueberhaupt
|
# 12: Bei einem Update muss immer ersichtlich sein, warum es ueberhaupt
|
||||||
# angestossen wurde. Steht kein "WAIT" im ISMAS-Trigger, dann kann man
|
# angestossen wurde. Steht kein "WAIT" im ISMAS-Trigger, dann kann man
|
||||||
|
25
worker.cpp
25
worker.cpp
@ -429,6 +429,18 @@ void Worker::privateUpdate() {
|
|||||||
ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECKOUT_BRANCH);
|
ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECKOUT_BRANCH);
|
||||||
setProgress(_CHECKOUT_BRANCH_SUCCESS);
|
setProgress(_CHECKOUT_BRANCH_SUCCESS);
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// (R)SYNC THE REPOSITORY WITH THE LOCAL FILEYSTEM
|
||||||
|
//
|
||||||
|
////////////////////////////////////////////////////////////////////////////
|
||||||
|
if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
|
||||||
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS));
|
||||||
|
setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// COMPUTE CHANGED FILES OF CUSTOMER REPOSITORY
|
// COMPUTE CHANGED FILES OF CUSTOMER REPOSITORY
|
||||||
@ -468,19 +480,6 @@ void Worker::privateUpdate() {
|
|||||||
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
||||||
setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS);
|
setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS);
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// (R)SYNC THE REPOSITORY WITH THE LOCAL FILEYSTEM
|
|
||||||
//
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
|
||||||
if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
|
|
||||||
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS));
|
|
||||||
setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// FUTURE: SAVE LOG FILES
|
// FUTURE: SAVE LOG FILES
|
||||||
|
12
worker.h
12
worker.h
@ -61,9 +61,12 @@
|
|||||||
#define _UPDATE_REPOSITORY_SUCCESS (27)
|
#define _UPDATE_REPOSITORY_SUCCESS (27)
|
||||||
#define _CHECK_FOR_REPOSITORY_CHANGES (28)
|
#define _CHECK_FOR_REPOSITORY_CHANGES (28)
|
||||||
#define _CHECK_FOR_REPOSITORY_CHANGES_SUCCESS (29)
|
#define _CHECK_FOR_REPOSITORY_CHANGES_SUCCESS (29)
|
||||||
#define _FILES_TO_UPDATE (30)
|
#define _SYNC_CUSTOMER_REPOSITORY (30)
|
||||||
#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE (31)
|
#define _SYNC_CUSTOMER_REPOSITORY_FAILURE (31)
|
||||||
#define _FILES_TO_DOWNLOAD (32)
|
#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS (32)
|
||||||
|
#define _FILES_TO_UPDATE (33)
|
||||||
|
#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE (34)
|
||||||
|
#define _FILES_TO_DOWNLOAD (35)
|
||||||
#define _EXEC_OPKG_COMMANDS (41)
|
#define _EXEC_OPKG_COMMANDS (41)
|
||||||
#define _EXEC_OPKG_COMMAND_1 (42)
|
#define _EXEC_OPKG_COMMAND_1 (42)
|
||||||
#define _EXEC_OPKG_COMMAND_2 (43)
|
#define _EXEC_OPKG_COMMAND_2 (43)
|
||||||
@ -86,9 +89,6 @@
|
|||||||
#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE (86)
|
#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE (86)
|
||||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE (87)
|
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE (87)
|
||||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS (88)
|
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS (88)
|
||||||
#define _SYNC_CUSTOMER_REPOSITORY (89)
|
|
||||||
#define _SYNC_CUSTOMER_REPOSITORY_FAILURE (90)
|
|
||||||
#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS (91)
|
|
||||||
#define _SAVE_LOGS (92)
|
#define _SAVE_LOGS (92)
|
||||||
#define _SAVE_LOGS_FAILURE (93)
|
#define _SAVE_LOGS_FAILURE (93)
|
||||||
#define _SAVE_LOGS_SUCCESS (94)
|
#define _SAVE_LOGS_SUCCESS (94)
|
||||||
|
Loading…
Reference in New Issue
Block a user