Skip to content

EPGSearch - add option to exclude Last Scanned bouquet and refresh se… #1101

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

Merged
ims21 merged 1 commit into from
Sep 29, 2026
Merged

EPGSearch - add option to exclude Last Scanned bouquet and refresh se… #1101

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion epgsearch/src/EPGSearch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,13 +924,37 @@ def ClearHistory(self):

def setup(self):
self.filter_type_before_setup = config.plugins.epgsearch.filter_type.value
self.search_settings_before_setup = self.getSearchSettings()
self.session.openWithCallback(self.setupClosed, EPGSearchSetup)

def setupClosed(self):
if self.do_filter is not None and self.filter_type_before_setup != config.plugins.epgsearch.filter_type.value:
epg = config.plugins.epgsearch
search_settings = self.getSearchSettings()
if self.currSearch and self.search_settings_before_setup != search_settings:
global BouquetChannelListList, IptvBouquetChannelListList
BouquetChannelListList = None
IptvBouquetChannelListList = None
self.searchEPG(self.currSearch, False)
elif self.do_filter is not None and self.filter_type_before_setup != epg.filter_type.value:
self.hide_filter()
self.show_filter()

# Track settings that affect EPG search results.
# Exclude unrelated settings to avoid unnecessary searches after closing setup.
# The result filter is handled separately without repeating the EPG search.
# New settings are included automatically unless explicitly excluded.
def getSearchSettings(self):
return {
name: item.value
for name, item in config.plugins.epgsearch.dict().items()
if name not in (
"filter_type", "history", "history_length",
"add_search_to_epg", "type_button_blue",
"yellow_eventname", "picons",
"show_in_furtheroptionsmenu", "search_in_channelmenu"
)
}

def blueButtonPressed(self):
if len(config.plugins.epgsearch.history.value):
history = [x for x in config.plugins.epgsearch.history.value]
Expand Down Expand Up @@ -1088,6 +1112,8 @@ def getBouquetChannelList(self):
for bouquet in bouquetlist:
if not bouquet.valid():
continue
if config.plugins.epgsearch.bouquet.value and config.plugins.epgsearch.exclude_lastscanned.value and 'FROM BOUQUET "userbouquet.LastScanned.tv"' in bouquet.toString():
continue
if bouquet.flags & eServiceReference.isDirectory:
services = serviceHandler.list(bouquet)
if services:
Expand Down
51 changes: 30 additions & 21 deletions epgsearch/src/EPGSearchSetup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,8 @@ class EPGSearchSetup(Screen, ConfigListScreen):
def __init__(self, session):
Screen.__init__(self, session)
self.title = _("EPGSearch Setup")
ConfigListScreen.__init__(
self,
[
(_("Length of History"), config.plugins.epgsearch.history_length, _("How many entries to keep in the search history at most. 0 disables history entirely!")),
(_("Add \"Search\" Button to EPG"), config.plugins.epgsearch.add_search_to_epg, _("If this setting is enabled, the plugin adds a \"Search\" Button to the regular EPG.")),
(_("Type blue Button"), config.plugins.epgsearch.type_button_blue, _("Select type: 'Search and Select channel' or 'Search'.")),
(_("Use event name for yellow button search"), config.plugins.epgsearch.yellow_eventname, _("Use the current event name as the initial search text. An empty search field is used otherwise.")),
(_("Use Picons"), config.plugins.epgsearch.picons, _("If this setting is enabled, the plugin adds picons.")),
(_("Search type"), config.plugins.epgsearch.search_type, _("Select type for search, \"partial match\" for the most extensive search, \"partial description\" for the most description search.")),
(_("Search strictness"), config.plugins.epgsearch.search_case, _("Select whether or not you want to enforce case correctness.")),
(_("Add \"Search event in EPG\" to event menu"), config.plugins.epgsearch.show_in_furtheroptionsmenu, _("Adds \"Search event in EPG\" item into the event menu (needs restart GUI)")),
(_("Add \"Search event in EPG\" to channel menu"), config.plugins.epgsearch.search_in_channelmenu, _("Adds \"Search event in EPG\" item into the channel selection context menu (needs restart GUI)")),
(_("Search only bouquets"), config.plugins.epgsearch.bouquet, _("If this setting is enabled, searching EPG in only services in user bouquets.")),
(_("Include IPTV services"), config.plugins.epgsearch.include_iptv, _("Include IPTV services in search, in some cases slows down the searching.")),
(_("Display name service as in bouquets"), config.plugins.epgsearch.favorit_name, _("If 'Search only bouquets' is enabled, show service name as in bouquets for renamed services.")),
(_("Result filter"), config.plugins.epgsearch.filter_type, _("Use P+/- to filter result by short description or extended (only if short is missing). Partial: only items whose description is contained in selected event. Exact: only items with matching description. Full: identical whole description.")),


],
session=session
)
ConfigListScreen.__init__(self, [], session=session, on_change=self.changedEntry)
self.createSetup()

