Skip to content

Commit

Permalink
Release 0.6.4
Browse files Browse the repository at this point in the history
v 0.6.4 18-12-2016
- fixed Ashemaletube.com
- added Models to Ashemaletube.com
  • Loading branch information
Vashiel committed Dec 17, 2016
1 parent 8c59746 commit 1649fb7
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 13 deletions.
2 changes: 1 addition & 1 deletion addons.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<addons>
<addon id="plugin.video.adulthideout" name="AdultHideout" version="0.6.3" provider-name="Vashiel">
<addon id="plugin.video.adulthideout" name="AdultHideout" version="0.6.4" provider-name="Vashiel">
<requires>
</requires>
<extension point="xbmc.python.pluginsource"
Expand Down
2 changes: 1 addition & 1 deletion addons.xml.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd1f63e883204a271d11f95ee6ef6d0c
3ebfa1dcb527b4a9a4b493917acdba2a
2 changes: 1 addition & 1 deletion plugin.video.adulthideout/addon.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.adulthideout" name="AdultHideout" version="0.6.3" provider-name="Vashiel">
<addon id="plugin.video.adulthideout" name="AdultHideout" version="0.6.4" provider-name="Vashiel">
<requires>
</requires>
<extension point="xbmc.python.pluginsource"
Expand Down
4 changes: 4 additions & 0 deletions plugin.video.adulthideout/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v 0.6.4 18-12-2016
- fixed Ashemaletube.com
- added Models to Ashemaletube.com

v 0.6.3 11-12-2016
- fixed Redtube.com
- fixed Xvideos.com
Expand Down
46 changes: 36 additions & 10 deletions plugin.video.adulthideout/default.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
pornhub = 'http://pornhub.com'
pornsocket = 'http://pornsocket.com'
hentaigasm = 'http://hentaigasm.com/'
ashemaletube = 'http://www.ashemaletube.com'
ashemaletube = 'https://www.ashemaletube.com'
youporn = 'http://www.youporn.com'
heavyr = 'http://www.heavy-r.com'
gotporn ='http://www.gotporn.com'
Expand Down Expand Up @@ -258,19 +258,30 @@ def start(url):
if 'ashemaletube' in url:
add_dir('[COLOR lightgreen]ashemaletube.com [COLOR red]Search[/COLOR]', ashemaletube, 1, logos + 'ashemaletube.png', fanart)
add_dir('[COLOR lime]Categories[/COLOR]', ashemaletube + '/tags/', 30, logos + 'ashemaletube.png', fanart)
add_dir('[COLOR lime]Models[/COLOR]', ashemaletube + '/models/', 55, logos + 'ashemaletube.png', fanart)
content = make_request(url)
match = re.compile('<div class="thumb vidItem" id=".+?">.+?<a href="([^"]*)">.+?src="([^"]*)" alt="([^"]*)".+?<span class="fs11 viddata flr"(.+?)>([:\d]+)</span>', re.DOTALL).findall(content)
for url, thumb, name, dummy, duration in match:
name = name.replace('&amp;', '&')
if 'HD' in dummy:
add_link(name + '[COLOR yellow]' +' [HD]' +'[/COLOR]' +' [COLOR lime]('+ duration + ')[/COLOR]', url, 4, thumb, fanart)
else:
add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url, 4, thumb, fanart)
if 'model' in url:
match = re.compile('<div class="thumb vidItem" data-video-id=".+?">.+?<a href="([^"]*)">.+?src="([^"]*)" alt="([^"]*)".+?<span class="fs11 viddata flr"(.+?)>', re.DOTALL).findall(content)
for url, thumb, name, dummy in match:
name = name.replace('&amp;', '&')
if 'HD' in dummy:
add_link(name + '[COLOR yellow]' +' [HD]' +'[/COLOR]', url, 4, thumb, fanart)
else:
add_link(name, url, 4, thumb, fanart)
else:
match = re.compile('<div class="thumb vidItem" data-video-id=".+?">.+?<a href="([^"]*)">.+?src="([^"]*)" alt="([^"]*)".+?<span class="fs11 viddata flr"(.+?)>([:\d]+)</span>', re.DOTALL).findall(content)
for url, thumb, name, dummy, duration in match:
name = name.replace('&amp;', '&')
if 'HD' in dummy:
add_link(name + '[COLOR yellow]' +' [HD]' +'[/COLOR]' +' [COLOR lime]('+ duration + ')[/COLOR]', url, 4, thumb, fanart)
else:
add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url, 4, thumb, fanart)
try:
match = re.compile('<link rel="next" href="(.+?)" />').findall(content)
add_dir('[COLOR blue]Next Page >>>>[/COLOR]', ashemaletube + match[0], 2, logos + 'ashemaletube.png', fanart)
except:
pass
match = re.compile('<a class="pageitem rightKey" href="(.+?)" title="Next">Next</a>').findall(content)
add_dir('[COLOR blue]Next Page >>>>[/COLOR]', ashemaletube + match[0], 2, logos + 'ashemaletube.png', fanart)

elif 'efukt' in url:
content = make_request(url)
Expand All @@ -285,7 +296,7 @@ def start(url):
except:
pass


elif 'empflix' in url:
content = make_request(url)
add_dir('[COLOR lightgreen]empflix.com [COLOR red]Search[/COLOR]', empflix, 1, logos + 'empflix.png', fanart)
Expand Down Expand Up @@ -1044,6 +1055,18 @@ def ashemaletube_categories(url) :
for thumb, url, name in match:
add_dir(name, ashemaletube + '/videos/' + url + '/newest/', 2, thumb, fanart)

def ashemaletube_pornstars(url) :
home()
content = make_request(url)
match = re.compile('<div class="modelspot modelItem" data-model-id=".+?">.+?<a href="(.+?)".+?alt="(.+?)" src="(.+?)"', re.DOTALL).findall(content)
for url, name, thumb in match:
add_dir(name, ashemaletube + url, 2, thumb, fanart)
try:
match = re.compile('<link rel="next" href="(.+?)" />').findall(content)
add_dir('[COLOR blue]Next Page >>>>[/COLOR]', ashemaletube + match[0], 55, logos + 'ashemaletube.png', fanart)
except:
pass

def heavyr_categories(url) :
home()
content = make_request(url)
Expand Down Expand Up @@ -1734,6 +1757,9 @@ def add_link(name, url, mode, iconimage, fanart):
elif mode == 54:
uflash_categories(url)

elif mode == 55:
ashemaletube_pornstars(url)

elif mode == 60:
motherless_galeries_cat(url)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v 0.6.4 18-12-2016
- fixed Ashemaletube.com
- added Models to Ashemaletube.com

v 0.6.3 11-12-2016
- fixed Redtube.com
- fixed Xvideos.com
Expand Down
Binary file not shown.

0 comments on commit 1649fb7

Please sign in to comment.