diff --git a/addons.xml b/addons.xml index 97307ce..2cc72d6 100644 --- a/addons.xml +++ b/addons.xml @@ -1,6 +1,6 @@ - + - + Next', re.DOTALL).findall(content) add_dir('[COLOR blue]Next Page >>>>[/COLOR]', pornhub + match[0].replace('&','&'), 2, logos + 'pornhub.png', fanart) - + + + elif 'pornktube' in url: + content = make_request(url) + add_dir('[COLOR lightgreen]pornktube.com [COLOR red]Search[/COLOR]', pornktube, 1, logos + 'pornktube.png', fanart) + add_dir('[COLOR lime]Categories[/COLOR]', pornktube, 63, logos + 'pornktube.png', fanart) + match = re.compile('([^([^<]+)', re.DOTALL).findall(content) + for url, thumb, name, duration in match: + add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url, 4, thumb, fanart) + try: + match = re.compile('Next »').findall(content) + add_dir('[COLOR blue]Next Page >>>>[/COLOR]', pornktube + match[0], 2, logos + 'pornktube.png', fanart) + except: + pass + elif 'pornsocket' in url: content = make_request(url) add_dir('[COLOR lightgreen]pornsocket.com [COLOR red]Search[/COLOR]', pornsocket, 1, logos + 'pornsocket.png', fanart) @@ -583,7 +602,7 @@ def start(url): elif 'txxx' in url: content = make_request(url) add_dir('[COLOR lightgreen]txxx [COLOR red]Search[/COLOR]', txxx, 1, logos + 'txxx.png', fanart) - add_dir('[COLOR lime]Categories[/COLOR]', 'http://m.txxx.com/categories/', 47, logos + 'txxx.png', fanart) + add_dir('[COLOR lime]Categories[/COLOR]', txxx + '/categories/' , 47, logos + 'txxx.png', fanart) match = re.compile('([^<]+)', re.DOTALL).findall(content) for url, thumb, name, duration in match: add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url, 4, thumb, fanart) @@ -602,7 +621,7 @@ def start(url): add_dir('[COLOR magenta]Recently Viewed - Exhibitionist Videos[/COLOR]', uflash + '/videos?o=bw', 2, logos + 'uflash.png', fanart) match = re.compile('.+?([^<]+)', re.DOTALL).findall(content) for url, name, thumb, duration in match: - add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', 'http://www.uflash.tv/media/player/config.b74x.php?vkey=' + url, 4, uflash + thumb, fanart) + add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', 'http://www.uflash.tv/media/player/config.v89x.php?vkey=' + url, 4, uflash + thumb, fanart) try: match = re.compile('Next»', re.DOTALL).findall(content) add_dir('[COLOR blue]Next Page >>>>[/COLOR]', match[0], 2, logos + 'uflash.png', fanart) @@ -636,7 +655,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 + '/channels.php', 17, logos + 'xhamster.png', fanart) + add_dir('[COLOR lime]Categories[/COLOR]', xhamster, 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('>(.+?)', re.DOTALL).findall(content) @@ -653,25 +672,37 @@ def start(url): if "iconL iconGays" in match : match = re.compile('>>>[/COLOR]', match[0] + '?content=gay', 2, logos + 'xhamster.png', fanart) - else : + if "iconL iconStraight" in match : match = re.compile('>>>[/COLOR]', match[0] , 2, logos + 'xhamster.png', fanart) - - + add_dir('[COLOR blue]Next Page >>>>[/COLOR]', match[0] + '?content=straight', 2, logos + 'xhamster.png', fanart) + try: + match = re.compile('
Next').findall(content) + match = [item.replace('&', '&') for item in match] + add_dir('[COLOR blue]Next Page >>>>[/COLOR]', match[0] , 2, logos + 'xhamster.png', fanart) + except: + pass + elif 'xvideos' in 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', 32, logos + 'xvideos.png', fanart) - match = re.compile('(.+?) ', 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) + add_dir('[COLOR lime]Pornstars[/COLOR]', xvideos + '/pornstars/popular', 32, logos + 'xvideos.png', fanart) + if 'profiles' in url: + match = re.compile('([^"]*)

.+?\((.+?)\)', re.DOTALL).findall(content) + for thumb, url, name, duration in match: + name = name.replace('&', '&').replace('"', '"').replace(''', '`') + add_link(name + ' [COLOR lime]('+ duration + ')[/COLOR]', xvideos + url, 4, thumb, fanart) + else: + match = re.compile('(.+?)', 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) try: - match = re.compile('Next').findall(content) + match = [item.replace('&', '&') for item in match] add_dir('[COLOR blue]Next Page >>>>[/COLOR]', xvideos + match[0], 2, logos + 'xvideos.png', fanart) except: - pass + pass elif 'youav' in url: add_dir('[COLOR blue]Can\'t see text? Turn your skin font to arial based[/COLOR]', youav, 2, logos + 'youav.png', fanart) @@ -684,8 +715,8 @@ def start(url): match = re.compile('»').findall(content) add_dir('[COLOR blue]Next Page >>>>[/COLOR]', match[0], 2, logos + 'youav.png', fanart) except: - pass - + pass + elif 'youjizz' in url: content = make_request(url) add_dir('[COLOR lightgreen]youjizz.com [COLOR red]Search[/COLOR]', youjizz, 1, logos + 'youjizz.png', fanart) @@ -895,7 +926,7 @@ def vikiporn_categories(url): def xhamster_categories(url): home() content = make_request(url) - match = re.compile('href="http://xhamster.com/channels/(.+?)">(.+?)<').findall(content) + match = re.compile('([^"]+)').findall(content) for url, name in match: name = name.replace('&', '&').replace('"', '"').replace(''', 'ยด') add_dir(name, xhamster + '/channels/' + url, 2, logos + 'xhamster.png', fanart) @@ -982,11 +1013,10 @@ def xvideos_categories(url) : def xvideos_pornstars(url) : home() content = make_request(url) - #match = re.compile('Url\(\'([^"]+)

', re.DOTALL).findall(content) - for thumb, url in match: - name = url - add_dir(name, xvideos + '/profiles/' + url + '/videos/', 2, thumb, fanart) + match = re.compile('"img":"([^"]+)"}].+?class="profile-name">([^"]+)

.+?

  • .+?
  • ', re.DOTALL).findall(content) add_dir('[COLOR blue]Next Page >>>>[/COLOR]', xvideos + match[0], 32, logos + 'xvideos.png', fanart) @@ -1076,9 +1106,9 @@ def emplix_sorting(url) : def txxx_categories(url): home() content = make_request(url) - match = re.compile('.+?="([^"]*)".+?(.+?) videos', re.DOTALL).findall(content) + match = re.compile('\((.+?) videos\)', re.DOTALL).findall(content) for url, name, thumb, duration in match: - add_dir(name + ' [COLOR lime]('+ duration + ')[/COLOR]', txxx + url, 2, thumb, fanart) + add_dir(name + ' [COLOR lime]('+ duration + ')[/COLOR]', url , 2, thumb, fanart) def fantasti_collections(url): home() @@ -1136,7 +1166,6 @@ def yespornplease_categories(url): def tubegalore_categories(url): home() content = make_request(url) - #match = re.compile('([^<]+)', re.DOTALL).findall(content) match = re.compile('([^<]+)', re.DOTALL).findall(content) for url, name in match: add_dir(name, tubegalore + url, 2, logos + 'tubegalore.png', fanart) @@ -1160,7 +1189,13 @@ def fantasti_categories(url): name = url add_dir(name, fantasti + '/category/' + url + '/videos/' , 2, 'http://' + thumb + '.jpg', fanart) - +def pornktube_categories(url): + home() + content = make_request(url) + match = re.compile('
  • (.+?)
    • ', re.DOTALL).findall(content) + for url, name in match: + add_dir(name, pornktube + '/categories/' + url, 2, logos + 'pornktube.png', fanart) + def resolve_url(url): content = make_request(url) if 'xvideos' in url: @@ -1227,7 +1262,6 @@ def resolve_url(url): media_url = 'http://' + re.compile('//(.+?)]').findall(content)[-1] elif 'txxx' in url: media_url = re.compile('file\': \'(.+?)\',').findall(content)[0] - media_url = re.compile('file\': \'(.+?)\',').findall(content)[0] elif 'drtuber' in url: media_url = re.compile('