Merge remote-tracking branch 'origin/master'

This commit is contained in:
marco
2020-04-25 17:36:43 +02:00
4 changed files with 3 additions and 15 deletions
+1 -1
View File
@@ -36,7 +36,7 @@
"pufimovies": "https://pufimovies.com",
"raiplay": "https://www.raiplay.it",
"seriehd": "https://seriehd.digital",
"serietvonline": "https://serietvonline.casa",
"serietvonline": "https://serietvonline.host",
"serietvsubita": "http://serietvsubita.xyz",
"serietvu": "https://www.serietvu.link",
"streamtime": "https://t.me/s/StreamTime",
+1 -2
View File
@@ -22,8 +22,7 @@ from core.item import Item
def findhost():
data = httptools.downloadpage('https://serietvonline.me/').data
host = scrapertools.find_single_match(data, r'<a class="pure-button pure-button-primary" title=\'serie tv online\' href="([^"]+)">')
host = support.match('https://t.me/s/serietvonlineITA', patron=r'<a href="([^"]+)" target="_blank"').matches[-1]
return host
host = config.get_channel_url(findhost)
+1 -11
View File
@@ -272,17 +272,7 @@ def run(item=None):
logger.info("item.action=%s" % item.action.upper())
from core import channeltools
# last_search = ""
# last_search_active = config.get_setting("last_search", "search")
# if last_search_active:
# try:
# current_saved_searches_list = list(config.get_setting("saved_searches_list", "search"))
# last_search = current_saved_searches_list[0]
# except:
# pass
# last_search = channeltools.get_channel_setting('Last_searched', 'search', '')
if channeltools.get_channel_setting('last_search', 'search'):
if config.get_setting('last_search'):
last_search = channeltools.get_channel_setting('Last_searched', 'search', '')
else:
last_search = ''
-1
View File
@@ -114,7 +114,6 @@ def new_search(item):
itemlist = []
if config.get_setting('last_search'):
# if channeltools.get_channel_setting('last_search', 'search'):
last_search = channeltools.get_channel_setting('Last_searched', 'search', '')
else:
last_search = ''