Index: main.cpp
===================================================================
diff -u -r7189d77fab4c43a6ca952105c9f44deba6a96a6a -ra2b150e7b398bbfbb51c8a11e35a029ba03e906f
--- main.cpp	(.../main.cpp)	(revision 7189d77fab4c43a6ca952105c9f44deba6a96a6a)
+++ main.cpp	(.../main.cpp)	(revision a2b150e7b398bbfbb51c8a11e35a029ba03e906f)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2019-2024 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    main.cpp
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      26-Jul-2023
+ * \date    (last)      10-Mar-2024
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  24-Sep-2019
  *
@@ -105,9 +105,15 @@
 bool        gEnableUpdating             = false ;
 bool        gUseRootHome                = false ;
 
+bool        gLogLongName                = false ;
+bool        gLogUpload                  = false ;
+bool        gLogCompress                = false ;
+
 QString     gParserErrorText            = "";
+QString     gStandard_tmp               = QString("/%1/").arg("tmp");
 
 
+
 /*!
  * \page    CommandLineSwitches Denali Command Line Switches
  * \verbatim
@@ -151,9 +157,14 @@
  *    -R, --use-root-home                  In case the application is not in
  *                                         Manufacturing Setup but needs to use root
  *                                         home folder for configurations.
- *    -U, --enable-Update-mode             Enables the update mode to update only
+ *    -U, --enable-update-mode             Enables the update mode to update only
  *                                         necessary files during the update and
  *                                         keep the rest.
+ *    -x, --use-log-long-name              Use the log long file name format
+ *                                         <date>_<time>_<serial>_<mode>
+ *    -y, --use-log-cloud-upload           Use the log cloud upload
+ *    -z, --use-log-compression            Use the log compression
+ *
  * \endverbatim
  */
 /*!
@@ -291,9 +302,33 @@
         QCoreApplication::translate("main", "Enables the update mode to update only necessary files during the update and keep the rest."));
     parser.addOption(optionEnableUpdating);
 
+    // --- -x : use-log-long-name
+    QCommandLineOption optionLogLongName(
+                QStringList() << "x" << "use-log-long-name",
+                QCoreApplication::translate("main", "Use the log long file name format\n<date>_<time>_<serial>_<mode>"));
+    parser.addOption(optionLogLongName);
+
+    // --- -y : use-log-cloud-upload
+    QCommandLineOption optionLogUpload(
+                QStringList() << "y" << "use-log-cloud-upload",
+                QCoreApplication::translate("main", "Use the log cloud upload"));
+    parser.addOption(optionLogUpload);
+
+    // --- -z : use-log-compression
+    QCommandLineOption optionLogCompress(
+                QStringList() << "z" << "use-log-compression",
+                QCoreApplication::translate("main", "Use the log compression"));
+    parser.addOption(optionLogCompress);
+
     // --- parse command lines
     if ( ! parser.parse(qApp->arguments()) ) {
         gParserErrorText = parser.errorText();
+        qDebug().noquote().nospace()
+                << "------------------------------" << "\n"
+                << gParserErrorText                 << "\n"
+                << "Command Line Parser failed !!!" << "\n"
+                << qApp->arguments().join(" ")      << "\n"
+                << "------------------------------" ;
         return;
     }
     parser.process(*qApp);
@@ -317,6 +352,16 @@
     gEnableUpdating             = parser.isSet(optionEnableUpdating             );
     gUseRootHome                = parser.isSet(optionUseRootHome                );
 
+    gLogLongName                = parser.isSet(optionLogLongName                );
+    gLogUpload                  = parser.isSet(optionLogUpload                  );
+    gLogCompress                = parser.isSet(optionLogCompress                );
+
+    //DEBUG:
+    qDebug() << "\n"
+             << "---------- x:" << gLogLongName << "\n"
+             << "---------- y:" << gLogUpload   << "\n"
+             << "---------- z:" << gLogCompress << "\n";
+
     if (                          parser.isSet(optionActiveCANBus               ) ) {
         QString value = parser.value(optionActiveCANBus);
         if ( ! value.startsWith("-") &&                                     //  if a value is not given for the switch then the next switch becomes the value of the previous one
@@ -352,59 +397,93 @@
  *          and revision(build) version will be set to current date/time.
  */
 void setApplicationVersion() {
+    const char sepRels   = '-';
+    const char sepVers   = '.';
+    const char sepComp   = '-';
+
+
     bool    isOnServer  = true;
-    QString ver_major   = QString("%1").arg(UI_VERSION_MAJAR        );
-    QString ver_minor   = QString("%1").arg(UI_VERSION_MINOR        );
-    QString ver_micro   = QString("%1").arg(UI_VERSION_MICRO        );
+    QString ver_major   = QString("%1").arg(VER_MAJOR               );
+    QString ver_minor   = QString("%1").arg(VER_MINOR               );
+    QString ver_micro   = QString("%1").arg(VER_MICRO               );
     QString ver_revis   = QString("%1").arg(VER_REVIS               );
     QString ver_branch  = QString("%1").arg(VER_BRANCH              );
     QString ver_comp    = QString("%1").arg(SW_COMPATIBILITY_REV    );
+    QString ver_branchx = "";
 
     if (ver_revis.isEmpty())  {
         ver_revis = VER_REVIS_DEV;
         isOnServer  = false;
     }
 
+    //DEBUG: On Server
+    // isOnServer = true;
+    // ver_branch = "release/p1";
+    // ver_branch = "release/p1_staging";
+    // ver_branch = "release/p1_develop";
+    // ver_branch = "release/p1b/master";
+    // ver_branch = "release/p1/staging";
+    // ver_branch = "release/p1/develop";
+    // ver_branch = "master";
+    // ver_branch = "staging";
+    // ver_branch = "develop";
+
+    bool isRelease  = ver_branch.startsWith("release/");
     bool isOnMaster = ver_branch == "master";
-    bool isNotStory = isOnMaster
-            || ver_branch == "staging"
-            || ver_branch == "develop";
+    bool isNotStory = isRelease                 ||
+                      isOnMaster                ||
+                      ver_branch == "staging"   ||
+                      ver_branch == "develop"   ;
     if (isNotStory) {
         if (isOnServer) {
             if (isOnMaster ) {
                 ver_branch = ""; // if only is built on server master branch do not show branch
             }
-            ver_major   += '.';
-            ver_minor   += '.';
-            ver_micro   += '.';
+            if ( isRelease ) {
+                ver_branch = ver_branch.remove(0,QString("release/").length());
+                QStringList ver_branch_sections = ver_branch.split("/");
+                if ( ver_branch_sections.count() >= 2 ) {
+                    ver_branch  = ver_branch_sections[0].toUpper();
+                    ver_branchx = ver_branch_sections[1];
+                    if ( ver_branchx == "master" ) {
+                        ver_branchx = "";
+                    } else {
+                        ver_branchx = "-" + ver_branchx;
+                    }
+                }
+            }
+            ver_major   += sepVers;
+            ver_minor   += sepVers;
+            ver_micro   += sepVers;
         }
     }
 
-    if ( ! ver_branch.isEmpty()) ver_branch += '.';
-    ver_comp = "." + ver_comp;
+    if ( ! ver_branch.isEmpty()) ver_branch += sepRels;
+    ver_comp = sepComp + ver_comp;
+
     QString version = "";
     version += ver_branch   ;
     version += ver_major    ;
     version += ver_minor    ;
     version += ver_micro    ;
     version += ver_revis    ; // build number
     version += ver_comp     ;
-
+    version += ver_branchx  ;
     QCoreApplication::setApplicationVersion(version);
 }
 
 /*!
  * \brief   lockdown
- * \details runs the lockdown shellscript as a detached process
- *          and ment to be executed just before the application quits
+ * \details runs the lockdown shell script as a detached process
+ *          and meant to be executed just before the application quits
  *          and only when application running in manufacturing or update mode.
  *          Must not stop application shutdown in any way.
  *          If any error happens it only logs.
  */
 void lockdown() {
     // there are two setup scenarios:
     // only during setup mode which is -E (manufacturing setup) or -U -E (update setup) application is running under the root user permissions
-    // and all the files are copied to the /home/root/ te later be copied to secured locations
+    // and all the files are copied to the /home/root/ to later be copied to secured locations
     // and that will be done by lockdown.sh script running within application after the user is done with the setup and QUIT s the application.
     if ( gEnableManufacturing || gEnableUpdating ) {
         QString scriptName = Storage::Device_Lockdown;
@@ -436,7 +515,6 @@
  */
 int main(int argc, char *argv[])
 {
-
 #ifndef SQUISH_COCO_BULD
     signal(SIGINT , signalhandler);
     signal(SIGTERM, signalhandler);