Added name of search timer which created recording in detailed recording information (closes Feature 1401)

7 files changed, 51 insertions, 4 deletions

diff --git a/HISTORY b/HISTORY
index c6ae018..da8ec06 100644
--- a/HISTORY
+++ b/HISTORY
@@ -239,3 +239,5 @@ Version 0.1.4
 - Display correct recording date even if recording info is empty (closes Bug 1448)
 - Added option to display plain channels and EPG information without time in
   channels menu (closes Feature 1377)
+- Added name of search timer which created recording in detailed recording
+  information (closes Feature 1401)
diff --git a/menudetailview.c b/menudetailview.c
index f2db1b0..d23cc7d 100644
--- a/menudetailview.c
+++ b/menudetailview.c
@@ -940,9 +940,41 @@ void cNopacityMenuDetailRecordingView::LoadRecordingInformation(void) {
     }
     delete index;
     
+    if (Info) {
+        const char *aux = NULL;
+        aux = Info->Aux();
+        if (aux) {
+            std::string strAux = aux;
+            std::string auxEpgsearch = StripXmlTag(strAux, "epgsearch");
+            if (!auxEpgsearch.empty()) {
+                std::string searchTimer = StripXmlTag(auxEpgsearch, "searchtimer");
+                if (!searchTimer.empty()) {
+                    sstrInfo << tr("Search timer") << ": " << searchTimer << std::endl; 
+                }
+            }
+        }
+    }
+    
     additionalInfo.Set(sstrInfo.str().c_str(), font, width - 4 * border);
 }
 
+std::string cNopacityMenuDetailRecordingView::StripXmlTag(std::string &Line, const char *Tag) {
+        // set the search strings
+        std::stringstream strStart, strStop;
+        strStart << "<" << Tag << ">";
+        strStop << "</" << Tag << ">";
+        // find the strings
+        std::string::size_type locStart = Line.find(strStart.str());
+        std::string::size_type locStop = Line.find(strStop.str());
+        if (locStart == std::string::npos || locStop == std::string::npos)
+                return "";
+        // extract relevant text
+        int pos = locStart + strStart.str().size();
+        int len = locStop - pos;
+        return len < 0 ? "" : Line.substr(pos, len);
+}
+
+
 int cNopacityMenuDetailRecordingView::ReadSizeVdr(const char *strPath) {
     int dirSize = -1;
     char buffer[20];
diff --git a/menudetailview.h b/menudetailview.h
index 80df2d7..e67097d 100644
--- a/menudetailview.h
+++ b/menudetailview.h
@@ -80,6 +80,7 @@ private:
     cTextWrapper additionalInfo;
     void DrawHeader(void);
     void LoadRecordingInformation(void);
+    std::string StripXmlTag(std::string &Line, const char *Tag);
     int ReadSizeVdr(const char *strPath);
     std::vector<std::string> epgpics;
     bool LoadEPGPics(void);
diff --git a/po/ca_ES.po b/po/ca_ES.po
index ff6bb11..4934a7c 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-09-09 17:06+0200\n"
+"POT-Creation-Date: 2013-09-09 17:46+0200\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Gabychan <gbonich@gmail.com>\n"
 "Language-Team: \n"
@@ -47,6 +47,9 @@ msgstr "Format"
 msgid "Est. bitrate"
 msgstr "Bitrate estimat"
 
+msgid "Search timer"
+msgstr ""
+
 msgid "Transp."
 msgstr "Transponedor"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 7726b4e..00bc393 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-09-09 17:06+0200\n"
+"POT-Creation-Date: 2013-09-09 17:46+0200\n"
 "PO-Revision-Date: 2012-11-11 17:49+0200\n"
 "Last-Translator: louis\n"
 "Language-Team: \n"
@@ -44,6 +44,9 @@ msgstr "Format"
 msgid "Est. bitrate"
 msgstr "Geschätzte Bitrate"
 
+msgid "Search timer"
+msgstr "Suchtimer"
+
 msgid "Transp."
 msgstr "Transp."
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 4231b93..180440b 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-09-09 17:06+0200\n"
+"POT-Creation-Date: 2013-09-09 17:46+0200\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: \n"
@@ -47,6 +47,9 @@ msgstr "Formato"
 msgid "Est. bitrate"
 msgstr "Bitrate estimato"
 
+msgid "Search timer"
+msgstr ""
+
 msgid "Transp."
 msgstr "Transponder"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 66c21ee..0c91eeb 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinnopacity 0.0.6\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-09-09 17:06+0200\n"
+"POT-Creation-Date: 2013-09-09 17:46+0200\n"
 "PO-Revision-Date: 2013-03-12 15:59+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -47,6 +47,9 @@ msgstr "Formát"
 msgid "Est. bitrate"
 msgstr "Odhadovaná prenosová rýchlos»"
 
+msgid "Search timer"
+msgstr ""
+
 msgid "Transp."
 msgstr "Transp."