diff --git a/addons.xml b/addons.xml index 3c653ca..6301847 100644 --- a/addons.xml +++ b/addons.xml @@ -1,6 +1,6 @@ - + - + .+?.+?src="([^"]*)" alt="([^"]*)".+?>([:\d]+)', re.DOTALL).findall(content) for url, thumb, name, duration in match: @@ -236,6 +241,25 @@ def start(url): match = re.compile('.+?.+?').findall(content) add_dir('[COLOR blue]Next Page >>>>[/COLOR]', efukt + match[0], 2, logos + 'efukt.png', fanart) + elif 'empflix' in url: + content = make_request(url) + add_dir('[COLOR lightgreen]empflix.com [COLOR red]Search[/COLOR]', empflix, 1, logos + 'eporner.png', fanart) + add_dir('[COLOR lime]Categories[/COLOR]', empflix + '/categories.php', 45, logos + 'empflix.png', fanart) + add_dir('[COLOR lime]Sorting[/COLOR]', empflix + '/browse.php?category=mr', 46, logos + 'empflix.png', fanart) + match = re.compile('
.+?

(.+?)

.+?([\d:]+).+?next >>
').findall(content) + add_dir('[COLOR blue]Next Page >>>>[/COLOR]', empflix + '/' + match[0], 2, logos + 'empflix.png', fanart) + except: + pass + elif 'eporner' in url: content = make_request(url) add_dir('[COLOR lightgreen]eporner.com [COLOR red]Search[/COLOR]', eporner, 1, logos + 'eporner.png', fanart) @@ -273,7 +297,7 @@ def start(url): elif 'hentaigasm' in url: add_dir('[COLOR lime]hentaigasm [COLOR red]Search[/COLOR]', hentaigasm, 1, logos + 'hentaigasm.png', fanart) - add_dir('[COLOR magenta]Categories[/COLOR]', hentaigasm, 29, logos + 'hentaigasm.png', fanart) + add_dir('[COLOR lime]Categories[/COLOR]', hentaigasm, 29, logos + 'hentaigasm.png', fanart) content = make_request(url) match = re.compile('title="(.+?)" href="(.+?)">\s*\s*.+?\s*\s*.+?.+? ([\d:]+)', re.DOTALL).findall(content) for url, thumb, name, duration in match: @@ -303,9 +327,9 @@ def start(url): elif 'jav720p' in url: add_dir('[COLOR lightgreen]jav720p.net [COLOR red]Search[/COLOR]', japanesehd, 1, logos + 'j720p.png', fanart) - add_dir('[COLOR magenta]Genres[/COLOR]', japanesehd + '/categories/genres', 34, logos + 'j720p.png', fanart) - add_dir('[COLOR magenta]Models[/COLOR]', japanesehd + '/categories/models', 35, logos + 'j720p.png', fanart) - add_dir('[COLOR magenta]Makers[/COLOR]', japanesehd + '/categories/makers', 36, logos + 'j720p.png', fanart) + add_dir('[COLOR lime]Genres[/COLOR]', japanesehd + '/categories/genres', 34, logos + 'j720p.png', fanart) + add_dir('[COLOR lime]Models[/COLOR]', japanesehd + '/categories/models', 35, logos + 'j720p.png', fanart) + add_dir('[COLOR lime]Makers[/COLOR]', japanesehd + '/categories/makers', 36, logos + 'j720p.png', fanart) content = make_request(url) match = re.compile('title=".+?"> .+?
([^"]*) HD
').findall(content) - add_dir('[COLOR blue]Next Page >>>>[/COLOR]', lubetube + match[0], 2, logos + 'lubetube.png', fanart) + match = re.compile('').findall(content) + add_dir('[COLOR blue]Next Page >>>>[/COLOR]', lubetube + match[0], 2, logos + 'lubetube.png', fanart) + elif 'motherless' in url: content = make_request(url) ###Search in def search(): and media_list(url) add_dir('[COLOR lightgreen]motherless.com [COLOR red]Search[/COLOR]', motherless, 1, logos + 'motherless.png', fanart) ####Subfolders add_dir('[COLOR lime]Being watched now[/COLOR]', motherless + '/live/videos', 61, logos + 'motherless.png', fanart) - add_dir('[COLOR lime]Popular Videos[/COLOR]', motherless + '/videos/popular', 3, logos + 'motherless.png', fanart) - add_dir('[COLOR lime]Most Viewed Videos[/COLOR]', motherless + '/videos/viewed', 3, logos + 'motherless.png', fanart) - add_dir('[COLOR lime]Most Favorited Videos[/COLOR]', motherless + '/videos/favorited', 3, logos + 'motherless.png', fanart) - add_dir('[COLOR lime]Most Commented Videos[/COLOR]', motherless + '/videos/commented', 3, logos + 'motherless.png', fanart) + add_dir('[COLOR lime]Sorting[/COLOR]', motherless + '/videos/', 44, logos + 'motherless.png', fanart) add_dir('[COLOR magenta]Galleries[/COLOR]', motherless + '/galleries/updated?page=1', 60, logos + 'motherless.png', fanart) add_dir('[COLOR magenta]Groups[/COLOR]', motherless + '/groups?s=u', 62, logos + 'motherless.png', fanart) ###sending video URL to resolve_url(url) - match = re.compile('es=\"12\">\s*\s*(.+?)\s*\s*
\s*

.+?

\s*
(.+?)
').findall(content) + match = re.compile('data-frames="12">.+?([:\d]+)
', re.DOTALL).findall(content) for url, thumb, name, duration in match: - add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url , 4, thumb, fanart) + if 'motherless' in url: + add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url, 4, thumb, fanart) + else: + add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', motherless + url, 4, thumb, fanart) ###Next Button - match = re.compile('NEXT »').findall(content) - add_dir('[COLOR blue]Next Page >>>>[/COLOR]', motherless + match[0], 2, logos + 'motherless.png', fanart) + try : + match = re.compile('NEXT »').findall(content) + add_dir('[COLOR blue]Next Page >>>>[/COLOR]', motherless + match[0], 2, logos + 'motherless.png', fanart) + except: + pass elif '.porn.com' in url: content = make_request(url) add_dir('[COLOR lightblue].porn.com [COLOR red]Search[/COLOR]', porncom, 1, logos + 'porncom.png', fanart) add_dir('[COLOR lime]Categories[/COLOR]', porncom, 14, logos + 'porncom.png', fanart) - match = re.compile('.+?class="duration">(.+?)(.+?)').findall(content) + match = re.compile('.+?class="duration">(.+?)(.+?)').findall(content) for url, thumb, duration, name in match: - add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', porncom + url, 4, thumb, fanart) + add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', porncom + '/videos/' + url, 4, thumb, fanart) + try : + match = re.compile('Next').findall(content) + add_dir('[COLOR blue]Next Page >>>>[/COLOR]', porncom + match[0], 2, logos + 'porncom.png', fanart) + except: + pass - match = re.compile('Next').findall(content) - add_dir('[COLOR blue]Next Page >>>>[/COLOR]', porncom + match[0], 2, logos + 'porncom.png', fanart) - elif 'pornhd' in url: add_dir('[COLOR lightgreen]pornhd.com [COLOR red]Search[/COLOR]', pornhd, 1, logos + 'pornhd.png', fanart) - add_dir('[COLOR magenta]Categories[/COLOR]', pornhd + '/category', 19, logos + 'pornhd.png', fanart) - add_dir('[COLOR magenta]Pornstars[/COLOR]', pornhd + '/pornstars?order=video_count&gender=female', 20, logos + 'pornhd.png', fanart) + add_dir('[COLOR lime]Categories[/COLOR]', pornhd + '/category', 19, logos + 'pornhd.png', fanart) + add_dir('[COLOR lime]Pornstars[/COLOR]', pornhd + '/pornstars?order=video_count&gender=female', 20, logos + 'pornhd.png', fanart) content = make_request(url) match = re.compile('\s*\s*', re.DOTALL).findall(content) for url, thumb, name, duration in match: add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url, 4, thumb, fanart) @@ -455,7 +485,7 @@ def start(url): elif 'vikiporn' in url: content = make_request(url) add_dir('[COLOR lightgreen]vikiporn.com [COLOR red]Search[/COLOR]', vikiporn, 1, logos + 'vikiporn.png', fanart) - add_dir('[COLOR magenta]Categories[/COLOR]', vikiporn + '/categories/', 16, logos + 'vikiporn.png', fanart) + add_dir('[COLOR lime]Categories[/COLOR]', vikiporn + '/categories/', 16, logos + 'vikiporn.png', fanart) match = re.compile('\s*
\s*(.+?)\s*(.+?)').findall(content) for url, thumb, name, duration in match: add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url, 4, thumb, fanart) @@ -465,8 +495,9 @@ def start(url): elif 'xhamster' in url: content = make_request(url) add_dir('[COLOR lightgreen]xhamster.com [COLOR red]Search[/COLOR]', xhamster, 1, logos + 'xhamster.png', fanart) - add_dir('[COLOR magenta]Categories[/COLOR]', xhamster + '/channels.php', 17, logos + 'xhamster.png', fanart) - add_dir('[COLOR magenta]Change Content[/COLOR]', xhamster , 24, logos + 'xhamster.png', fanart) + add_dir('[COLOR lime]Categories[/COLOR]', xhamster + '/channels.php', 17, logos + 'xhamster.png', fanart) + add_dir('[COLOR lime]Rankings[/COLOR]', xhamster + '/rankings/weekly-top-viewed.html' , 42, logos + 'xhamster.png', fanart) + add_dir('[COLOR lime]Change Content[/COLOR]', xhamster , 24, logos + 'xhamster.png', fanart) match = re.compile('href="([^"]*)" class=".+?">(.+?).+?(.+?)').findall(content) for url, thumb, name, duration in match: name = name.replace('&', '&').replace('"', '"').replace(''', '\'') @@ -474,18 +505,16 @@ def start(url): pass else: add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url, 4, thumb, fanart) - try: - if "shemale" in url : - match = re.compile('>>>[/COLOR]', match[0] + '?content=shemale', 2, logos + 'xhamster.png', fanart) - if "gay" in url : - match = re.compile('>>>[/COLOR]', match[0] + + '?content=gay', 2, logos + 'xhamster.png', fanart) - else : - match = re.compile('>>>[/COLOR]', match[0], 2, logos + 'xhamster.png', fanart) - except: - pass + match = re.compile('
').findall(content) + if "iconL iconTrans" in match : + match = re.compile('>>>[/COLOR]', match[0] + '?content=shemale', 2, logos + 'xhamster.png', fanart) + if "iconL iconGays" in match : + match = re.compile('>>>[/COLOR]', match[0] + '?content=gay', 2, logos + 'xhamster.png', fanart) + else : + match = re.compile('>>>[/COLOR]', match[0] , 2, logos + 'xhamster.png', fanart) @@ -494,7 +523,7 @@ def start(url): add_dir('[COLOR lightgreen]xvideos.com [COLOR red]Search[/COLOR]', xvideos, 1, logos + 'xvideos.png', fanart) add_dir('[COLOR lime]Categories[/COLOR]', xvideos, 27, logos + 'xvideos.png', fanart) add_dir('[COLOR lime]Pornstars[/COLOR]', xvideos + '/pornstars', 32, logos + 'xvideos.png', fanart) - match = re.compile('
.+?"duration">\(([^"]*)\)', re.DOTALL | re.IGNORECASE).findall(content) + match = re.compile('.+?"duration">\(([^"]*)\)', re.DOTALL).findall(content) for url, thumb, name, duration in match: name = name.replace('&', '&').replace('"', '"').replace(''', '`') add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', xvideos + url, 4, thumb, fanart) @@ -507,7 +536,7 @@ def start(url): elif 'youjizz' in url: content = make_request(url) add_dir('[COLOR lightgreen]youjizz.com [COLOR red]Search[/COLOR]', youjizz, 1, logos + 'youjizz.png', fanart) - add_dir('[COLOR magenta]Categories[/COLOR]', youjizz + '/newest-clips/1.html' , 28, logos + 'youjizz.png', fanart) + add_dir('[COLOR lime]Categories[/COLOR]', youjizz + '/newest-clips/1.html' , 28, logos + 'youjizz.png', fanart) match = re.compile('([^"]+).+?>([:\d]+)', re.DOTALL).findall(content) for url, thumb, name, duration in match: add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', youjizz + url, 4, thumb, fanart) @@ -515,8 +544,9 @@ def start(url): add_dir('[COLOR blue]Next Page >>>>[/COLOR]', youjizz + match[0], 2, logos + 'youjizz.png', fanart) elif 'youporn' in url: - add_dir('[COLOR lightgreen]YouPorn.com [COLOR red]Search[/COLOR]', youporn, 1, logos + 'youporn.png', fanart) - add_dir('[COLOR magenta]Categories[/COLOR]', youporn + '/categories/', 31, logos + 'youporn.png', fanart) + add_dir('[COLOR lightgreen]youporn.com [COLOR red]Search[/COLOR]', youporn, 1, logos + 'youporn.png', fanart) + add_dir('[COLOR lime]Categories[/COLOR]', youporn + '/categories/', 31, logos + 'youporn.png', fanart) + add_dir('[COLOR lime]Sorting[/COLOR]', youporn, 43, logos + 'youporn.png', fanart) content = make_request(url) match = re.compile('.+?.+?([:\d]+) ', re.DOTALL).findall(content) for url, name, thumb, duration in match: @@ -602,16 +632,17 @@ def porncom_channels_list(url): content = make_request(url) match = re.compile('href="/videos/(.+?)" title="(.+?)"').findall(content)[31:200] for url, name in match: - add_dir(name, porncom + '/videos/' + url, 3, logos + 'porncom.png', fanart) + add_dir(name, porncom + '/videos/' + url, 2, logos + 'porncom.png', fanart) def motherless_galeries_cat(url): home() add_dir('[COLOR lightgreen]motherless.com Galleries [COLOR red]Search[/COLOR]', motherless + '/search/Galleries', 1, logos + 'motherless.png', fanart) content = make_request(url) - match = re.compile('href="/G(.+?)" class=".+?" target=".+?">\s*(.+?)NEXT »
').findall(content) add_dir('[COLOR blue]Next Page >>>>[/COLOR]', motherless + match[0], 60, logos + 'motherless.png', fanart) @@ -622,20 +653,19 @@ def motherless_groups_cat(url): #62 match = re.compile('.+?src="(.+?)".+?class="grunge motherless-red">([^"]+)', re.DOTALL).findall(content) for url, thumb,name in match: name = name.replace('&', '&').replace('"', '"').replace(''', '\'').replace(' ', '') - add_dir(name, motherless + '/gv/' + url, 3, thumb, fanart) + add_dir(name, motherless + '/gv/' + url, 2, thumb, fanart) match = re.compile('NEXT »
').findall(content) add_dir('[COLOR blue]Next Page >>>>[/COLOR]', motherless + match[0], 62, logos + 'motherless.png', fanart) def motherless_being_watched_now(url): home() content = make_request(url) - if 'motherless' in url: - match = re.compile("").findall(content) - add_dir('[COLOR lime]REFRESH[COLOR orange] Page[COLOR red] >>>>[/COLOR]', motherless + match[0], 31, logos + 'motherless.png', fanart) - match = re.compile('"12">.+?.+?
([:\d]+)
', re.DOTALL).findall(content) - for url, thumb, name, duration in match: - name = name.replace('&', '&').replace('"', '"').replace(''', '\'') - add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url , 4, thumb, fanart) + match = re.compile("
").findall(content) + add_dir('[COLOR lime]REFRESH[COLOR orange] Page[COLOR red] >>>>[/COLOR]', motherless + match[0], 61, logos + 'motherless.png', fanart) + match = re.compile('data-frames="12">.+?([:\d]+)', re.DOTALL).findall(content) + for url, thumb, name, duration in match: + name = name.replace('&', '&').replace('"', '"').replace(''', '\'') + add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url , 4, thumb, fanart) def redtube_channels_list(url): #(11) home() @@ -827,41 +857,45 @@ def gotporn_content(url) : name = url name = name.replace ('store?orientation=', '') add_dir(name, 'http://www.gotporn.com/browse-settings/' + url, 2, logos + 'gotporn.png', fanart) - -def media_list(url): +def xhamster_rankigs(url) : home() content = make_request(url) - if '.porn.com' in url: - match = re.compile('.+?class="duration">(.+?)(.+?)').findall(content) - for url, thumb, duration, name in match: - add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', porncom + url, 4, thumb, fanart) - match = re.compile('href="([^"]*)">(\d+) ').findall(content) - for url, name in match: - add_dir('[COLOR yellow]Page ' + name + '[/COLOR]', porncom + url.replace('&', '&') , 3, logos + 'porncom.png', fanart) + match = re.compile('(.+?)', re.DOTALL).findall(content) + for url, name in match: + add_dir(name, url, 2, logos + 'xhamster.png', fanart) - elif 'motherless' in url: - match = re.compile('href="(.+?)" class=".+?" target=".+?">\s*(.+?)\s*\s*
\s*

.+?

\s*
(.+?)
').findall(content) - for url, thumb, name, duration in match: - if 'motherless.com' in url: - add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url, 4, thumb, fanart) - else: - add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', motherless + url, 4, thumb, fanart) - match = re.compile('NEXT').findall(content) - for url in match: - if '/' in url: - add_dir('[COLOR blue]Next Page >>>>[/COLOR]', motherless + match[0], 3, logos + 'motherless.png', fanart) - else: - pass +def youporn_sorting(url) : + home() + content = make_request(url) + match = re.compile('href="([^"]+)">(Top.+?|Most.+?)').findall(content) + + for url, name in match: + add_dir(name, youporn + url, 2, logos + 'youporn.png', fanart) + +def motherless_sorting(url) : + home() + content = make_request(url) + match = re.compile('(Most.+?|Popular.+?)').findall(content) + for url, name in match: + add_dir(name, motherless + url, 2, logos + 'motherless.png', fanart) - elif 'lubetube' in url: - match = re.compile('href="(.+?)" title="(.+?)">(\d+)<').findall(content) - for url, name in match: - add_dir('[COLOR yellow]Page ' + name + '[/COLOR]', lubetube + url, 3, logos + 'lubetube.png', fanart) +def emplix_categories(url) : + home() + content = make_request(url) + match = re.compile('.+?.+?([^', re.DOTALL).findall(content) + for url, thumb, name in match: + name = name.replace('&', '&').replace('"', '"').replace(''', '\'') + add_dir(name, 'http://www.empflix.com/categories/' + url, 2, 'http:' + thumb, fanart) +def emplix_sorting(url) : + home() + content = make_request(url) + match = re.compile('href="([^"]*)" >(Being Watched|Most Recent|Most Viewed|Top Rated)').findall(content) + for url, name in match: + add_dir(name, empflix + url, 2, logos + 'empflix.png', fanart) + + def resolve_url(url): content = make_request(url) if 'xvideos' in url: @@ -931,6 +965,12 @@ def resolve_url(url): media_url = re.compile('file: "([^"]+)"').findall(content)[0] elif 'gotporn' in url: media_url = re.compile('([^<]+.mp4[^<]+)').findall(content)[-1] + except: + video_url = 'http:' + re.compile('([^<]+.mp4[^<]+)').findall(content)[-1] + media_url = urllib.unquote_plus(video_url) else: media_url = url @@ -964,6 +1004,7 @@ def add_dir(name, url, mode, iconimage, fanart): ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url = u, listitem = liz, isFolder = True) return ok + def add_link(name, url, mode, iconimage, fanart): u = sys.argv[0] + "?url=" + urllib.quote_plus(url) + "&mode=" + str(mode) + "&name=" + urllib.quote_plus(name) + "&iconimage=" + urllib.quote_plus(iconimage) liz = xbmcgui.ListItem(name, iconImage = "DefaultVideo.png", thumbnailImage = iconimage) @@ -971,7 +1012,6 @@ def add_link(name, url, mode, iconimage, fanart): liz.setProperty('fanart_image', fanart) liz.setProperty('IsPlayable', 'true') ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url = u, listitem = liz) - params = get_params() url = None @@ -1111,7 +1151,22 @@ def add_link(name, url, mode, iconimage, fanart): elif mode == 41: gotporn_content(url) - + +elif mode == 42: + xhamster_rankigs(url) + +elif mode == 43: + youporn_sorting(url) + +elif mode == 44: + motherless_sorting(url) + +elif mode == 45: + emplix_categories(url) + +elif mode == 46: + emplix_sorting(url) + elif mode == 60: motherless_galeries_cat(url) diff --git a/plugin.video.adulthideout/logos/empflix.png b/plugin.video.adulthideout/logos/empflix.png new file mode 100644 index 0000000..9407a87 Binary files /dev/null and b/plugin.video.adulthideout/logos/empflix.png differ diff --git a/zips/plugin.video.adulthideout/changelog-0.4.2.txt b/zips/plugin.video.adulthideout/changelog-0.4.4.txt similarity index 52% rename from zips/plugin.video.adulthideout/changelog-0.4.2.txt rename to zips/plugin.video.adulthideout/changelog-0.4.4.txt index 7052196..e26350b 100644 --- a/zips/plugin.video.adulthideout/changelog-0.4.2.txt +++ b/zips/plugin.video.adulthideout/changelog-0.4.4.txt @@ -1,3 +1,24 @@ +v 0.4.4 22-03-2016 +- added Empflix.com +- added ranking sub for xhamster.com +- fixed change content for xhamster.com +- fixed search for youporn.com +- added sorting sub for youporn.com +- changed motherless.com regex +- lots of minor changes +- code cleaning + + +v 0.4.3 13-03-2016 +- added gotporn.com +- added categories and pornstars subs for xvideos.com +- fixed search for xvideos.com +- added categories for yes.xxx +- added categories for tubepornclassic.com +- added categories for pornxs.com +- added logo for pornsocket.com +- code reorginized and minor fixes + v 0.4.2 05-03-2016 - removed Jamo.tv - added Jav720p.net diff --git a/zips/plugin.video.adulthideout/plugin.video.adulthideout-0.4.3.zip b/zips/plugin.video.adulthideout/plugin.video.adulthideout-0.4.4.zip similarity index 89% rename from zips/plugin.video.adulthideout/plugin.video.adulthideout-0.4.3.zip rename to zips/plugin.video.adulthideout/plugin.video.adulthideout-0.4.4.zip index a2eb4c7..0c8b222 100644 Binary files a/zips/plugin.video.adulthideout/plugin.video.adulthideout-0.4.3.zip and b/zips/plugin.video.adulthideout/plugin.video.adulthideout-0.4.4.zip differ