diff options
| author | Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi> | 2011-03-11 16:16:25 +0200 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2011-03-20 18:48:06 +0100 |
| commit | 324fbdc02a3e0b90278f5757bc810594767c140e (patch) | |
| tree | 5ed5d0f242d39922d7826157fdd83d08b498a12c | |
| parent | 0e21c493ffc667c7d52ff555376acc5d05f612c6 (diff) | |
| download | vdr-plugin-live-324fbdc02a3e0b90278f5757bc810594767c140e.tar.gz vdr-plugin-live-324fbdc02a3e0b90278f5757bc810594767c140e.tar.bz2 | |
Added recording filtering to include also descriptions.
| -rw-r--r-- | pages/recordings.ecpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index 3457e92..1722514 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -236,9 +236,13 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) { // TRANSLATORS: recording duration format string duration(LiveSetup().GetShowRecDuration() ? FormatDuration(tr("(%d')"), recItem->Duration()) : ""); string shortDescr(recItem->RecInfo()->ShortText() ? recItem->RecInfo()->ShortText() : ""); - string hint(tr("Click to view details.")); if (!shortDescr.empty()) hint = shortDescr + "<br />" + hint; + string description(recItem->RecInfo()->Description() ? recItem->RecInfo()->Description() : ""); + string hint(tr("Click to view details.")); + if (!shortDescr.empty()) hint = shortDescr + "<br />" + hint; + else if (!description.empty()) hint = description + "<br />" + hint; #ifdef HAVE_LIBPCRECPP - if (filter.empty() || pcrecpp::RE(filter.c_str(), pcrecpp::UTF8()).PartialMatch(recItem->Name()) || pcrecpp::RE(filter.c_str(), pcrecpp::UTF8()).PartialMatch(shortDescr)) + pcrecpp::RE re(filter.c_str(), pcrecpp::UTF8()); + if (filter.empty() || re.PartialMatch(recItem->Name()) || re.PartialMatch(shortDescr) || re.PartialMatch(description)) #endif { </%cpp> |