diff --git a/servers/streamsb.json b/servers/streamsb.json index 50fb8428..597adad3 100644 --- a/servers/streamsb.json +++ b/servers/streamsb.json @@ -1,29 +1,26 @@ { - "active": true, - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "(?:streamsb|sbembed|sbembed1|sbplay1|sbplay|pelistop|tubesb|playersb|embedsb|watchsb|streamas|sbfast|sbfull|viewsb|sbvideo|cloudemb|sbplay2|japopav|javplaya|ssbstream|sbthe|sbspeed|sbanh)\\.\\w{2,5}/(?:embed-|d/|e/)?([A-z0-9]+)", - "url": "https://streamsb.net/d/\\1" - }, - { - "pattern": "(?:cloudemb.com)/([A-z0-9]+)", - "url": "https://streamsb.net/d/\\1" - } - ] - }, - "free": true, - "id": "streamsb", - "name": "StreamSB", - "settings": [ - { - "default": false, - "enabled": true, - "id": "black_list", - "label": "@70708", - "type": "bool", - "visible": true - } - ] -} + "active": true, + "find_videos": { + "ignore_urls": [], + "patterns": [{ + "pattern": "(?:streamsb|sblanh|sbembed|sbembed1|sbplay1|sbplay|pelistop|tubesb|playersb|embedsb|watchsb|streamas|sbfast|sbfull|viewsb|sbvideo|cloudemb|sbplay2|japopav|javplaya|ssbstream|sbthe|sbspeed|sbanh)\\.\\w{2,5}/(?:embed-|d/|e/)?([A-z0-9]+)", + "url": "https://streamsb.net/d/\\1" + }, + { + "pattern": "(?:cloudemb.com)/([A-z0-9]+)", + "url": "https://streamsb.net/d/\\1" + } + ] + }, + "free": true, + "id": "streamsb", + "name": "StreamSB", + "settings": [{ + "default": false, + "enabled": true, + "id": "black_list", + "label": "@70708", + "type": "bool", + "visible": true + }] +} \ No newline at end of file diff --git a/servers/voe.py b/servers/voe.py index c0091bf5..0e17e14a 100644 --- a/servers/voe.py +++ b/servers/voe.py @@ -25,11 +25,13 @@ def test_video_exists(page_url): def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("(page_url='%s')" % page_url) + # from core import support video_urls = [] video_srcs = scrapertools.find_multiple_matches(data, r"src: '([^']+)'") if not video_srcs: bloque = scrapertools.find_single_match(data, "sources.*?\}") - video_srcs = scrapertools.find_multiple_matches(bloque, ': "([^"]+)') + # video_srcs = support.match(bloque, patron=': "([^"]+)', debug=True) + video_srcs = scrapertools.find_multiple_matches(bloque, ''': ['"]([^'"]+)''') for url in video_srcs: video_urls.append([url.split('.')[-1] + " [Voe]", url])