self["config"].onSelectionChanged.append(self.updateHelp)

Expand All @@ -63,6 +44,34 @@ def __init__(self, session):
"save": self.save
}, -2)

def createSetup(self):
menu = []
menu.append((_("Length of History"), config.plugins.epgsearch.history_length, _("How many entries to keep in the search history at most. 0 disables history entirely!")))
menu.append((_("Add \"Search\" Button to EPG"), config.plugins.epgsearch.add_search_to_epg, _("If this setting is enabled, the plugin adds a \"Search\" Button to the regular EPG.")))
menu.append((_("Type blue Button"), config.plugins.epgsearch.type_button_blue, _("Select type: 'Search and Select channel' or 'Search'.")))
menu.append((_("Use event name for yellow button search"), config.plugins.epgsearch.yellow_eventname, _("Use the current event name as the initial search text. An empty search field is used otherwise.")))
menu.append((_("Use Picons"), config.plugins.epgsearch.picons, _("If this setting is enabled, the plugin adds picons.")))
menu.append((_("Search type"), config.plugins.epgsearch.search_type, _("Select type for search, \"partial match\" for the most extensive search, \"partial description\" for the most description search.")))
menu.append((_("Search strictness"), config.plugins.epgsearch.search_case, _("Select whether or not you want to enforce case correctness.")))
menu.append((_("Add \"Search event in EPG\" to event menu"), config.plugins.epgsearch.show_in_furtheroptionsmenu, _("Adds \"Search event in EPG\" item into the event menu (needs restart GUI)")))
menu.append((_("Add \"Search event in EPG\" to channel menu"), config.plugins.epgsearch.search_in_channelmenu, _("Adds \"Search event in EPG\" item into the channel selection context menu (needs restart GUI)")))
menu.append((_("Search only bouquets"), config.plugins.epgsearch.bouquet, _("If this setting is enabled, searching EPG in only services in user bouquets.")))
if config.plugins.epgsearch.bouquet.value:
menu.append((4 * " " + _("Exclude Last Scanned"), config.plugins.epgsearch.exclude_lastscanned, _("Exclude the Last Scanned bouquet when searching only in bouquets.")))
menu.append((_("Include IPTV services"), config.plugins.epgsearch.include_iptv, _("Include IPTV services in search, in some cases slows down the searching.")))
menu.append((_("Display name service as in bouquets"), config.plugins.epgsearch.favorit_name, _("If 'Search only bouquets' is enabled, show service name as in bouquets for renamed services.")))
menu.append((_("Result filter"), config.plugins.epgsearch.filter_type, _("Use P+/- to filter result by short description or extended (only if short is missing). Partial: only items whose description is contained in selected event. Exact: only items with matching description. Full: identical whole description.")))
self["config"].list = menu

def changedEntry(self):
current = self["config"].getCurrent()
if current[1].isChanged():
if current not in self.manipulatedItems:
self.manipulatedItems.append(current)
elif current in self.manipulatedItems:
self.manipulatedItems.remove(current)
self.createSetup()

def updateHelp(self):
cur = self["config"].getCurrent()
if cur and len(cur) > 2:
Expand Down
1 change: 1 addition & 0 deletions epgsearch/src/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def _(txt):
config.plugins.epgsearch.type_button_blue = ConfigSelection([('0', _("only Search")), ('1', _("choice (Search and standard)"))], default='0')
config.plugins.epgsearch.picons = ConfigYesNo(default=False)
config.plugins.epgsearch.bouquet = ConfigYesNo(default=False)
config.plugins.epgsearch.exclude_lastscanned = ConfigYesNo(default=False)
config.plugins.epgsearch.favorit_name = ConfigYesNo(default=False)
config.plugins.epgsearch.include_iptv = ConfigYesNo(default=False)
config.plugins.epgsearch.show_in_furtheroptionsmenu = ConfigYesNo(default=True)
Expand Down
Loading