From 581c171019d6c6084a70b83d298671a0e9f4ee16 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sat, 1 Sep 2018 14:34:24 +0200 Subject: [PATCH] fixes for xmltv epg Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8c5b400e803b90f3b51051bf10b2eb044f3907c5 Author: TangoCash Date: 2018-09-01 (Sat, 01 Sep 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/nhttpd/tuxboxapi/controlapi.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 58bc46c60..d67c6a605 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -233,6 +233,7 @@ const CControlAPI::TyCgiCall CControlAPI::yCgiCallList[]= {"updatebouquet", &CControlAPI::updateBouquetCGI, "text/plain"}, // xmltv {"xmltv.data", &CControlAPI::xmltvepgCGI, "+xml"}, + {"xmltv.xml", &CControlAPI::xmltvepgCGI, "+xml"}, {"xmltv.m3u", &CControlAPI::xmltvm3uCGI, ""}, // utils {"build_live_url", &CControlAPI::build_live_url, ""}, @@ -3278,11 +3279,11 @@ void CControlAPI::xmltvepgCGI(CyhookHandler *hh) programmeTag += "channel=\""+string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id)+"\" "; char zbuffer[25] = { 0 }; struct tm *mtime = localtime(&eventIterator->startTime); - strftime(zbuffer, 21, "%Y%m%d%H%M%S +0200", mtime); + strftime(zbuffer, 21, "%Y%m%d%H%M%S %z", mtime); programmeTag += "start=\""+std::string(zbuffer)+"\" "; long _stoptime = eventIterator->startTime + eventIterator->duration; mtime = localtime(&_stoptime); - strftime(zbuffer, 21, "%Y%m%d%H%M%S +0200", mtime); + strftime(zbuffer, 21, "%Y%m%d%H%M%S %z", mtime); programmeTag += "stop=\""+std::string(zbuffer)+"\" "; programmeData = hh->outPair("title lang=\"de\"", hh->outValue(eventIterator->description, xml_cdata), false); @@ -3337,7 +3338,7 @@ void CControlAPI::xmltvm3uCGI(CyhookHandler *hh) CZapitChannel * channel = chanlist[j]; std::string bouq_name = g_bouquetManager->Bouquets[i]->Name; std::string chan_id_short = string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID() & 0xFFFFFFFFFFFFULL); - result += "#EXTINF:-1 tvg-id=\""+chan_id_short+"\" tvg-logo=\""+NeutrinoAPI->getLogoFile(channel->getChannelID())+"\" group-title=\""+bouq_name+"\", [COLOR gold]"+channel->getName()+"[/COLOR]\n"; + result += "#EXTINF:-1 tvg-id=\""+chan_id_short+"\" tvg-logo=\""+NeutrinoAPI->getLogoFile(channel->getChannelID())+"\" group-title=\""+bouq_name+"\", "+channel->getName()+"\n"; result += url+string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID())+"\n"; } }