Ticket #13136: 20170929_startup.patch

mythtv/libs/libmyth/guistartup.cpp

@@ -157 +157 @@
     m_Retry = false;
 }
 
+void GUIStartup::setRetryButtonText(const QString text)
+{
+    m_retryButton->SetText(text);
+}
+
 // return = true if time is up
-bool GUIStartup::updateProgress(bool finished)
+bool GUIStartup::updateProgress(bool finished, bool reset)
 {
     if (m_progressTimer)
     {
@@ -167 +172 @@
             elapsed = m_total;
         else
             elapsed = m_progressTimer->elapsed();
-        m_progressBar->SetUsed(elapsed);
+        if (reset)
+            m_progressBar->SetUsed(0);
+        else
+            m_progressBar->SetUsed(elapsed);
         if (elapsed >= m_total)
         {
             m_timer.stop();

mythtv/libs/libmyth/guistartup.h

@@ -62 +62 @@
     bool setStatusState(const QString &name);
     bool setMessageState(const QString &name);
     void setTotal(int total);
+    void setRetryButtonText(const QString text);
 
   public slots:
-    bool updateProgress(bool finished = false);
+    bool updateProgress(bool finished = false, bool reset = false);
 
   private slots:
     void Retry(void);

mythtv/libs/libmyth/mythcontext.cpp

@@ -70 +70 @@
 
     bool Init        (const bool gui,
                       const bool prompt, const bool noPrompt,
-                      const bool ignoreDB);
+                      const bool ignoreDB,
+                      const bool bWaitBeforeConnect);
     bool FindDatabase(const bool prompt, const bool noPrompt);
 
     void TempMainWindow(bool languagePrompt = true);
@@ -128 +129 @@
     QEventLoop *m_loop;
     bool needsBackend;
     bool m_settingsCacheDirty;
+    bool m_bWaitBeforeConnect;
 
   private:
     MythConfirmationDialog *MBEversionPopup;
@@ -243 +245 @@
       m_guiStartup(0),
       needsBackend(false),
       m_settingsCacheDirty(false),
+      m_bWaitBeforeConnect(false),
       MBEversionPopup(NULL),
       m_registration(-1),
       m_socket(0)
@@ -343 +346 @@
 bool MythContextPrivate::Init(const bool gui,
                               const bool promptForBackend,
                               const bool noPrompt,
-                              const bool ignoreDB)
+                              const bool ignoreDB,
+                              const bool bWaitBeforeConnect)
 {
     gCoreContext->GetDB()->IgnoreDatabase(ignoreDB);
     m_gui = gui;
+    m_bWaitBeforeConnect = bWaitBeforeConnect;
 
     if (gCoreContext->IsFrontend())
         needsBackend = true;
@@ -797 +802 @@
         st_dbConnects = 3,
         st_beWOL = 4,
         st_beAwake = 5,
-        st_success = 6
+        st_success = 6,
+        st_wait = 7
     } startupState = st_start;
 
-    static const QString guiStatuses[7] =
+    static const QString guiStatuses[8] =
         {"start","dbAwake","dbStarted","dbConnects","beWOL","beAwake",
-            "success" };
+            "success","wait" };
+
+    bool waitForUser = m_bWaitBeforeConnect;
 
     do
     {
-        host = m_DBparams.dbHostName;
+        if (m_DBparams.dbHostName.isEmpty() && m_DBhostCp.length())
+            host = m_DBhostCp;
+        else
+            host = m_DBparams.dbHostName;
         port = m_DBparams.dbPort;
         if (port == 0)
             port = 3306;
         int wakeupTime = 3;
         int attempts = 11;
-        if (m_DBparams.wolEnabled) {
-            wakeupTime = m_DBparams.wolReconnect;
-            attempts = m_DBparams.wolRetry + 1;
-            startupState = st_start;
+        if (waitForUser)
+        {
+            startupState = st_wait;
+            ShowGuiStartup();
+            if (m_guiStartup)
+                //: Text for Start button - to start connecting to backend
+                m_guiStartup->setRetryButtonText(QObject::tr("Start"));
         }
         else
-            startupState = st_dbAwake;
+        {
+            if (m_guiStartup)
+                //: Text for Retry button - to try again connecting to backend
+                m_guiStartup->setRetryButtonText(QObject::tr("Retry"));
+            if (m_DBparams.wolEnabled) {
+                wakeupTime = m_DBparams.wolReconnect;
+                attempts = m_DBparams.wolRetry + 1;
+                startupState = st_start;
+            }
+            else
+                startupState = st_dbAwake;
+        }
         if (attempts < 6)
             attempts = 6;
         if (!prompt)
@@ -837 +862 @@
         QString masterserver;
 
         for (int attempt = 0;
-            attempt < attempts && startupState != st_success;
+            attempt < attempts && startupState != st_success
+                && startupState != st_wait;
             ++attempt)
         {
             // The first time do everything with minimum timeout and
@@ -962 +988 @@
             break;
 
         QString stateMsg = guiStatuses[startupState];
-        stateMsg.append("Fail");
-        LOG(VB_GENERAL, LOG_INFO,
-             QString("Start up failure. host %1, status %2")
-                  .arg(host).arg(stateMsg));
-
+        if (startupState != st_wait)
+        {
+            stateMsg.append("Fail");
+            LOG(VB_GENERAL, LOG_INFO,
+                 QString("Start up failure. host %1, status %2")
+                      .arg(host).arg(stateMsg));
+        }
         if (m_guiStartup
           && !m_guiStartup->m_Exit
           && !m_guiStartup->m_Setup
           && !m_guiStartup->m_Search
           && !m_guiStartup->m_Retry)
         {
-            m_guiStartup->updateProgress(true);
+            m_guiStartup->updateProgress(true, waitForUser);
             m_guiStartup->setStatusState(stateMsg);
             m_guiStartup->setMessageState("makeselection");
             m_loop->exec();
+            waitForUser = false;
         }
     }
     while (m_guiStartup && m_guiStartup->m_Retry);
@@ -1002 +1031 @@
         return QObject::tr("Cannot connect to backend", "Backend Setup");
     }
 
+    if (startupState == st_wait)
+    {
+        return QObject::tr("User requested exit", "Backend Setup");
+    }
+
+
     // Current DB connection may have been silenced (invalid):
     EnableDBerrors();
     ResetDatabase();
@@ -1407 +1442 @@
 // return true if progress is 100%
 void MythContextPrivate::processEvents(void)
 {
-//    bool ret = false;
-//    if (m_guiStartup)
-//        ret = m_guiStartup->updateProgress();
     qApp->processEvents(QEventLoop::AllEvents, 250);
     qApp->processEvents(QEventLoop::AllEvents, 250);
-//    return ret;
 }
 
 // cache some settings in cache/contextcache.xml
@@ -1517 +1548 @@
 bool MythContext::Init(const bool gui,
                        const bool promptForBackend,
                        const bool disableAutoDiscovery,
-                       const bool ignoreDB)
+                       const bool ignoreDB,
+                       const bool bWaitBeforeConnect)
 {
     SetDisableEventPopup(true);
 
@@ -1582 +1614 @@
         return false;
     }
 
