From 71e0eacba0d06d51ebf5c6b2965c647d8ca50034 Mon Sep 17 00:00:00 2001 From: Vashiel Date: Sat, 30 Apr 2016 01:37:44 +0200 Subject: [PATCH] Release 0.4.7 - fixes lubetube.com categories - added lubetube.com pornstars - fixed zbporn.com - fixed pornhd.com categories - changed fantasti.cc regex to load faster - added yespornplease.com (jump forward does not work) - minor changes --- addons.xml | 2 +- addons.xml.md5 | 2 +- plugin.video.adulthideout/addon.xml | 2 +- plugin.video.adulthideout/changelog.txt | 11 ++ plugin.video.adulthideout/default.py | 131 ++++++++++++------ .../logos/yespornplease.png | Bin 0 -> 27475 bytes ...hangelog-0.4.6.txt => changelog-0.4.7.txt} | 11 ++ ...ip => plugin.video.adulthideout-0.4.7.zip} | Bin 1531605 -> 1558826 bytes 8 files changed, 112 insertions(+), 47 deletions(-) create mode 100644 plugin.video.adulthideout/logos/yespornplease.png rename zips/plugin.video.adulthideout/{changelog-0.4.6.txt => changelog-0.4.7.txt} (85%) rename zips/plugin.video.adulthideout/{plugin.video.adulthideout-0.4.6.zip => plugin.video.adulthideout-0.4.7.zip} (97%) diff --git a/addons.xml b/addons.xml index 3a98f9c..5758899 100644 --- a/addons.xml +++ b/addons.xml @@ -1,6 +1,6 @@ - + - +
(.+?)
').findall(content) - for url, name, thumb, duration in match: + #match = re.compile('
(.+?)
').findall(content) + match = re.compile('(.+?)
(.+?)', re.DOTALL).findall(content) + for dummy, url, name, thumb, duration in match: add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', eporner + '/config5/' + url, 4, thumb, fanart) try: match = re.compile("").findall(content) @@ -290,13 +294,17 @@ def start(url): add_dir('[COLOR lightgreen]Fantastic.com [COLOR red]Search[/COLOR]', fantasti, 1, logos + 'fantasti', fanart) add_dir('[COLOR lime]Collection[/COLOR]', fantasti + '/videos/collections/popular/today/', 48, logos + 'fantasti.png', fanart) add_dir('[COLOR lime]Sorting [/COLOR]', fantasti + '/videos/popular/today/', 49, logos + 'fantasti.png', fanart) - match = re.compile('href="([^"]+)">').findall(content2) - for url in match: - add_link(name, url, 4, thumb, fanart) + if 'search' in url: + match = re.compile('href="([^"]+)".+?([^([\d:]+)', re.DOTALL).findall(content) + for url, name, thumb, duration in match: + url = fantasti + url + add_dir(name, url, 4, thumb, fanart) + else: + match = re.compile('href="([^"]+)">next >>').findall(content) add_dir('[COLOR blue]Next Page >>>>[/COLOR]', fantasti + match[0], 2, logos + 'fantasti.png', fanart) @@ -374,13 +382,16 @@ def start(url): content = make_request(url) add_dir('[COLOR lightgreen]lubetube.com [COLOR red]Search[/COLOR]', lubetube, 1, logos + 'lubetube.png', fanart) add_dir('[COLOR lime]Categories[/COLOR]', lubetube + 'categories', 15, logos + 'lubetube.png', fanart) + add_dir('[COLOR lime]Pornstars[/COLOR]', lubetube + 'pornstars', 12, logos + 'lubetube.png', fanart) match = re.compile('href="(.+?)" title="(.+?)">Next').findall(content) - add_dir('[COLOR blue]Next Page >>>>[/COLOR]', lubetube + match[0], 2, logos + 'lubetube.png', fanart) - + try: + match = re.compile('').findall(content) + add_dir('[COLOR blue]Next Page >>>>[/COLOR]', lubetube + match[0], 2, logos + 'lubetube.png', fanart) + except: + pass + elif 'motherless' in url: content = make_request(url) ###Search in def search(): and media_list(url) @@ -529,7 +540,6 @@ def start(url): except: pass - elif 'vikiporn' in url: content = make_request(url) add_dir('[COLOR lightgreen]vikiporn.com [COLOR red]Search[/COLOR]', vikiporn, 1, logos + 'vikiporn.png', fanart) @@ -565,7 +575,6 @@ def start(url): add_dir('[COLOR blue]Next Page >>>>[/COLOR]', match[0] , 2, logos + 'xhamster.png', fanart) - elif 'xvideos' in url: content = make_request(url) add_dir('[COLOR lightgreen]xvideos.com [COLOR red]Search[/COLOR]', xvideos, 1, logos + 'xvideos.png', fanart) @@ -605,6 +614,26 @@ def start(url): except: pass + elif 'yespornplease' in url: + content = make_request(url) + add_dir('[COLOR lightgreen]yespornplease [COLOR red]Search[/COLOR]', yespornplease, 1, logos + 'yespp.png', fanart) + add_dir('[COLOR lime]Categories[/COLOR]', yespornplease + '/categories', 52, logos + 'yespp.png', fanart) + if 'search' in url: + match = re.compile('.+?([:\d]+)', re.DOTALL).findall(content) + for url, thumb, name, duration in match: + name = name.replace('&', '&').replace('"', '"').replace(''', '\'').replace(' ', '') + add_link(name + '[COLOR lime] (' + duration + ')[/COLOR]', yespornplease + url, 4, thumb, fanart) + else: + match = re.compile('class="video-link" href="([^"]*)">.+?([:\d]+)', re.DOTALL).findall(content) + for url, thumb, name, duration in match: + name = name.replace('&', '&').replace('"', '"').replace(''', '\'').replace(' ', '') + add_link(name + '[COLOR lime] (' + duration + ')[/COLOR]', yespornplease + url, 4, thumb, fanart) + try: + match = re.compile('Next »').findall(content) + add_dir('[COLOR blue]Next Page >>>>[/COLOR]', yespornplease + match[0], 2, logos + 'yespp.png', fanart) + except: + pass + elif 'yes.xxx' in url: content = make_request(url) add_dir('[COLOR lightgreen]yes.xxx [COLOR red]Search[/COLOR]', yesxxx, 1, logos + 'yes.png', fanart) @@ -620,7 +649,7 @@ def start(url): content = make_request(url) add_dir('[COLOR lightgreen]zbporn.com [COLOR red]Search[/COLOR]', zbporn, 1, logos + 'zbporn.png', fanart) add_dir('[COLOR lime]Categories[/COLOR]', zbporn + '/categories/', 23, logos + 'zbporn.png', fanart) - match = re.compile('(.+?)(.+?)([^.+?([:\d]+)', re.DOTALL).findall(content) for url, thumb, name, duration in match: add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url , 4, thumb, fanart) match = re.compile('\s*
  • .+?
  • \s*
  • \s*\s*\s*(.+?)\s*<').findall(content) - for thumb, url, name in match: + match = re.compile('.+?alt="([^"]*)".+?data-original="([^"]*)"', re.DOTALL).findall(content) + for url, name, thumb in match: add_dir(name, pornhd + url, 2, thumb, fanart) def pornhd_pornstars(url): @@ -652,19 +681,22 @@ def eporner_categories(url): def lubtetube_pornstars(url): home() content = make_request(url) - match = re.compile('class="frame" href="/(.+?)">(.+?)(\d+)<').findall(content) - for url, name in match: - add_dir('[COLOR yellow]Page ' + name + '[/COLOR]', lubetube + 'pornstars/' + url, 12, logos + 'lubetube.png', fanart) - + match = re.compile('class="score">(.+?)(.+?)', ' ') + add_dir(name + ' [COLOR lime]('+ duration + ')[/COLOR]', lubetube + url, 2, lubetube + thumb, fanart) + try: + match = re.compile('').findall(content) + add_dir('[COLOR blue]Next Page >>>>[/COLOR]', lubetube + match[0], 12, logos + 'lubetube.png', fanart) + except: + pass + def lubetube_categories(url): home() content = make_request(url) match = re.compile('href="http://lubetube.com/search/adddate/cat/([^"]*)">(.+?)NEXT »').findall(content) add_dir('[COLOR blue]Next Page >>>>[/COLOR]', motherless + match[0], 60, logos + 'motherless.png', fanart) - + + def motherless_groups_cat(url): home() add_dir('[COLOR lightgreen]motherless.com Groups [COLOR red]Search[/COLOR]', motherless + '/search/groups?term=', 1, logos + 'motherless.png', fanart) @@ -952,9 +985,9 @@ def fatasti_sorting(url) : home() content = make_request(url) if 'collections' in url: - match = re.compile('(Today|This Week|This Month|All Time)', re.DOTALL).findall(content) + match = re.compile('href="/videos/collections/popular([^"]*)" style=".+?">(Today|This Week|This Month|All Time)', re.DOTALL).findall(content) for url, name in match: - add_dir('Popular Videos ' + name, fantasti + url, 48, logos + 'fantasti.png', fanart) + add_dir('Popular Videos ' + name, fantasti + '/videos/collections/popular' + url, 48, logos + 'fantasti.png', fanart) else: match = re.compile('(today|this week|this month|all time)', re.DOTALL).findall(content) for url, name in match: @@ -977,8 +1010,15 @@ def upornia_models(url): match = re.compile('