summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhorchi <vdr@jwendel.de>2019-12-15 10:53:09 +0100
committerhorchi <vdr@jwendel.de>2019-12-15 10:53:09 +0100
commitf84fcd3690002bc5357e801eb4062d2fe6bc3d30 (patch)
treeb455557c18d005f08fedc8111c8df69a6838a844
parentda2c0249f3ad64f3bb8fb70fdb19baf2a2df509c (diff)
downloadvdr-epg-daemon-f84fcd3690002bc5357e801eb4062d2fe6bc3d30.tar.gz
vdr-epg-daemon-f84fcd3690002bc5357e801eb4062d2fe6bc3d30.tar.bz2
2019-12-15: version 1.1.149 (horchi)\n - added: Added cleanup for old wasted timers\n - added: Added _endtime to table timers\n\n1.1.149
-rw-r--r--HISTORY.h8
-rw-r--r--configs/epg.dat7
-rw-r--r--update.c6
-rw-r--r--webstore.c1
4 files changed, 17 insertions, 5 deletions
diff --git a/HISTORY.h b/HISTORY.h
index 78b37e1..d4b4ed1 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -4,8 +4,8 @@
* -----------------------------------
*/
-#define _VERSION "1.1.148"
-#define VERSION_DATE "09.12.2019"
+#define _VERSION "1.1.149"
+#define VERSION_DATE "15.12.2019"
#define DB_API 7
#ifdef GIT_REV
@@ -18,6 +18,10 @@
* ------------------------------------
*
+2019-12-15: version 1.1.149 (horchi)
+ - added: Added cleanup for old wasted timers
+ - added: Added _endtime to table timers
+
2019-12-09: version 1.1.148 (horchi)
- change: Improved epglv method to avoid problems on some special characters
diff --git a/configs/epg.dat b/configs/epg.dat
index 61c48f6..ed743d0 100644
--- a/configs/epg.dat
+++ b/configs/epg.dat
@@ -611,7 +611,8 @@ Table timers
EVENTID "useid" eventid UInt 0 Data,
CHANNELID "" channelid Ascii 50 Data,
- _STARTTIME "pre filled start timer for trigger" _starttime Int 10 Data,
+ _STARTTIME "pre filled start time 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/update.c b/update.c
index 2767174..35fa2d8 100644
--- a/update.c
+++ b/update.c
@@ -1717,6 +1717,12 @@ void cEpgd::loop()
" state = 'crashed', master = 'n'"
" where state = 'attached'"
" and from_unixtime(updsp) < (now() - interval 5 minute);");
+
+
+// connection->query("%s", "update timers set"
+// " state = 'D' "
+// " where state = 'R'"
+// #todo " and from_unixtime(updsp) < (now() - interval 5 minute);");
}
if (!dbConnected())
diff --git a/webstore.c b/webstore.c
index adfc049..be6f8b2 100644
--- a/webstore.c
+++ b/webstore.c
@@ -340,6 +340,7 @@ int cEpgHttpd::storeTimerJob(json_t* jInData, json_t* response)
{
timerRow.setValue("EVENTID", eventid);
timerRow.setValue("_STARTTIME", eventStartTime);
+ timerRow.setValue("_ENDTIME", eventEndTime);
}
getFieldFromJson(jInData, &timerRow, "VDRUUID");