mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix faulty epg, e.g. ATV

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7faf515f1e
Author: TangoCash <eric@loxat.de>
Date: 2024-10-07 (Mon, 07 Oct 2024)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2024-10-07 20:24:49 +02:00
committed by vanhofen
parent 5761badebd
commit af2aaab523
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/eitd/SIevents.cpp
View File

@@ -518,6 +518,7 @@ void SIevent::setName(unsigned int lang, const std::string &name)
{ {
std::string tmp = name; std::string tmp = name;
std::replace(tmp.begin(), tmp.end(), '\n', ' '); std::replace(tmp.begin(), tmp.end(), '\n', ' ');
std::replace(tmp.begin(), tmp.end(), '\t', ' ');
if (CSectionsdClient::LANGUAGE_MODE_OFF == SIlanguage::getMode()) if (CSectionsdClient::LANGUAGE_MODE_OFF == SIlanguage::getMode())
lang = 0; lang = 0;
@@ -553,18 +554,26 @@ void SIevent::setText(const std::string &lang, const std::string &text)
void SIevent::setText(unsigned int lang, const std::string &text) void SIevent::setText(unsigned int lang, const std::string &text)
{ {
std::string tmp = text;
std::string::size_type index = 0;
while ((index = tmp.find("\\n", index)) != std::string::npos) {
tmp.replace(index, 2, "\n");
++index;
}
if (CSectionsdClient::LANGUAGE_MODE_OFF == SIlanguage::getMode()) if (CSectionsdClient::LANGUAGE_MODE_OFF == SIlanguage::getMode())
lang = 0; lang = 0;
for (std::list<SILangData>::iterator it = langData.begin(); it != langData.end(); ++it) for (std::list<SILangData>::iterator it = langData.begin(); it != langData.end(); ++it)
if (it->lang == lang) { if (it->lang == lang) {
it->text[SILangData::langText] = text; it->text[SILangData::langText] = tmp;
return; return;
} }
SILangData ld; SILangData ld;
ld.lang = lang; ld.lang = lang;
ld.text[SILangData::langText] = text; ld.text[SILangData::langText] = tmp;
langData.push_back(ld); langData.push_back(ld);
} }
@@ -587,26 +596,34 @@ void SIevent::appendExtendedText(const std::string &lang, const std::string &tex
void SIevent::appendExtendedText(unsigned int lang, const std::string &text, bool append, bool endappend) void SIevent::appendExtendedText(unsigned int lang, const std::string &text, bool append, bool endappend)
{ {
std::string tmp = text;
std::string::size_type index = 0;
while ((index = tmp.find("\\n", index)) != std::string::npos) {
tmp.replace(index, 2, "\n");
++index;
}
if (CSectionsdClient::LANGUAGE_MODE_OFF == SIlanguage::getMode()) if (CSectionsdClient::LANGUAGE_MODE_OFF == SIlanguage::getMode())
lang = 0; lang = 0;
for (std::list<SILangData>::iterator it = langData.begin(); it != langData.end(); ++it) for (std::list<SILangData>::iterator it = langData.begin(); it != langData.end(); ++it)
if (it->lang == lang) { if (it->lang == lang) {
if (append){ if (append){
it->text[SILangData::langExtendedText] += text; it->text[SILangData::langExtendedText] += tmp;
if(endappend && it->text[SILangData::langExtendedText].capacity() > it->text[SILangData::langExtendedText].size()){ if(endappend && it->text[SILangData::langExtendedText].capacity() > it->text[SILangData::langExtendedText].size()){
it->text[SILangData::langExtendedText].reserve(); it->text[SILangData::langExtendedText].reserve();
} }
} }
else{ else{
it->text[SILangData::langExtendedText] = text; it->text[SILangData::langExtendedText] = tmp;
} }
return; return;
} }
SILangData ld; SILangData ld;
ld.lang = lang; ld.lang = lang;
ld.text[SILangData::langExtendedText] = text; ld.text[SILangData::langExtendedText] = tmp;
langData.push_back(ld); langData.push_back(ld);
} }