Ticket #3497: fix-autostart-detection.diff

scheduler.h

@@ -103 +103 @@
                              bool &blockShutdown);
     void ShutdownServer(int prerollseconds);
 
+    bool WasStartedAutomatically();
+
     void FillRecordingDir(ProgramInfo *pginfo, RecList& reclist);
     void FillDirectoryInfoCache(bool force = false);
 

scheduler.cpp

@@ -1347 +1347 @@
                 QString startupParam = "user";
                 
                 // have we been started automatically?
-                if ((startIter != reclist.end()) &&
-                    ((curtime.secsTo((*startIter)->startts) - prerollseconds)
-                        < (idleWaitForRecordingTime * 60)))
+                if (WasStartedAutomatically() ||
+                    ((startIter != reclist.end()) &&
+                     ((curtime.secsTo((*startIter)->startts) - prerollseconds)
+                        < (idleWaitForRecordingTime * 60))))
                 {
-                    VERBOSE(VB_IMPORTANT,
-                            "Recording starts soon, AUTO-Startup assumed");
+                    VERBOSE(VB_IMPORTANT, "AUTO-Startup assumed");
                     startupParam = "auto";
             
                     // Since we've started automatically, don't wait for
@@ -3142 +3142 @@
     fsInfoCacheFillTime = QDateTime::currentDateTime();
 }
 
+bool Scheduler::WasStartedAutomatically() {
+    /* Determines if the system was started automatically by the auto-wakeup process */
+
+    bool autoStart = false;
+
+    QDateTime startupTime = QDateTime();
+    QString s = gContext->GetSetting("MythShutdownWakeupTime", "");
+    if (s != "")
+        startupTime = QDateTime::fromString(s, Qt::ISODate);
+
+    // if we don't have a valid startup time assume we were started manually
+    if (startupTime.isValid())
+    {
+        // if we started within 15mins of the saved wakeup time assume we started
+        // automatically to record or for a daily wakeup/shutdown period
+
+        int delta = startupTime.secsTo(QDateTime::currentDateTime());
+        if (delta < 0)
+            delta = -delta;
+
+        if (delta < 15 * 60)
+        {
+            VERBOSE(VB_SCHEDULE, "Close to auto-start time, AUTO-Startup assumed");
+            autoStart = true;
+        }
+    }
+
+    return autoStart;
+}
+
 /* vim: set expandtab tabstop=4 shiftwidth=4: */