option 'SCAN' for UPDS to trigger an epg scan before search timer update

5 files changed, 21 insertions, 4 deletions

diff --git a/HISTORY b/HISTORY
index 3165ed2..5acece0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -26,6 +26,8 @@ new:
   choice even if this results in double recordings.
 - epgsearch now uses the shutdown handler (introduced in vdr 1.5.1) to prevent a 
   search timer update to be interrupted.
+- the SVDRP command UPDS for triggering search timer updates has now a new option 
+  'SCAN' that will execute an EPG scan before the search timer update actually starts.
 fixes:
 - fixed a crash when pressing 'Ok' in an empty timers done menu
 - fixed a crash when using the progressbar and events with 0 duration exist, thanks 
diff --git a/HISTORY.DE b/HISTORY.DE
index ca46020..1a50a07 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -28,7 +28,8 @@ neu:
   aufgezeichnet werden kann.
 - epgsearch verwendet nun den shutdown handler (eingeführt in vdr 1.5.1) um die Unter-
   brechung eines Suchtimerupdates zu verhindern.
-
+- das SVDRP-Kommando UPDS zum Auslösen von Suchtimer-Updates hat nun eine neue Option
+  'SCAN' mit der vor dem eigentlichen Update noch ein EPG-Scan ausgeführt wird.
 fixes:
 - Absturz beim Drücken von 'Ok' in leerem Menü erledigter Timer behoben
 - Absturz bei Verwendung des Fortschrittsbalkens in Verbindung mit Sendungen
diff --git a/epgsearchsvdrp.c b/epgsearchsvdrp.c
index 98e8678..dd29ad2 100644
--- a/epgsearchsvdrp.c
+++ b/epgsearchsvdrp.c
@@ -63,10 +63,11 @@ const char **cPluginEpgsearch::SVDRPHelpPages(void)
       "    Edit an existing search\n",
       "MODS ID ON|OFF\n"
       "    Turn on/off 'Use as search timer'\n",
-      "UPDS [ OSD ]\n"
+      "UPDS [ OSD ] [ SCAN ]\n"
       "    Update search timers.\n"
       "    If the optional keyword 'OSD' is passed, an OSD message\n"
-      "    will inform about update completion.",
+      "    will inform about update completion. With 'SCAN' you can\n"
+      "    trigger an EPG scan before the searchtimer udpate.",
       "UPDD\n"
       "    Reload epgsearchdone.data",
       "SETS <ON|OFF>\n"
@@ -151,6 +152,8 @@ cString cPluginEpgsearch::SVDRPCommand(const char *Command, const char *Option,
 	   {
 	     if (strcasecmp(Option, "OSD")==0)
 	       updateForced |= UPDS_WITH_OSD;
+	     if (strcasecmp(Option, "SCAN")==0)
+	       updateForced |= UPDS_WITH_EPGSCAN;
 	     pstrOptionToken=strtok_r(NULL, "|", &pptr);
 	   }
 	 free(pstrOptions);
diff --git a/epgsearchtools.h b/epgsearchtools.h
index c0fb9bf..10b9c1a 100644
--- a/epgsearchtools.h
+++ b/epgsearchtools.h
@@ -78,7 +78,6 @@ using std::string;
 
 #define UPDS_WITH_OSD (1<<1)
 #define UPDS_WITH_EPGSCAN (1<<2)
-#define UPDS_WITH_NOBREAK (1<<3)
 
 #if APIVERSNUM >= 10503 
 // Icons used in VDRSymbols-Font
diff --git a/searchtimer_thread.c b/searchtimer_thread.c
index 3e17ade..e074e97 100644
--- a/searchtimer_thread.c
+++ b/searchtimer_thread.c
@@ -41,6 +41,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include "menu_deftimercheckmethod.h"
 #include "timerstatus.h"
 #include "epgsearch.h"
+#include <vdr/eitscan.h>
 
 // priority for background thread
 #define SEARCHTIMER_NICE 19
@@ -210,6 +211,17 @@ void cSearchTimerThread::Action(void)
       if (now >= nextUpdate || needUpdate)
       {
 	 justRunning = true;
+
+	 if (updateForced & UPDS_WITH_EPGSCAN)
+	 {
+  	    LogFile.Log(1,"starting EPG scan before search timer update");
+	    do
+	    {
+	       Wait.Wait(1000);
+	    }
+	    while(EITScanner.Active() && m_Active);
+  	    LogFile.Log(1,"EPG scan finished");
+	 }
          if (Timers.BeingEdited()) 		
          {
             Wait.Wait(1000);