added {channellogoexists} Token everywhere where {channelid} is available

4 files changed, 24 insertions, 7 deletions

diff --git a/views/displaymenudetailview.c b/views/displaymenudetailview.c
index c24fc6b..cec9749 100644
--- a/views/displaymenudetailview.c
+++ b/views/displaymenudetailview.c
@@ -127,7 +127,9 @@ void cDisplayMenuDetailView::SetTokens(void) {
         intTokens.insert(pair<string, int>("daynumeric", sStartTime->tm_mday));
         intTokens.insert(pair<string, int>("month", sStartTime->tm_mon+1));
 
-        stringTokens.insert(pair<string,string>("channelid", *(event->ChannelID().ToString())));
+        string channelID = *(event->ChannelID().ToString());
+        stringTokens.insert(pair<string,string>("channelid", channelID));
+        intTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));
 
         bool isRunning = false;
         time_t now = time(NULL);
@@ -658,7 +660,9 @@ void cDisplayMenuDetailView::DrawHeader(void) {
             headerStringTokens.insert(pair<string,string>("channelname", ""));            
             headerIntTokens.insert(pair<string, int>("channelnumber", 0));
         }
-        headerStringTokens.insert(pair<string,string>("channelid", *(event->ChannelID().ToString())));
+        string channelID = *(channel->GetChannelID().ToString());
+        headerStringTokens.insert(pair<string,string>("channelid", channelID));
+        headerIntTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));
 
         bool isRunning = false;
         time_t now = time(NULL);
diff --git a/views/displaymenuitemcurrentview.c b/views/displaymenuitemcurrentview.c
index 2be72be..58a6118 100644
--- a/views/displaymenuitemcurrentview.c
+++ b/views/displaymenuitemcurrentview.c
@@ -249,7 +249,9 @@ void cDisplayMenuItemCurrentChannelView::Render(void) {
     intTokens.insert(pair<string,int>("frequency", channel->Frequency()));
 
     stringTokens.insert(pair<string,string>("name", channel->Name() ? channel->Name() : ""));
-    stringTokens.insert(pair<string,string>("channelid", *(channel->GetChannelID().ToString())));
+    string channelID = *(channel->GetChannelID().ToString());
+    stringTokens.insert(pair<string,string>("channelid", channelID));
+    intTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));
 
     //Channel Source Information
     const cSource *source = Sources.Get(channel->Source());
@@ -456,11 +458,14 @@ void cDisplayMenuItemCurrentTimerView::Render(void) {
     const cChannel *channel = timer->Channel();
     if (channel) {
         stringTokens.insert(pair<string,string>("channelname", channel->Name() ? channel->Name() : ""));
-        stringTokens.insert(pair<string,string>("channelid", *(channel->GetChannelID().ToString())));
+        string channelID = *(channel->GetChannelID().ToString());
+        stringTokens.insert(pair<string,string>("channelid", channelID));
+        intTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));
         intTokens.insert(pair<string,int>("channelnumber", channel->Number()));
     } else {
         stringTokens.insert(pair<string,string>("channelname", ""));
         stringTokens.insert(pair<string,string>("channelid", ""));
+        intTokens.insert(pair<string, int>("channellogoexists", 0));
         intTokens.insert(pair<string,int>("channelnumber", 0));        
     }
 
diff --git a/views/displaymenuitemview.c b/views/displaymenuitemview.c
index 360dcd9..12eeddc 100644
--- a/views/displaymenuitemview.c
+++ b/views/displaymenuitemview.c
@@ -416,7 +416,9 @@ void cDisplayMenuItemChannelsView::SetTokens(void) {
     intTokens.insert(pair<string,int>("frequency", channel->Frequency()));

 

     stringTokens.insert(pair<string,string>("name", channel->Name() ? channel->Name() : ""));

-    stringTokens.insert(pair<string,string>("channelid", *(channel->GetChannelID().ToString())));

+    string channelID = *(channel->GetChannelID().ToString());

+    stringTokens.insert(pair<string,string>("channelid", channelID));

+    intTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));

 

     //Channel Source Information

     const cSource *source = Sources.Get(channel->Source());

@@ -560,11 +562,14 @@ void cDisplayMenuItemTimersView::SetTokens(void) {
     const cChannel *channel = timer->Channel();

     if (channel) {

         stringTokens.insert(pair<string,string>("channelname", channel->Name() ? channel->Name() : ""));

-        stringTokens.insert(pair<string,string>("channelid", *(channel->GetChannelID().ToString())));

+        string channelID = *(channel->GetChannelID().ToString());

+        stringTokens.insert(pair<string,string>("channelid", channelID));

+        intTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));

         intTokens.insert(pair<string,int>("channelnumber", channel->Number()));

     } else {

         stringTokens.insert(pair<string,string>("channelname", ""));

         stringTokens.insert(pair<string,string>("channelid", ""));

+        intTokens.insert(pair<string, int>("channellogoexists", 0));

         intTokens.insert(pair<string,int>("channelnumber", 0));        

     }

 

diff --git a/views/viewhelpers.c b/views/viewhelpers.c
index 38a332d..0bcc738 100644
--- a/views/viewhelpers.c
+++ b/views/viewhelpers.c
@@ -133,12 +133,15 @@ bool cViewHelpers::SetDevices(bool initial, map<string,int> *intTokens, vector<m
             strChanNum << channel->Number();
             deviceVals.insert(pair< string, string >("devices[channelnumber]", strChanNum.str()));
             deviceVals.insert(pair< string, string >("devices[channelname]", channel->Name()));
-            deviceVals.insert(pair< string, string >("devices[channelid]", *(channel->GetChannelID().ToString())));
+            string channelID = *(channel->GetChannelID().ToString());
+            deviceVals.insert(pair< string, string >("devices[channelid]", channelID));
+            deviceVals.insert(pair< string, string >("devices[channellogoexists]", imgCache->LogoExists(channelID) ? "1" : "0"));
             deviceVals.insert(pair< string, string >("devices[istuned]", "1"));
         } else {
             deviceVals.insert(pair< string, string >("devices[channelnumber]", "0"));
             deviceVals.insert(pair< string, string >("devices[channelname]", ""));
             deviceVals.insert(pair< string, string >("devices[channelid]", ""));
+            deviceVals.insert(pair< string, string >("devices[channellogoexists]", "0"));
             deviceVals.insert(pair< string, string >("devices[istuned]", "0"));
         }