2019-12-15: version 1.1.104 (horchi)\n - added: Added _endtime to table timers\n\n1.1.104

4 files changed, 12 insertions, 4 deletions

diff --git a/HISTORY.h b/HISTORY.h
index e95f6da..e871482 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,8 +5,8 @@
  *
  */
 
-#define _VERSION     "1.1.103"
-#define VERSION_DATE "02.13.2019"
+#define _VERSION     "1.1.104"
+#define VERSION_DATE "15.13.2019"
 
 #define DB_API 7
 
@@ -19,6 +19,9 @@
 /*
  * ------------------------------------
 
+2019-12-15: version 1.1.104 (horchi)
+   - added: Added _endtime to table timers
+
 2019-12-02: version 1.1.103 (horchi)
    - bugfix: fixed python patch
 
diff --git a/configs/epg.dat b/configs/epg.dat
index e0d5de5..aae0c97 100644
--- a/configs/epg.dat
+++ b/configs/epg.dat
@@ -612,6 +612,7 @@ Table timers
    EVENTID              "useid"                                  eventid              UInt         0 Data,
    CHANNELID            ""                                       channelid            Ascii       50 Data,
    _STARTTIME           "pre filled start timer for trigger"     _starttime           Int         10 Data,
+   _ENDTIME             "pre filled end time"                    _endtime             Int         10 Data,
 
    SOURCE               "like  osd, webif, epgd"                 source               Ascii       40 Data,
    TYPE                 "'R'ecord, 'V'iew (umschalt)"            type                 Ascii        1 Data,
@@ -627,8 +628,8 @@ Table timers
    ACTIVE               ""                                       active               UInt         0 Data,
    DAY                  ""                                       day                  Int         10 Data,
    WEEKDAYS             ""                                       weekdays             Int         10 Data,
-   STARTTIME            ""                                       starttime            Int         10 Data,
-   ENDTIME              ""                                       endtime              Int         10 Data,
+   STARTTIME            "HHMM"                                   starttime            Int         10 Data,
+   ENDTIME              "HHMM"                                   endtime              Int         10 Data,
    FILE                 ""                                       file                 Ascii      512 Data,
    DIRECTORY            ""                                       directory            Ascii      512 Data,
 
diff --git a/epg2vdr.c b/epg2vdr.c
index 11ca501..3f09560 100644
--- a/epg2vdr.c
+++ b/epg2vdr.c
@@ -465,6 +465,9 @@ int cPluginEPG2VDR::initDb()
    //    where
    //          (t.state in ('P','R') or t.state is null)
    //      and t.vdruuid = v.uuid
+   //      and t.type = 'R'
+   //      and t.vdruuid = v.uuid
+   //     order by _starttime
 
    selectTimers = new cDbStatement(timerDb);
 
diff --git a/ttools.c b/ttools.c
index 5b2d9d8..f48135d 100644
--- a/ttools.c
+++ b/ttools.c
@@ -332,6 +332,7 @@ int updateRowByTimer(cDbRow* timerRow, const cTimer* t)
    timerRow->setValue("VDRUUID", Epg2VdrConfig.uuid);
    timerRow->setValue("EVENTID", t->Event() ? (long)t->Event()->EventID() : 0);
    timerRow->setValue("_STARTTIME", t->Event() ? t->Event()->StartTime() : 0);
+   timerRow->setValue("_ENDTIME", t->Event() ? t->StopTime() : 0);
    timerRow->setValue("CHANNELID", channelId);
    timerRow->setValue("DAY", t->Day());
    timerRow->setValue("STARTTIME", t->Start());