minor fixes
This commit is contained in:
Executable → Regular
+1
-1
@@ -476,7 +476,7 @@ def clear_saved_searches(item):
|
|||||||
|
|
||||||
|
|
||||||
def get_saved_searches():
|
def get_saved_searches():
|
||||||
current_saved_searches_list = config.get_setting("saved_searches_list", "buscador")
|
current_saved_searches_list = config.get_setting("saved_searches_list", "search")
|
||||||
if current_saved_searches_list is None:
|
if current_saved_searches_list is None:
|
||||||
saved_searches_list = []
|
saved_searches_list = []
|
||||||
else:
|
else:
|
||||||
|
|||||||
Executable → Regular
+7
@@ -1,6 +1,7 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
import base64
|
||||||
|
|
||||||
from core import channeltools
|
from core import channeltools
|
||||||
from core import config
|
from core import config
|
||||||
@@ -11,6 +12,7 @@ from core import servertools
|
|||||||
from core import tmdb
|
from core import tmdb
|
||||||
from core.item import Item
|
from core.item import Item
|
||||||
|
|
||||||
|
|
||||||
HOST = 'http://www.yaske.ro'
|
HOST = 'http://www.yaske.ro'
|
||||||
parameters = channeltools.get_channel_parameters('yaske')
|
parameters = channeltools.get_channel_parameters('yaske')
|
||||||
fanart_host = parameters['fanart']
|
fanart_host = parameters['fanart']
|
||||||
@@ -229,6 +231,11 @@ def findvideos(item):
|
|||||||
matches = re.compile(patron, re.DOTALL).findall(data)
|
matches = re.compile(patron, re.DOTALL).findall(data)
|
||||||
|
|
||||||
for url, idioma, calidad in matches:
|
for url, idioma, calidad in matches:
|
||||||
|
if 'yaske' in url:
|
||||||
|
data = httptools.downloadpage(url).data
|
||||||
|
url_enc = scrapertoolsV2.find_single_match(data, "eval.*?'(.*?)'")
|
||||||
|
url_dec = base64.b64decode(url_enc)
|
||||||
|
url = scrapertoolsV2.find_single_match(url_dec, 'iframe src="(.*?)"')
|
||||||
sublist.append(item.clone(action="play", url=url, folder=False, text_color=color1, quality=calidad.strip(),
|
sublist.append(item.clone(action="play", url=url, folder=False, text_color=color1, quality=calidad.strip(),
|
||||||
language=idioma.strip()))
|
language=idioma.strip()))
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,12 @@
|
|||||||
{
|
{
|
||||||
"pattern": "(?s)https://youtube.googleapis.com.*?docid=([^(?:&|\")]+)",
|
"pattern": "(?s)https://youtube.googleapis.com.*?docid=([^(?:&|\")]+)",
|
||||||
"url": "http://docs.google.com/get_video_info?docid=\\1"
|
"url": "http://docs.google.com/get_video_info?docid=\\1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pattern": "(?s)https://drive.google.com/file/d/(.*?)/preview",
|
||||||
|
"url": "http://docs.google.com/get_video_info?docid=\\1"
|
||||||
}
|
}
|
||||||
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"free": true,
|
"free": true,
|
||||||
|
|||||||
Executable → Regular
+5
-1
@@ -42,12 +42,16 @@
|
|||||||
"ignore_urls": [],
|
"ignore_urls": [],
|
||||||
"patterns": [
|
"patterns": [
|
||||||
{
|
{
|
||||||
"pattern": "(http:\\/\\/(?:.*?)\\.torrent)",
|
"pattern": "(http:\\/\\/(?:[a-zA-Z0-9]+)\\.torrent)",
|
||||||
"url": "\\1"
|
"url": "\\1"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"pattern": "(magnet:\\?xt=urn:[^\"]+)",
|
"pattern": "(magnet:\\?xt=urn:[^\"]+)",
|
||||||
"url": "\\1"
|
"url": "\\1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pattern": "(http://tumejorjuego.com/descargar/index.php\\?link=[^\"]+)",
|
||||||
|
"url": "\\1"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user