.+?)(?:strong>|', categoria)
+ logger.debug('newest ->', categoria)
itemlist = []
item = Item()
item.args = 'newest'
@@ -183,14 +192,14 @@ def newest(categoria):
except:
import sys
for line in sys.exc_info():
- support.info('newest log: ', (line))
+ logger.error('newest log: ', (line))
return []
return itemlist
def check(item):
- support.info()
+ logger.debug()
data = support.match(item.url, headers=headers).data
if data:
ck = support.match(data, patron=r'Supportaci condividendo quest[oa] ([^:]+)').match.lower()
@@ -208,13 +217,13 @@ def check(item):
itemlist = episodios(item)
if not itemlist:
item.data = data
- item.action = 'findvideos'
+ # item.action = 'findvideos'
return findvideos(item)
elif ck == 'film':
item.contentType = 'movie'
item.data = data
- item.action = 'findvideos'
+ # item.action = 'findvideos'
return findvideos(item)
else:
@@ -224,7 +233,7 @@ def check(item):
if not itemlist:
item.contentType = 'movie'
item.data = data
- item.action = 'findvideos'
+ # item.action = 'findvideos'
return findvideos(item)
@@ -238,7 +247,7 @@ def findvideos(item):
if scrapertools.get_season_and_episode(title) == str(item.contentSeason) + "x" + str(
item.contentEpisodeNumber).zfill(2):
servers.append(s)
- support.info()
+ logger.debug()
if item.servers:
return support.server(item, itemlist=[Item().fromurl(s) for s in item.servers])
if not item.data:
diff --git a/channels/streamingcommunity.py b/channels/streamingcommunity.py
index 384bbbe1..feac1f13 100644
--- a/channels/streamingcommunity.py
+++ b/channels/streamingcommunity.py
@@ -92,8 +92,10 @@ def newest(category):
item.args = 1
item.newest = True
if category == 'peliculas':
+ item.contentType == 'movie'
item.url = host + '/film'
else:
+ item.contentType == 'tvshow'
item.url = host + '/serie-tv'
try:
@@ -213,7 +215,7 @@ def episodios(item):
season=episodes['number'],
contentSeason=episodes['number'],
contentEpisodeNumber=it['number'],
- thumbnail=it['images'][0]['original_url'] if 'images' in it and 'original_url' in it['images'][0] else item.thumbnail,
+ thumbnail=it['images'][0].get('original_url', item.thumbnail) if it['images'] else item.thumbnail,
contentThumbnail=item.thumbnail,
fanart=item.fanart,
contentFanart=item.fanart,
diff --git a/lib/unshortenit.py b/lib/unshortenit.py
index 25b83381..bec346c6 100644
--- a/lib/unshortenit.py
+++ b/lib/unshortenit.py
@@ -61,7 +61,7 @@ class UnshortenIt(object):
def unshorten(self, uri, type=None):
code = 0
- originalUri = uri
+ originalUri = uri.replace('%0A', '\n')
while True:
uri = uri.strip()
oldUri = uri
diff --git a/servers/streamsb.json b/servers/streamsb.json
index 195264b5..289e1b41 100644
--- a/servers/streamsb.json
+++ b/servers/streamsb.json
@@ -4,7 +4,7 @@
"ignore_urls": [],
"patterns": [
{
- "pattern": "(?:streamsb|sbembed|sbembed1|sbplay1|sbplay|pelistop|tubesb|playersb|embedsb|watchsb|streamas).\\w{2,5}/(?:embed-|d/|e/)?([A-z0-9]+)",
+ "pattern": "(?:streamsb|sbembed|sbembed1|sbplay1|sbplay|pelistop|tubesb|playersb|embedsb|watchsb|streamas|sbfast).\\w{2,5}/(?:embed-|d/|e/)?([A-z0-9]+)",
"url": "https://streamsb.net/d/\\1"
},
{
diff --git a/servers/streamsb.py b/servers/streamsb.py
index 9ee2c514..e8d0ed32 100644
--- a/servers/streamsb.py
+++ b/servers/streamsb.py
@@ -40,8 +40,9 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
def get_filename(page_url):
- title = httptools.downloadpage(page_url).data.split('
')[1].split('')[0]
- prefix = 'Watch '
+ # from core.support import dbg;dbg()
+ title = httptools.downloadpage(page_url).data.split('')[1].split('
')[0]
+ prefix = 'Download '
if title.startswith(prefix):
return title[len(prefix):]
return ""
diff --git a/servers/streamz.py b/servers/streamz.py
index 1220cdc7..0cd0a988 100644
--- a/servers/streamz.py
+++ b/servers/streamz.py
@@ -37,4 +37,12 @@ def get_video_url(page_url, video_password=""):
url += "|Referer=https://streamz.ws/&User-Agent=Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14'"
video_urls.append(["mp4 [streamZ]", url])
- return video_urls
\ No newline at end of file
+ return video_urls
+
+def get_filename(page_url):
+ # support.dbg()
+ title = httptools.downloadpage(page_url).data.split('')[1].split('')[0]
+ prefix = 'StreamZZ.to '
+ if title.startswith(prefix):
+ return title[len(prefix):]
+ return ""
\ No newline at end of file