diff options
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | HISTORY.DE | 8 | ||||
| -rw-r--r-- | conf/epgsearchupdmail-html.templ | 13 | ||||
| -rw-r--r-- | doc-src/en/epgsearch.4.txt | 1 | ||||
| -rw-r--r-- | uservars.h | 20 |
5 files changed, 43 insertions, 4 deletions
@@ -20,11 +20,16 @@ new: To do so, there's a new search timer action "Announce by mail". You also have to update your mail template file epgsearchupdmail.templ (s. the updated sample in the conf directory and/or read the MANUAL '13. Email notification'). +- The time in hours between the search timer mails can now be configured in the + setup to avoid flooding your inbox. epgsearch buffers the contents of the pending mails + in the new file pendingnotifications.conf. - new internal variables: * %day%, %month% and %year% which return the numeric day, month and year (with century) of an event * %chgrp% returns the VDR channel group name corresponding to an event * %liveeventid% returns the encoded event ID as used in the frontend 'live' to add + direct links e.g. in the search timer mails (see sample conf/epgsearchupdmail-html.templ). + * %timer.liveid% returns the encoded timer ID as used in the frontend 'live' to add direct links e.g. in the search timer mails. - in memory to pat: french translation update, thanks to Patrice Staudt - italian translation update, thanks to Diego Pierotto @@ -19,12 +19,18 @@ neu: gegeben werden. Dazu gibt es eine neue Suchtimeraktion "Per Mail ankündigen". Man muss ausserdem das Mail-Templatefile epgsearchupdmail.templ anpassen (s. Beispiel im conf- Verzeichnis bzw. MANUAL '13. Email notification'). +- Die Zeit in Stunden zwischen den Suchtimer-Emails kann nun im Setup eingestellt werden + um eine Überflutung des Posteingangs zu vermeiden. epgsearch puffert den Inhalt ausstehender + Mails in der neuen Datei pendingnotifications.conf. - neue interne Variablen: * %day%, %month% und %year% liefern den numerische Tag, das Monat und das Jahr (mit Jahrhundert) einer Sendung * %chgrp% liefert die VDR Kanalgruppe einer Sendung * %liveeventid% liefert die kodierte Event-ID wie sie im Frontend 'live' benutzt wird. - Damit können nun z.B. in den Searchtimer-Mails direkte Links angegeben werden. + Damit können nun z.B. in den Suchtimer-Mails direkte Links angegeben werden. (s. Beispiel + conf/epgsearchupdmail-html.templ) + * %timer.liveid% liefert die kodierte Timer-ID wie sie im Frontend 'live' benutzt wird. + Damit können nun z.B. in den Suchtimer-Mails direkte Links angegeben werden. - Im Gedenken an pat: Update der französischen Übersetzung, Danke an Patrice Staudt - Update der italienischen Übersetzung, Danke an Diego Pierotto - Update der finnischen Übersetzung, Danke an Rolf Ahrenberg diff --git a/conf/epgsearchupdmail-html.templ b/conf/epgsearchupdmail-html.templ index abe4744..beab4b8 100644 --- a/conf/epgsearchupdmail-html.templ +++ b/conf/epgsearchupdmail-html.templ @@ -171,7 +171,11 @@ a.rightspace { ############################################################################## <timer> <table class="timer"> -<tr class="timer"><th class="timer">Title:</th><th class="timer">%title%</th></tr> +<tr class="timer"><th class="timer">Title:</th><th class="timer"> + <div style='float:left'><a href="http://localhost:8008/edit_timer.html?timerid=%timer.liveid%">%title%</a></div> + <div style='float:right'><a href="http://akas.imdb.com/Tsearch?title=%title%">IMDb</a></div> + </th> +</tr> <tr class="timer"><td>Subtitle:</td><td>%subtitle%</td></tr> <tr class="timer"><td>Start/End:</td><td>%time_w% %date% %time%-%timeend% (Timer: %timer.start%-%timer.stop%)</td></tr> <tr class="timer"><td>Channel:</td><td>%timer.chlng% (%timer.chnr%)</td></tr> @@ -191,8 +195,11 @@ a.rightspace { ############################################################################## <event> <table class="event"> -<tr class="event"><th class="timer">Title:</th> - <th class="timer"><a href="http://localhost:8008/edit_timer.html?epgid=%liveeventid%">%title%</a></th></tr> +<tr class="event"><th class="timer">Title:</th><th class="timer"> + <div style='float:left'><a href="http://localhost:8008/edit_timer.html?epgid=%liveeventid%">%title%</a></div> + <div style='float:right'><a href="http://akas.imdb.com/Tsearch?title=%title%">IMDb</a></div> + </th> +</tr> <tr class="event"><td>Subtitle:</td><td>%subtitle%</td></tr> <tr class="event"><td>Start/End:</td><td>%time_w% %date% %time%-%timeend%</td></tr> <tr class="event"><td>Channel:</td><td>%chlng% (%chnr%)</td></tr> diff --git a/doc-src/en/epgsearch.4.txt b/doc-src/en/epgsearch.4.txt index 3f4d6bc..0d2588a 100644 --- a/doc-src/en/epgsearch.4.txt +++ b/doc-src/en/epgsearch.4.txt @@ -823,6 +823,7 @@ The following variables can be used in the section <timer>: - %timer.search% - name of the search timer, that created the timer - %timer.searchid% - id of the search timer, that created the timer - %timer.modreason% - the reason for a timer modification in plain text + - %timer.liveid% - encoded timer ID as used in the frontend 'live' - any event variable (as in '10. Customizing the EPG menus') - any extended EPG variable as defined in epgsearchcats.conf - any user variable (as in '12. User defined variables') @@ -608,6 +608,24 @@ class cTimerSearchIDVar : public cTimerVar { } }; +class cTimerLiveIDVar : public cTimerVar { +public: + cTimerLiveIDVar() : cTimerVar("%timer.liveid%") {} + string Evaluate(const cTimer* t) + { + if (!t || !t->Channel()) return ""; + ostringstream builder; + builder << *(t->Channel()->GetChannelID().ToString()) << ":" << t->WeekDays() << ":" + << t->Day() << ":" << t->Start() << ":" << t->Stop(); + string res = builder.str(); + res = "timer_" + res; + res = ReplaceAll(res, ".", "p"); + res = ReplaceAll(res, "-", "m"); + res = ReplaceAll(res, ":", "c"); + return res; + } +}; + // search variables class cSearchVar { const string name; @@ -672,6 +690,7 @@ class cUserVars : public cList<cUserVar> { cTimerChannelLongVar timerChLongVar; cTimerSearchVar timerSearchVar; cTimerSearchIDVar timerSearchIDVar; + cTimerLiveIDVar timerLiveIDVar; map<string, cExtEPGVar*> extEPGVars; set<cUserVar*> userVars; @@ -722,6 +741,7 @@ class cUserVars : public cList<cUserVar> { internalTimerVars[timerChLongVar.Name()] = &timerChLongVar; internalTimerVars[timerSearchVar.Name()] = &timerSearchVar; internalTimerVars[timerSearchIDVar.Name()] = &timerSearchIDVar; + internalTimerVars[timerLiveIDVar.Name()] = &timerLiveIDVar; internalSearchVars[searchQueryVar.Name()] = &searchQueryVar; } |