Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow multiple genre values to be displayed in event information #268

Merged
merged 1 commit into from
Oct 25, 2018
Merged

Allow multiple genre values to be displayed in event information #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 14 additions & 5 deletions lib/python/Components/Converter/EventName.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ class EventName(Converter, object):
PDCTIME = 12
PDCTIMESHORT = 13
ISRUNNINGSTATUS = 14
GENRELIST = 15

NEXT_DESCRIPTION = 21
THIRD_NAME = 22
Expand All @@ -119,6 +120,7 @@ class EventName(Converter, object):
"NextNameOnly": ("type", NAME_NEXT2),
"NameNextOnly": ("type", NAME_NEXT2),
"Genre": ("type", GENRE),
"GenreList": ("type", GENRELIST),
"Rating": ("type", RATING),
"SmallRating": ("type", SRATING),
"Pdc": ("type", PDC),
Expand All @@ -135,6 +137,8 @@ class EventName(Converter, object):
# Options...
"Separated": ("separator", "\n\n"),
"NotSeparated": ("separator", "\n"),
"SeparatorSlash": ("separator", "/"),
"SeparatorComma": ("separator", ", "),
"Trimmed": ("trim", True),
"NotTrimmed": ("trim", False)
}
Expand All @@ -151,7 +155,7 @@ def __init__(self, type):
self.epgcache = eEPGCache.getInstance()

self.type = self.NAME
self.separator = "\n"
self.separator = None
self.trim = False

parse = ","
Expand All @@ -163,6 +167,9 @@ def __init__(self, type):
print "[EventName] ERROR: Unexpected / Invalid argument token '%s'!" % arg
else:
setattr(self, name, value)
if self.separator is None:
default_sep = "SeparatorComma" if self.type == self.GENRELIST else "NotSeparated"
self.separator = self.KEYWORDS[default_sep][1]

def trimText(self, text):
if self.trim:
Expand Down Expand Up @@ -215,19 +222,21 @@ def getText(self):
elif self.type == self.SRATING:
return self.trimText(rating[self.RATSHORT])
return resolveFilename(SCOPE_ACTIVE_SKIN, rating[self.RATICON])
elif self.type == self.GENRE:
elif self.type in (self.GENRE, self.GENRELIST):
if not config.usage.show_genre_info.value:
return ""
genre = event.getGenreData()
if genre:
genres = event.getGenreDataList()
if genres:
if self.type == self.GENRE:
genres = genres[0:1]
rating = event.getParentalData()
if rating:
country = rating.getCountryCode().upper()
else:
country = "ETSI"
if config.misc.epggenrecountry.value:
country = config.misc.epggenrecountry.value
return self.trimText(getGenreStringSub(genre.getLevel1(), genre.getLevel2(), country=country))
return self.separator.join((genretext for genretext in (self.trimText(getGenreStringSub(genre[0], genre[1], country=country)) for genre in genres) if genretext))
elif self.type == self.NAME_NOW:
return pgettext("now/next: 'now' event label", "Now") + ": " + self.trimText(event.getEventName())
elif self.type == self.SHORT_DESCRIPTION:
Expand Down
6 changes: 3 additions & 3 deletions lib/service/event.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ RESULT eServiceEvent::getGenreData(ePtr<eGenreData> &dest) const
return -1;
}

PyObject *eServiceEvent::getGenreData() const
PyObject *eServiceEvent::getGenreDataList() const
{
ePyObject ret = PyList_New(m_genres.size());
int cnt=0;
Expand Down Expand Up @@ -295,7 +295,7 @@ RESULT eServiceEvent::getParentalData(ePtr<eParentalData> &dest) const
return -1;
}

PyObject *eServiceEvent::getParentalData() const
PyObject *eServiceEvent::getParentalDataList() const
{
ePyObject ret = PyList_New(m_ratings.size());
int cnt = 0;
Expand Down Expand Up @@ -325,7 +325,7 @@ RESULT eServiceEvent::getComponentData(ePtr<eComponentData> &dest, int tagnum) c
return -1;
}

PyObject *eServiceEvent::getComponentData() const
PyObject *eServiceEvent::getComponentDataList() const
{
ePyObject ret = PyList_New(m_component_data.size());
int cnt = 0;
Expand Down
23 changes: 20 additions & 3 deletions lib/service/event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,30 @@ class eServiceEvent: public iObject
std::string getExtendedDescription() const { return m_extended_description; }
std::string getBeginTimeString() const;
SWIG_VOID(RESULT) getComponentData(ePtr<eComponentData> &SWIG_OUTPUT, int tagnum) const;
PyObject *getComponentData() const;
// Naming to parallel getGenreDataList & getParentalDataList
PyObject *getComponentDataList() const;
PyObject *getComponentData() const
{
return getGenreDataList();
}
int getNumOfLinkageServices() const { return m_linkage_services.size(); }
SWIG_VOID(RESULT) getLinkageService(eServiceReference &SWIG_OUTPUT, eServiceReference &parent, int num) const;
SWIG_VOID(RESULT) getGenreData(ePtr<eGenreData> &SWIG_OUTPUT) const;
PyObject *getGenreData() const;
PyObject *getGenreDataList() const;
// Deprecated, doesn't differentiate from
// getGenreData(ePtr<eGenreData> &SWIG_OUTPUT) in Python
PyObject *getGenreData() const
{
return getGenreDataList();
}
SWIG_VOID(RESULT) getParentalData(ePtr<eParentalData> &SWIG_OUTPUT) const;
PyObject *getParentalData() const;
PyObject *getParentalDataList() const;
// Deprecated, doesn't differentiate from
// getGenreData(ePtr<eGenreData> &SWIG_OUTPUT) in Python
PyObject *getParentalData() const
{
return getParentalDataList();
}
};
SWIG_TEMPLATE_TYPEDEF(ePtr<eServiceEvent>, eServiceEvent);
SWIG_EXTEND(ePtr<eServiceEvent>,
Expand Down