Añadiendo Torrent a Newptc y Newptc1

This commit is contained in:
danielr460
2018-02-23 15:22:34 -05:00
parent 08bfa983e8
commit 6952b1a3ff
2 changed files with 35 additions and 3 deletions
+18 -3
View File
@@ -4,6 +4,7 @@ import re
import urllib import urllib
import urlparse import urlparse
from core import servertools
from core import scrapertools from core import scrapertools
from core.item import Item from core.item import Item
from platformcode import logger from platformcode import logger
@@ -48,15 +49,12 @@ def listado(item):
data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) data = re.sub(r"\n|\r|\t|\s{2}| ", "", data)
patron_data='<ul class="pelilist">(.+?)</ul>' patron_data='<ul class="pelilist">(.+?)</ul>'
data_listado = scrapertools.find_single_match(data, patron_data) data_listado = scrapertools.find_single_match(data, patron_data)
logger.info("sadas"+data_listado)
patron_listado='<li><a href="(.+?)" title=".+?"><img src="(.+?)".+?><h2' patron_listado='<li><a href="(.+?)" title=".+?"><img src="(.+?)".+?><h2'
if 'Serie' in item.title: if 'Serie' in item.title:
patron_listado+='.+?>' patron_listado+='.+?>'
else: else:
patron_listado+='>' patron_listado+='>'
patron_listado+='(.+?)<\/h2><span>(.+?)<\/span><\/a><\/li>' patron_listado+='(.+?)<\/h2><span>(.+?)<\/span><\/a><\/li>'
logger.info("sasssss"+patron_listado)
matches = scrapertools.find_multiple_matches(data_listado, patron_listado) matches = scrapertools.find_multiple_matches(data_listado, patron_listado)
for scrapedurl, scrapedthumbnail,scrapedtitle,scrapedquality in matches: for scrapedurl, scrapedthumbnail,scrapedtitle,scrapedquality in matches:
if 'Serie' in item.title: if 'Serie' in item.title:
@@ -86,4 +84,21 @@ def episodios(item):
titulo=scrapedurl.split('http') titulo=scrapedurl.split('http')
scrapedurl="http"+titulo[1] scrapedurl="http"+titulo[1]
itemlist.append(item.clone(title=scrapedtitle, url=scrapedurl,thumbnail=scrapedthumbnail, action="findvideos", show=scrapedtitle)) itemlist.append(item.clone(title=scrapedtitle, url=scrapedurl,thumbnail=scrapedthumbnail, action="findvideos", show=scrapedtitle))
return itemlist
def findvideos(item):
logger.info()
itemlist = []
new_item = []
data = httptools.downloadpage(item.url).data
itemlist = servertools.find_video_items(data = data)
url = scrapertools.find_single_match( data, 'location.href = "([^"]+)"')
data = httptools.downloadpage(url, follow_redirects=False).headers['location']
data = httptools.downloadpage(url).data
new_item.append(Item(url = url, title = "Torrent", server = "torrent", action = "play"))
itemlist.extend(new_item)
for it in itemlist:
it.channel = item.channel
scrapertools.printMatches(itemlist)
return itemlist return itemlist
+17
View File
@@ -86,4 +86,21 @@ def episodios(item):
titulo=scrapedurl.split('http') titulo=scrapedurl.split('http')
scrapedurl="http"+titulo[1] scrapedurl="http"+titulo[1]
itemlist.append(item.clone(title=scrapedtitle, url=scrapedurl,thumbnail=scrapedthumbnail, action="findvideos", show=scrapedtitle)) itemlist.append(item.clone(title=scrapedtitle, url=scrapedurl,thumbnail=scrapedthumbnail, action="findvideos", show=scrapedtitle))
return itemlist
def findvideos(item):
logger.info()
itemlist = []
new_item = []
data = httptools.downloadpage(item.url).data
itemlist = servertools.find_video_items(data = data)
url = scrapertools.find_single_match( data, 'location.href = "([^"]+)"')
data = httptools.downloadpage(url, follow_redirects=False).headers['location']
data = httptools.downloadpage(url).data
new_item.append(Item(url = url, title = "Torrent", server = "torrent", action = "play"))
itemlist.extend(new_item)
for it in itemlist:
it.channel = item.channel
scrapertools.printMatches(itemlist)
return itemlist return itemlist