diff --git a/addons.xml b/addons.xml index 33f2df3..f944cce 100644 --- a/addons.xml +++ b/addons.xml @@ -1,6 +1,6 @@ - + - + .+?alt="([^"]+)" src="([^"]+)">', re.DOTALL).findall(content) - for url, name, thumb in match: - url = fantasti + url - content2 = make_request(url) - match = re.compile('', re.DOTALL).findall(content2) - for url in match: - add_link(name, url, 4, logos + 'fantasti.png', fanart) - else: - match = re.compile('([^.+?alt="([^"]+)" src="([^"]+)">', re.DOTALL).findall(content) + for url, name, thumb in match: + url = fantasti + url + content2 = make_request(url) + match = re.compile('', re.DOTALL).findall(content2) + for url in match: + add_link(name, url, 4, thumb, fanart) + if '/search/' in url: + match = re.compile('(.+?).+?([^\s*(.+?). Uploaded:', re.DOTALL).findall(content) + for url, thumb, name, duration in match: + name = name.replace('&', '&').replace('"', '"').replace(''', '\'').replace(' ', '') + url = fantasti + url + add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url, 4, thumb, fanart) + + except: + pass try: match = re.compile('next >>').findall(content) add_dir('[COLOR blue]Next Page >>>>[/COLOR]', fantasti + match[0], 2, logos + 'fantasti.png', fanart) @@ -546,7 +561,7 @@ def start(url): elif 'tubepornclassic' in url: content = make_request(url) - add_dir('[COLOR lightgreen]tubepornclassic [COLOR red]Search[/COLOR]', tubepornclassic, 1, logos + 'tubepornclassic.png', fanart) + add_dir('[COLOR lightgreen]Tubepornclassic [COLOR red]Search[/COLOR]', tubepornclassic, 1, logos + 'tubepornclassic.png', fanart) add_dir('[COLOR lime]Categories[/COLOR]', tubepornclassic + '/categories/', 38, logos + 'tubepornclassic.png', fanart) match = re.compile('
.+?([^<]+)<', re.DOTALL).findall(content) for url, name, thumb, duration in match: @@ -882,7 +897,6 @@ def zbporn_categories(url) : def pornhub_categories(url) : home() content = make_request(url) - #match = re.compile('
.+?.+?.+?img src="([^"]+)"', re.DOTALL).findall(content) for url, name, thumb in match: add_dir(name, pornhub + url, 2, thumb, fanart) @@ -915,7 +929,6 @@ def youporn_categories(url) : content = make_request(url) match = re.compile('.+?/img/categories/(.+?).jpg.+?caption">([^"]+)
', re.DOTALL).findall(content) match = re.compile('([^"]+)
', re.DOTALL).findall(content) for url, thumb, name in match: name = name.replace (' ', '') @@ -1042,17 +1054,18 @@ def txxx_categories(url): def fantasti_collections(url): home() content = make_request(url) + add_dir('[COLOR lightgreen]fantasti.cc collections [COLOR red]Search[/COLOR]', fantasti, 1, logos + 'fantasti.png', fanart) add_dir('[COLOR lime]Sorting [/COLOR]', fantasti + '/videos/collections/popular/today/', 49, logos + 'fantasti.png', fanart) - match = re.compile('([^"]+)', re.DOTALL).findall(content) - for url, name in match: - add_dir(name, fantasti + url + '#collectionSubmittedVideos', 2, logos + 'fantasti.png', fanart) + match = re.compile('([^"]+).+?
(.+?)
.+?http://([^"]*).jpg', re.DOTALL).findall(content) + for url, name, duration, thumb in match: + name = name.replace('&', '&').replace('"', '"').replace(''', '\'') + add_dir(name + ' [COLOR lime]('+ duration + ')[/COLOR]', fantasti + url + '#collectionSubmittedVideos', 2, 'http://' + thumb + '.jpg', fanart) try: match = re.compile('next >>').findall(content) add_dir('[COLOR blue]Next Page >>>>[/COLOR]', fantasti + match[0], 48, logos + 'fantasti.png', fanart) except: pass - def fatasti_sorting(url) : home() content = make_request(url) @@ -1348,11 +1361,15 @@ def resolve_url(url): media_url = re.compile('').findall(content)[0] elif 'freepornvs.com' in url: media_url = re.compile("video_url: '(.+?)'").findall(content)[0] - - elif 'pornyeah' in url: - video_url = re.compile('flashvars="settings=(.+?)').findall(content)[0] - media_url = urllib.unquote_plus(video_url) - #media_url = 'http://' + re.compile('flvMask:http://(.+?).mp4;').findall(video_url)[-1] + '.mp4' + elif 'hotclips24.com' in url: + media_url = re.compile("var defFile = '(.+?)';").findall(content)[0] + elif 'pornspot.com' in url: + media_url = re.compile('data-video240p="(.+?)"').findall(content)[0] + elif 'vid2c.com' in url: + media_url = re.compile('var videoFile="(.+?)/";').findall(content)[0] + elif 'mofosex.com' in url: + media_url = re.compile("flashvars.video_url = '(.+?)';").findall(content)[0] + media_url = media_url.replace('%3A', ':').replace('%2F', '/').replace('%3F', '?').replace('%3D', '=').replace('%26', '&') elif 'youav' in url: media_url = re.compile("{file:'(.+?)'").findall(content)[-1] else: diff --git a/zips/plugin.video.adulthideout/changelog-0.5.3.txt b/zips/plugin.video.adulthideout/changelog-0.5.4.txt similarity index 93% rename from zips/plugin.video.adulthideout/changelog-0.5.3.txt rename to zips/plugin.video.adulthideout/changelog-0.5.4.txt index c4933f9..f02817a 100644 --- a/zips/plugin.video.adulthideout/changelog-0.5.3.txt +++ b/zips/plugin.video.adulthideout/changelog-0.5.4.txt @@ -1,3 +1,11 @@ +v 0.5.4 07-09-2016 +- mostly fixing fantasti.cc in this release + fixed search, added search for collections, + added duration and nummer for collections, etc... +- added few resolver tubegalore.com +- code cleaning. + + v 0.5.3 28-08-2016 - removed Jav720p.net (Site is dead) - added YouAV.com (JAV Site) diff --git a/zips/plugin.video.adulthideout/plugin.video.adulthideout-0.5.3.zip b/zips/plugin.video.adulthideout/plugin.video.adulthideout-0.5.4.zip similarity index 98% rename from zips/plugin.video.adulthideout/plugin.video.adulthideout-0.5.3.zip rename to zips/plugin.video.adulthideout/plugin.video.adulthideout-0.5.4.zip index 7de50a4..89893c9 100644 Binary files a/zips/plugin.video.adulthideout/plugin.video.adulthideout-0.5.3.zip and b/zips/plugin.video.adulthideout/plugin.video.adulthideout-0.5.4.zip differ