diff --git a/addons.xml b/addons.xml index 1032045..26218ae 100644 --- a/addons.xml +++ b/addons.xml @@ -1,6 +1,6 @@ - + -v 0.9.1 2019-12-28 -- Code cleanup -- Fix View setting on Estuary/Estouchy -- Removed Porn.com (Dead) +v 0.9.2 2020-04-01 +- fix Motherless +- fix Xhamster +- fix Redtube +- readded fantasti.cc (hooray) [COLOR red]XXX[/COLOR] Porn videos diff --git a/addons.xml.md5 b/addons.xml.md5 index 3abf6ae..27a9988 100644 --- a/addons.xml.md5 +++ b/addons.xml.md5 @@ -1 +1 @@ -95116cdcac48ada428db2a6d217cac8b \ No newline at end of file +723dde924509cb5c1b8d58cac1a76e8f \ No newline at end of file diff --git a/plugin.video.adulthideout/addon.xml b/plugin.video.adulthideout/addon.xml index 4ff576b..976ef26 100644 --- a/plugin.video.adulthideout/addon.xml +++ b/plugin.video.adulthideout/addon.xml @@ -1,5 +1,5 @@ - + -v 0.9.1 2019-12-28 -- Code cleanup -- Fix View setting on Estuary/Estouchy -- Removed Porn.com (Dead) +v 0.9.2 2020-04-01 +- fix Motherless +- fix Xhamster +- fix Redtube +- readded fantasti.cc (hooray) [COLOR red]XXX[/COLOR] Porn videos diff --git a/plugin.video.adulthideout/changelog.txt b/plugin.video.adulthideout/changelog.txt index db72629..acafa26 100644 --- a/plugin.video.adulthideout/changelog.txt +++ b/plugin.video.adulthideout/changelog.txt @@ -1,3 +1,9 @@ +v 0.9.2 2020-04-01 +- fix Motherless +- fix Xhamster +- fix Redtube +- readded fantasti.cc (hooray) + v 0.9.1 2019-12-28 - Code cleanup - Fix View setting on Estuary/Estouchy diff --git a/plugin.video.adulthideout/default.py b/plugin.video.adulthideout/default.py index 50b9387..cda4ad7 100755 --- a/plugin.video.adulthideout/default.py +++ b/plugin.video.adulthideout/default.py @@ -49,7 +49,7 @@ youporn = 'http://www.youporn.com' heavyr = 'http://www.heavy-r.com' empflix = 'http://www.empflix.com' -fantasti = 'http://fantasti.cc' +fantasti = 'https://fantasti.cc' yespornplease = 'http://yespornplease.com' uflash = 'http://www.uflash.tv' javwhores = 'https://www.javwhores.com' @@ -100,7 +100,7 @@ def main(): add_dir('A Shemale Tube [COLOR yellow] Videos[/COLOR]', ashemaletube + '/videos/newest/' , 2, logos + 'ashemaletube.png', fanart) add_dir('Efukt [COLOR yellow] Videos[/COLOR]', efukt, 2, logos + 'efukt.png', fanart) add_dir('Empflix [COLOR yellow] Videos[/COLOR]', empflix + '/new/' , 2, logos + 'empflix.png', fanart) - #add_dir('Fantasti.cc [COLOR yellow] Videos[/COLOR]', fantasti + '/videos/upcoming/', 2, logos + 'fantasti.png', fanart) + add_dir('Fantasti.cc [COLOR yellow] Videos[/COLOR]', fantasti + '/videos/upcoming/', 2, logos + 'fantasti.png', fanart) add_dir('Hentaigasm [COLOR yellow] Videos[/COLOR]', hentaigasm, 2, logos + 'hentaigasm.png', fanart) add_dir('Heavy-R [COLOR yellow] Videos[/COLOR]', heavyr + '/videos/recent/' , 2, logos + 'heavyr.png', fanart) add_dir('Javwhores [COLOR yellow] Videos[/COLOR]', javwhores + '/latest-updates/', 2, logos + 'javwhores.png', fanart) @@ -154,10 +154,10 @@ def search(): start(url) elif 'fantasti' in name: if 'collections' in name: - url = 'http://fantasti.cc/search/' + searchText + '/collections/trending/' + url = 'https://fantasti.cc/search/' + searchText + '/collections/trending/' fantasti_collections(url) else: - url = 'http://fantasti.cc/search/' + searchText + '/tube/popular/' + url = 'https://fantasti.cc/search/' + searchText + '/tube/popular/' start(url) elif 'pornhub' in name: url = pornhub + '/video/search?search=' + searchText @@ -275,24 +275,16 @@ def start(url): 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: + match = re.compile('href="([^"]+)">([^.+?([:\d]+).+?.+?href="([^"]+)">([^"]+)', re.DOTALL).findall(content) + for thumb, duration, url, name in match: + name = name.replace(''', ' ').replace('&', '&').replace('"', '"').replace(' ', '') + add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', redtube + url, 4, thumb, fanart) + + else: match = re.compile('(.+?).+?([:\d]+).+?', re.DOTALL).findall(content) for url, name, thumb, dummy, duration in match: name = name.replace(''', ' ').replace('&', '&').replace('"', '"').replace(' ', '') @@ -445,20 +442,6 @@ def start(url): add_link(name + '[COLOR yellow]' +' [HD]' +'[/COLOR]' +' [COLOR lime]('+ duration + ')[/COLOR]', redtube + url, 4, thumb, fanart) else: add_link(name +' [COLOR lime]('+ duration + ')[/COLOR]', redtube + url, 4, thumb, fanart) - elif '/redtube/' in url: - match = re.compile('data-src="([^"]+)".+?js-videoPreview\"/>(.+?).+?([:\d]+).+?.+?', re.DOTALL).findall(content) - for url, name, duration, thumb in match: - name = name.replace(''', ' ').replace('&', '&').replace('"', '"').replace(' ', '') - add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', redtube + url, 4, thumb, fanart) - - elif 'mostviewed' or 'hot' or 'top' or 'recommended' or 'mostviewed' or 'mostfavored' or 'longest' in url: - match = re.compile('
.+?.+?.+?([:\d]+).+?.+?src="([^"]+)"', re.DOTALL).findall(content) - for url, name, duration, thumb in match: - name = name.replace(''', ' ').replace('&', '&').replace('"', '"').replace(' ', '') - add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', redtube + url, 4, thumb, fanart) - else: - pass - except: pass try: @@ -505,7 +488,6 @@ def start(url): add_dir('[COLOR lightgreen]vikiporn.com [COLOR red]Search[/COLOR]', vikiporn, 1, logos + 'vikiporn.png', fanart) add_dir('[COLOR lime]Categories[/COLOR]', vikiporn + '/categories/', 16, logos + 'vikiporn.png', fanart) match = re.compile('itemscope itemtype=".+?">.+?', re.DOTALL).findall(content) - #.+?([:\d]+) for url, thumb, name in match: add_link(name, url, 4, thumb, fanart) match = re.compile('NEXT').findall(content) @@ -514,7 +496,7 @@ 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 lime]Categories[/COLOR]', xhamster, 17, logos + 'xhamster.png', fanart) + add_dir('[COLOR lime]Categories[/COLOR]', xhamster + '/categories', 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="https://xhamster.com/videos/([^"]*)" data-sprite=".+?"(.+?)src="(.+?)".+?alt="(.+?)">.+?
(.+?)
', re.DOTALL).findall(content) @@ -546,14 +528,12 @@ def start(url): content = make_request(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/2weeks', 32, logos + 'xvideos.png', fanart) + add_dir('[COLOR lime]Pornstars[/COLOR]', xvideos + '/pornstars-index/3months', 32, logos + 'xvideos.png', fanart) add_dir('[COLOR lime]Rankings[/COLOR]', xvideos + '/best' , 71, logos + 'xvideos.png', fanart) - if 'profiles' in url: - match = re.compile('.+?(.+?)', re.DOTALL).findall(content) - for url, thumb, dummy, name, duration in match: - name = name.replace('&', '&').replace('"', '"').replace(''', '`') - url = url.replace('THUMBNUM/','') - add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', xvideos + url, 4, thumb, fanart) + if 'channels' in url: + match = re.compile('

', re.DOTALL).findall(content) + for url, name in match: + add_link(name, xvideos + url, 4, logos + 'xvideos.png', fanart) else: match = re.compile('([^"]*)', re.DOTALL).findall(content) for thumb, dummy, url, name, duration in match: @@ -688,42 +668,19 @@ def redtube_sorting(url): home() setView('Movies', 'DEFAULT') content = make_request(url) - match = re.compile('.+?').findall(content) - for url, name in match: - add_dir(name, redtube + '/channel/' + url, 11, logos + 'redtube.png', fanart) - -def redtube_channels_list(url): - home() - setView('Movies', 'DEFAULT') - content = make_request(url) - match = re.compile('href="([^"]+)" class="channels-list-img">.+?([^', re.DOTALL).findall(content) + match = re.compile('

.+?.+?.+?data-src="(.+?)".+?alt="(.+?)"', re.DOTALL).findall(content) for url, thumb, name in match: - if 'https' in thumb: - add_dir(name, redtube + url, 2, thumb, fanart) - else: - add_dir(name, redtube + url, 2, "https:" + thumb, fanart) - try: - match = re.compile('rel="next" href="([^"]+)">').findall(content) - add_dir('[COLOR blue]Next Page >>>>[/COLOR]', match[0], 11, logos + 'redtube.png', fanart) - except: - pass + add_dir(name, 'https://www.redtube.com' + url, 2, thumb, fanart) def vikiporn_categories(url): home() @@ -737,20 +694,30 @@ def xhamster_categories(url): home() setView('Movies', 'DEFAULT') content = make_request(url) - match = re.compile('
([^"]+)', re.DOTALL).findall(content) + match = re.compile('([^"]+)', re.DOTALL).findall(content) for thumb, url, name in match: thumb = thumb.replace('\\', '') add_dir(name, xvideos + url + '/videos/new', 2, thumb, fanart) @@ -855,14 +822,6 @@ def pornxs_categories(url) : name = name.replace (' ', '') add_dir(name, pornxs + url, 2, thumb, fanart) -def xhamster_rankigs(url) : - home() - setView('Movies', 'DEFAULT') - content = make_request(url) - match = re.compile('(.+?)', re.DOTALL).findall(content) - for url, name in match: - add_dir(name, url, 2, logos + 'xhamster.png', fanart) - def youporn_sorting(url) : home() setView('Movies', 'DEFAULT') @@ -902,10 +861,10 @@ def fantasti_collections(url): 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('([^"]+).+?http://(.+?).jpg.+?(.+?)
videos', re.DOTALL).findall(content) - for url, name, thumb, duration in match: + match = re.compile('([^"]+).+?https:(.+?).jpg', re.DOTALL).findall(content) + for url, name, thumb in match: name = name.replace('&', '&').replace('"', '"').replace(''', '\'') - add_dir(name + ' [COLOR lime]('+ duration + ')[/COLOR]', fantasti + url + '#collectionSubmittedVideos', 2, 'http://' + thumb + '.jpg', fanart) + add_dir(name, fantasti + url + '#collectionSubmittedVideos', 2, 'https:' + 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) @@ -925,6 +884,19 @@ def fatasti_sorting(url) : for url, name in match: add_dir('Popular Videos ' + name, fantasti + '/videos/popular/' + url, 2, logos + 'fantasti.png', fanart) +def fantasti_categories(url): + home() + setView('Movies', 'DEFAULT') + add_dir('[COLOR lightgreen]fantasti.cc [COLOR red]Search[/COLOR]', fantasti, 1, logos + 'fantasti.png', fanart) + add_dir('[COLOR lime]Collection[/COLOR]', fantasti + '/videos/collections/popular/31days/', 48, logos + 'fantasti.png', fanart) + add_dir('[COLOR lime]Category [/COLOR]', fantasti + '/category/', 18, logos + 'fantasti.png', fanart) + add_dir('[COLOR lime]Sorting [/COLOR]', fantasti + '/videos/popular/today/', 49, logos + 'fantasti.png', fanart) + content = make_request(url) + match = re.compile('.+?.+?').findall(content)[0] elif 'yespornplease' in url: media_url = re.compile('').findall(content)[0] + elif 'fantasti' in url: + url = re.compile('
').findall(content)[0] return resolve_url(url) elif 'uflash' in url: try: @@ -1180,12 +1141,6 @@ def setView(content, viewType): elif mode == 9: redtube_categories(url) -elif mode == 10: - redtube_channels_cat(url) - -elif mode == 11: - redtube_channels_list(url) - elif mode == 12: lubtetube_pornstars(url) diff --git a/zips/plugin.video.adulthideout/changelog-0.9.1.txt b/zips/plugin.video.adulthideout/changelog-0.9.2.txt similarity index 98% rename from zips/plugin.video.adulthideout/changelog-0.9.1.txt rename to zips/plugin.video.adulthideout/changelog-0.9.2.txt index db72629..acafa26 100644 --- a/zips/plugin.video.adulthideout/changelog-0.9.1.txt +++ b/zips/plugin.video.adulthideout/changelog-0.9.2.txt @@ -1,3 +1,9 @@ +v 0.9.2 2020-04-01 +- fix Motherless +- fix Xhamster +- fix Redtube +- readded fantasti.cc (hooray) + v 0.9.1 2019-12-28 - Code cleanup - Fix View setting on Estuary/Estouchy diff --git a/zips/plugin.video.adulthideout/changelog.txt b/zips/plugin.video.adulthideout/changelog.txt index db72629..acafa26 100644 --- a/zips/plugin.video.adulthideout/changelog.txt +++ b/zips/plugin.video.adulthideout/changelog.txt @@ -1,3 +1,9 @@ +v 0.9.2 2020-04-01 +- fix Motherless +- fix Xhamster +- fix Redtube +- readded fantasti.cc (hooray) + v 0.9.1 2019-12-28 - Code cleanup - Fix View setting on Estuary/Estouchy diff --git a/zips/plugin.video.adulthideout/plugin.video.adulthideout-0.9.1.zip b/zips/plugin.video.adulthideout/plugin.video.adulthideout-0.9.2.zip similarity index 98% rename from zips/plugin.video.adulthideout/plugin.video.adulthideout-0.9.1.zip rename to zips/plugin.video.adulthideout/plugin.video.adulthideout-0.9.2.zip index 0dbe334..a5023df 100644 Binary files a/zips/plugin.video.adulthideout/plugin.video.adulthideout-0.9.1.zip and b/zips/plugin.video.adulthideout/plugin.video.adulthideout-0.9.2.zip differ diff --git a/zips/repository.adulthideout/repository.adulthideout-1.0.1.zip b/zips/repository.adulthideout/repository.adulthideout-1.0.1.zip index 1106b4c..646a160 100644 Binary files a/zips/repository.adulthideout/repository.adulthideout-1.0.1.zip and b/zips/repository.adulthideout/repository.adulthideout-1.0.1.zip differ