From 65775228b3b246831ee8513dc1256a5ebf2a8ffe Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 13 Oct 2020 20:54:40 +0200 Subject: [PATCH] un paio di fix --- servers/vupplayer.py | 2 +- specials/search.py | 5 ++--- tests/test_generic.py | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/servers/vupplayer.py b/servers/vupplayer.py index 432b0d14..4b228eb6 100644 --- a/servers/vupplayer.py +++ b/servers/vupplayer.py @@ -9,7 +9,7 @@ def test_video_exists(page_url): page = httptools.downloadpage(page_url) global data data = page.data - if page.code == 404: + if page.code == 404 or 'File is no longer available' in data: return False, config.get_localized_string(70449) return True, "" diff --git a/specials/search.py b/specials/search.py index 7ed9c915..ca1a4a6b 100644 --- a/specials/search.py +++ b/specials/search.py @@ -174,10 +174,10 @@ def channel_search(item): mode = item.mode if item.infoLabels['tvshowtitle']: - item.text = item.infoLabels['tvshowtitle'].split('-')[0] + item.text = item.infoLabels['tvshowtitle'].split(' - ')[0] item.title = item.text elif item.infoLabels['title']: - item.text = item.infoLabels['title'].split('-')[0] + item.text = item.infoLabels['title'].split(' - ')[0] item.title = item.text temp_search_file = config.get_temp_file('temp-search') @@ -363,7 +363,6 @@ def get_channel_results(item, module_dict, search_action): if not config.get_setting('unify'): elem.title += ' [%s]' % ch valid.append(elem) - break # if len(results) < 0 and len(results) < max_results and item.mode != 'all': # diff --git a/tests/test_generic.py b/tests/test_generic.py index e4cb6eb5..f5a45411 100644 --- a/tests/test_generic.py +++ b/tests/test_generic.py @@ -120,7 +120,7 @@ chNumRis = { 'Serie TV': 12 }, 'serietvonline': { - 'Film': 50, + 'Film': 25, 'Serie TV': 35 }, 'tantifilm': { @@ -303,7 +303,7 @@ class GenericServerTest(unittest.TestCase): print(headers) if 'magnet:?' in directUrl: # check of magnet links not supported continue - page = downloadpage(directUrl, headers=headers, only_headers=True, use_requests=True) + page = downloadpage(directUrl, headers=headers, only_headers=True, use_requests=True, verify=False) self.assertTrue(page.success, self.name + ' scraper returned an invalid link') self.assertLess(page.code, 400, self.name + ' scraper returned a ' + str(page.code) + ' link') contentType = page.headers['Content-Type']