Make the housekeeper ignore the MythFillMinHour and MythFillMaxHour settings

when MythFillGrabberSuggestsTime is enabled.  This allows mythfilldatabase to
run anytime if it couldn't run at the suggested time.  This is especially
useful for people that shutdown their backends.

Since we're not honoring the min/max time settings anymore for users with
MythFillGrabberSuggestsTime turned ON, don't bother setting these fields
inside the DataDirect grabber.  Also update the help text for
MythFillGrabberSuggestsTime to reflect that the min/max values are not used
when this setting is enabled.

Closes #3302 using patches submitted by Michael T. Dean.



git-svn-id: http://svn.mythtv.org/svn/trunk@13250 7dbf422c-18fa-0310-86e9-fd20926502f2

Author: cpinkham

mythtv/libs/libmythtv/datadirect.cpp

@@ -972,27 +972,10 @@ bool DataDirectProcessor::GrabNextSuggestedTime(void)
             NextSuggestedTime = newTime;
         }
 
-        int minhr = NextSuggestedTime.toString("h").toInt();
-        int maxhr = NextSuggestedTime.addSecs(7200).toString("h").toInt();
-
-        if (maxhr < minhr)
-        {
-            minhr = 22;
-            maxhr = 24;
-        }
-
         MSqlQuery query(MSqlQuery::DDCon());
         QString querystr =
             QString("UPDATE settings SET data = '%1' WHERE value = '%2';");
 
-        query.prepare(querystr.arg(minhr).arg("MythFillMinHour"));
-        if (!query.exec())
-            MythContext::DBError("Updating DataDirect MythFillMinHour", query);
-
-        query.prepare(querystr.arg(maxhr).arg("MythFillMaxHour"));
-        if (!query.exec())
-            MythContext::DBError("Updating DataDirect MythFillMaxHour", query);
-
         query.prepare(querystr.arg(NextSuggestedTime.toString(Qt::ISODate))
                       .arg("MythFillSuggestedRunTime"));
 

mythtv/programs/mythbackend/housekeeper.cpp

@@ -224,8 +224,7 @@ void HouseKeeper::RunHouseKeeping(void)
                         int hour = now.toString(QString("h")).toInt();
 
                         if ((nextRun < now) &&
-                            (lastRun.secsTo(now) > (3 * 60 * 60)) &&
-                            ((minhr <= hour) && (hour <= maxhr)))
+                            (lastRun.secsTo(now) > (3 * 60 * 60)))
                             runMythFill = true;
                     }
                     else if (wantToRun("MythFillDB", period, minhr, maxhr))

mythtv/programs/mythfrontend/globalsettings.cpp

@@ -2940,7 +2940,9 @@ static GlobalCheckBox *MythFillGrabberSuggestsTime()
     bc->setValue(true);
     bc->setHelpText(QObject::tr("This setting allows a DataDirect guide data "
                     "provider to specify the next download time in order to "
-                    "distribute load on their servers."));
+                    "distribute load on their servers. If this setting is "
+                    "enabled, mythfilldatabase Execution Start/End times are "
+                    "ignored."));
     return bc;
 }