-    if (!d->Init(gui, promptForBackend, disableAutoDiscovery, ignoreDB))
+    if (!d->Init(gui, promptForBackend, disableAutoDiscovery, ignoreDB, bWaitBeforeConnect))
     {
         return false;
     }

mythtv/libs/libmyth/mythcontext.h

@@ -48 +48 @@
     bool Init(const bool gui = true,
               const bool promptForBackend = false,
               const bool bypassAutoDiscovery = false,
-              const bool ignoreDB = false);
+              const bool ignoreDB = false,
+              const bool bWaitBeforeConnect = false);
 
     DatabaseParams GetDatabaseParams(void);
     bool SaveDatabaseParams(const DatabaseParams &params);

mythtv/programs/mythfrontend/commandlineparser.cpp

@@ -27 +27 @@
         "noautodiscovery", false,
         "Prevent frontend from using UPnP autodiscovery.", "");
 
+    add("--wait", "wait", "",
+            "Wait at the Welcome screen for the user before connecting.",
+            "Stop at the welcome screen before connecting to "
+            "database or backend.\nWait for the user to select "
+            "the Startup button to start frontend.")
+            ->SetGroup("Startup Behavior");
     add("--jumppoint", "jumppoint", "",
         "Start the frontend at specified jump point.", "")
             ->SetGroup("Startup Behavior");

mythtv/programs/mythfrontend/main.cpp

@@ -1766 +1766 @@
 {
     bool bPromptForBackend    = false;
     bool bBypassAutoDiscovery = false;
+    bool bWaitBeforeConnect = false;
 
 #if CONFIG_OMX_RPI
     setenv("QT_XCB_GL_INTEGRATION","none",0);
@@ -1855 +1856 @@
         bPromptForBackend = true;
     if (cmdline.toBool("noautodiscovery"))
         bBypassAutoDiscovery = true;
+    if (cmdline.toBool("wait"))
+        bWaitBeforeConnect = true;
 
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
         cerr << "Unable to ignore SIGPIPE\n";
@@ -1872 +1875 @@
     gContext = new MythContext(MYTH_BINARY_VERSION, true);
     gCoreContext->SetAsFrontend(true);
 
-    if (!gContext->Init(true, bPromptForBackend, bBypassAutoDiscovery))
+    if (!gContext->Init(true, bPromptForBackend, bBypassAutoDiscovery, false, bWaitBeforeConnect))
     {
         LOG(VB_GENERAL, LOG_ERR, "Failed to init MythContext, exiting.");
         return GENERIC_EXIT_NO_MYTHCONTEXT;

mythtv/themes/default/config-ui.xml

@@ -897 +897 @@
                     <value>Unable to connect to master backend.</value>
                 </textarea>
             </state>
+            <state name="wait" from="start">
+                <textarea name="status">
+                    <value>Select Start to open MythFrontend.</value>
+                </textarea>
+            </state>
         </statetype>
 
         <statetype name="messagestate">
@@ -945 +950 @@
         <button name="retry" from="basebutton">
             <position>5%,88%</position>
             <value>Retry</value>
-            <helptext>Try again to establish connections.</helptext>
+            <helptext>Establish connections and continue to startup.</helptext>
         </button>
 
         <button name="search" from="retry">