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

keep all logo-naming conventions together

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 978fcedcbe
Author: TangoCash <eric@loxat.de>
Date: 2020-09-20 (Sun, 20 Sep 2020)


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

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2020-09-20 21:10:53 +02:00
committed by vanhofen
parent f1f3b0805f
commit bb7a4fc19f
4 changed files with 36 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -570,20 +570,7 @@ bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &C
if (g_settings.logo_hdd_dir != LOGODIR) if (g_settings.logo_hdd_dir != LOGODIR)
v_path.push_back(LOGODIR); v_path.push_back(LOGODIR);
std::transform(EventName.begin(), EventName.end(), EventName.begin(), ::tolower); EventName = GetSpecialName(EventName);
EventName = str_replace(" ", "-", EventName);
EventName = str_replace(",", "-", EventName);
EventName = str_replace(";", "-", EventName);
EventName = str_replace(":", "-", EventName);
EventName = str_replace("+", "-", EventName);
EventName = str_replace("'", "-", EventName);
EventName = str_replace("?", "-", EventName);
EventName = str_replace("!", "-", EventName);
EventName = str_replace("&", "-", EventName);
EventName = str_replace("ä", "ae", EventName);
EventName = str_replace("ö", "oe", EventName);
EventName = str_replace("ü", "ue", EventName);
EventName = str_replace("ß", "ss", EventName);
//printf("GetLogoName(): EventName \"%s\"\n", EventName.c_str()); //printf("GetLogoName(): EventName \"%s\"\n", EventName.c_str());
for (size_t i = 0; i < (sizeof(fileType) / sizeof(fileType[0])); i++) for (size_t i = 0; i < (sizeof(fileType) / sizeof(fileType[0])); i++)
@@ -607,24 +594,7 @@ bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &C
} }
// create special filename from channelname // create special filename from channelname
std::string SpecialChannelName = ChannelName; std::string SpecialChannelName = GetSpecialName(ChannelName);
std::transform(SpecialChannelName.begin(), SpecialChannelName.end(), SpecialChannelName.begin(), ::tolower);
SpecialChannelName = str_replace(" ", "-", SpecialChannelName);
SpecialChannelName = str_replace("ä", "a", SpecialChannelName);
SpecialChannelName = str_replace("ö", "o", SpecialChannelName);
SpecialChannelName = str_replace("ü", "u", SpecialChannelName);
SpecialChannelName = str_replace("+", "___plus___", SpecialChannelName);
SpecialChannelName = str_replace("&", "___and___", SpecialChannelName);
//
SpecialChannelName = str_replace(",", "-", SpecialChannelName);
SpecialChannelName = str_replace(";", "-", SpecialChannelName);
SpecialChannelName = str_replace(":", "-", SpecialChannelName);
SpecialChannelName = str_replace("*", "-", SpecialChannelName);
SpecialChannelName = str_replace("'", "-", SpecialChannelName);
SpecialChannelName = str_replace("?", "-", SpecialChannelName);
SpecialChannelName = str_replace("|", "-", SpecialChannelName);
SpecialChannelName = str_replace("/", "-", SpecialChannelName);
SpecialChannelName = str_replace("\\", "-", SpecialChannelName);
// create channel id as string // create channel id as string
char strChnId[16]; char strChnId[16];

12
src/gui/streaminfo2.cpp
View File

@@ -1149,17 +1149,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
// special channellogo // special channellogo
r.key = "Special Logo"; r.key = "Special Logo";
r.key += ": "; r.key += ": ";
std::string SpecialChannelName = channel->getName().c_str(); std::string SpecialChannelName = GetSpecialName(channel->getName());
SpecialChannelName = str_replace(" ", "_", SpecialChannelName);
SpecialChannelName = str_replace(",", "-", SpecialChannelName);
SpecialChannelName = str_replace(";", "-", SpecialChannelName);
SpecialChannelName = str_replace(":", "-", SpecialChannelName);
SpecialChannelName = str_replace("*", "-", SpecialChannelName);
SpecialChannelName = str_replace("'", "-", SpecialChannelName);
SpecialChannelName = str_replace("?", "-", SpecialChannelName);
SpecialChannelName = str_replace("|", "-", SpecialChannelName);
SpecialChannelName = str_replace("/", "-", SpecialChannelName);
SpecialChannelName = str_replace("\\", "-", SpecialChannelName);
snprintf(buf, sizeof(buf), "%s.png", SpecialChannelName.c_str()); snprintf(buf, sizeof(buf), "%s.png", SpecialChannelName.c_str());
r.val = buf; r.val = buf;
v.push_back(r); v.push_back(r);

32
src/system/helpers.cpp
View File

@@ -2104,3 +2104,35 @@ int getActivePartition()
return c; return c;
} }
// Why different name conventions ?
// i put them all together here, and keep the simplest
//name = str_replace(" ", "_", name);
//name = str_replace("ä", "a", name);
//name = str_replace("ö", "o", name);
//name = str_replace("ü", "u", name);
//name = str_replace("+", "___plus___", name);
//name = str_replace("&", "___and___", name);
std::string GetSpecialName(std::string name)
{
std::transform(name.begin(), name.end(), name.begin(), ::tolower);
name = str_replace(" ", "-", name);
name = str_replace("ä", "ae", name);
name = str_replace("ö", "oe", name);
name = str_replace("ü", "ue", name);
name = str_replace("ß", "ss", name);
name = str_replace("+", "-", name);
name = str_replace("&", "-", name);
name = str_replace("!", "-", name);
name = str_replace(",", "-", name);
name = str_replace(";", "-", name);
name = str_replace(":", "-", name);
name = str_replace("*", "-", name);
name = str_replace("'", "-", name);
name = str_replace("?", "-", name);
name = str_replace("|", "-", name);
name = str_replace("/", "-", name);
name = str_replace("\\", "-", name);
return name;
}

1
src/system/helpers.h
View File

@@ -194,4 +194,5 @@ bool isDigitWord(std::string str);
int getActivePartition(); int getActivePartition();
std::string GetSpecialName(std::string NormalName);
#endif #endif