From 1649fb7077b486781b9e92fbc84d3fa7a37aae52 Mon Sep 17 00:00:00 2001 From: Vashiel Date: Sun, 18 Dec 2016 00:47:42 +0100 Subject: [PATCH] Release 0.6.4 v 0.6.4 18-12-2016 - fixed Ashemaletube.com - added Models to Ashemaletube.com --- addons.xml | 2 +- addons.xml.md5 | 2 +- plugin.video.adulthideout/addon.xml | 2 +- plugin.video.adulthideout/changelog.txt | 4 ++ plugin.video.adulthideout/default.py | 46 ++++++++++++++---- ...hangelog-0.6.3.txt => changelog-0.6.4.txt} | 4 ++ ...ip => plugin.video.adulthideout-0.6.4.zip} | Bin 1793281 -> 1793477 bytes 7 files changed, 47 insertions(+), 13 deletions(-) rename zips/plugin.video.adulthideout/{changelog-0.6.3.txt => changelog-0.6.4.txt} (98%) rename zips/plugin.video.adulthideout/{plugin.video.adulthideout-0.6.3.zip => plugin.video.adulthideout-0.6.4.zip} (98%) diff --git a/addons.xml b/addons.xml index 6226bcd..243db16 100644 --- a/addons.xml +++ b/addons.xml @@ -1,6 +1,6 @@ - + - + .+?.+?src="([^"]*)" alt="([^"]*)".+?([:\d]+)', re.DOTALL).findall(content) - for url, thumb, name, dummy, duration in match: - name = name.replace('&', '&') - 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('
.+?.+?src="([^"]*)" alt="([^"]*)".+?', re.DOTALL).findall(content) + for url, thumb, name, dummy in match: + name = name.replace('&', '&') + 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('
.+?.+?src="([^"]*)" alt="([^"]*)".+?([:\d]+)', re.DOTALL).findall(content) + for url, thumb, name, dummy, duration in match: + name = name.replace('&', '&') + 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('').findall(content) add_dir('[COLOR blue]Next Page >>>>[/COLOR]', ashemaletube + match[0], 2, logos + 'ashemaletube.png', fanart) except: - pass + match = re.compile('Next').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) @@ -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) @@ -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('
.+?FaHqdpx%ni4h(0Vj#uXrVapJH`jrfT=nJk(J_mh^^{TLYW?gVv#1t}B1Uk57 z@P~Cha#9a<qf{}ag*DkISQN!SAIFhTt=6BqMalJl`gVZ@O`#uLJ=xu zsXKorT(lMizbpbLU5RiYng{0^u6+M|(s=#YiV*=Vul07M15x?nc5tFh@>>&han+f5 zo5su!gWcgIQU2no%JPU*rHsPRoS@#-ViXAx#8oASE8$X2iDJtz=3d!M&Og~>03i5m zyl+4OQa+1EE+1_bA!Q&^n}5wKvB@S9LuU)^Gys zkKs>{-SJ~epza5tc_whcPl>}-j@MB`LJzUXt~_dy0Wb^&4(46}24>^d^J4?n+-g-^ zIye%3VkIjnMm9l#`1um5nSVw}Is*iD4M0Qxt0p!xG~au(Q81_qsEpe0mvBk9{&zOg84q ze^=oI+Y6OS;*Njg(GL;lFmUQ07V42V4NFn5!e$B-nhlN_lHvd-m>-K~L8~9v$_;-_ z<7eq8AV$%-)oA&##53CvON*E*)`;nud0n~c%FN8!kC7qXqZ9eUB#jn7lZ4N5Y0!$5 z&m!*+E0jyc$N;XM|1+S$B1N#X;hH96i41sAQ5og76ksnya2A=5k>#71x1{7 z8nOfw%DAFlyOJ?Ix2i(~ZwVzzM`xICG^?@+_C>ZeYvhlP2sV>E${P^1??!IJtVP8B z@Q&zBw<1hCGazT0$98WBT;{Uvqd!U$klCJ=_k_?*0JKxZgQu5YW|EpWMqk9;?m>$8 zB2^BFJgw;0zk%O2-y&eNHwn#peQ5ccFf;(?*QHq56Rl~f0_B$Sw`H0ENNuQ{e)} zN5y&#<~>nX$b3eEP|N123Sh#Z%+Sk?Of|b*aO0RII`=!IL6;XEt#|0OV?GBOl44gm z<78zI7SwG-{RCWklkwF%gb^Gy1tW!>5p_ot^~EiI3p*8Zoy+b4e%*{=Jc**vg~LA$ z=?K(rku=Wx+FA&CK7*#|-tTc^Oh16&!Zlm^4pgfkB9y;YrqX|>8oAYMq5~-uYo}oS zduK*XaRgPMWgwP+k?urZ73_-B|8o5MOLPWicMGEFmyF!a0!9vJUO~RR z7jElZlbG!Fl`kQIm2KcoRSSOhqG`A`ayWxtcaDxiGRydHh z(VZO=7h}k`aNz>ha?-$xxlp|BGvHKGlOG{+8jsZd9Gt&5k^Etag>TRE@9AY+8+xUJ zYIF|mj!xp$R69$Dz_)MLmTaqCZb*@vkIrHg{)*+VNSWd4U=#&I0;~7f(4Z6i>hqks znB&o!%E`IhL|V+BF)vD|1pEqM>KuB7aIChR>69xWc>blZ<4?IgKlR;x_cfEXs-jgS zGP=~yb4#tOEya&h$8Vf+RfTp>Gb*OF?}AQg26A=bcoyc}vHTR!nIT5=-w=kT#U_RazuP*#YO$* zhaiI9_uL6|aNZ8R^Ck=JL`iP{X{7NPiUkBl=q2t?a(1F+)&a!wJlO(RPGZ5O--qFe z`+K-s#lzte1b;9)V}4Ht?xa2_VPFKlMBG}r;qh~M`rus}$5*LBZZ>N;5;%XhxM1@i zx+A9UI;nt-+kY_g@*s_YEYRo|uRFnfh^C$Tr{JLS=JDL15OzI}bW#i-QTX+rxb8%0 zZ`>ajB6cyA7?q$6+>*hshxGM}$;rJV1O@Atxr&R+vYtzGrKWU%t1NASj>~laQjba$ z%^Q9&@T%KSexuHb-Q}$__HFgonhgt;Kp(dEuF6)Y43Y?-9zPUAIDWMK^Y0{pj56i9z@N>K8x^(*^^ftB>BCmeGfT>(z8g^huASbEJTsCJOH-9jHF#Q& zq{1H=4jYA+Mlh;%3rPj$=xrx-aIX+rNFeoV&6Z3>SP4eR3ZoX~z^~#S{rVfF&f+DZ z$F`{TQ1(6Iie|9NMt-Mm_)Ov-S7@w!Yzz34*q9dO)uk0jU_$2;d|SG;fRe;-DP>J= zrF`4+l5i*nYBFQVLEg?LJTM+T5V)^$9!ftNIejT4ws@>epmP}JGChYm6pU)ES-c#g z-nXPo3pXD`l9TmZW6Ih|611ihC|4S)X)%Z9VEVr4TrdNe` zbq;m)Yv$t3R#Flj*|KCz|g6|BumFyr~| zZ@vzJ2ser^ElCFQrox#;*qCO6ylJy=UZ@RG;tFxjU71D63qvW>u8!h@L~r;ev-A|o zlT1u};K3!^F{WzpF!-I%(ca0X2th=)`y!JN2dD&j&)eQ@u{YDu$=&y*`&EnxG-u)n|RgE(~o#|MNJxLz= z4Pc605CyP3^w-J=r*Y=c@yttflV=}yy2d`1i9etoE5obKo5v)wvY=tz?U$XGmTQCI8IPpu z#RtI3_lLeJ;lkQ)EqHXF|4%6#`2W_z!=Vm}$vOou`><@et{cTHz*6Vg2PQf~{wx}N z_Cp;pVD)4Y$F7QJAQ17_5^<_V&8pR4t;0wh`g^#_X@Nl@eH5<{XxOrIp!!=5Ki=u4 zbh5F(b!eHCInWi2f9r7?lU{9ryZV^ zo*U90!3tYP3q6{D-V)h^Z2aYt)Qm4t?B+>)d4Pq&W+TwQCU}5*X>-X?nn5OW-TV;b z!dJnRgfl_l+km>jl|0(gD;tMbciFhrmN2w5gpJXLQqHFf<5mC^8Tn z>N0;dqy-4Qds>I~Hk39<88ui$(NjNXE1-V8fBJgz+IQhP%55T)kC(SxC{af>$+)|d zJ!~2wfDCe&`+D!8?<_cwi7F2f&UtK`Vt6D>sor=}S|h^Y?!fbn^#ez#ZAmiO=_FSj z4({O>2GH5?Z#0XjV#MfBl74l!T-~rvW#fYI-$!ZJxExmbTYv}YNnX5xiDM#}pARA% zTaNwPk59tSL(1?AGkz|{Vm*CETfG#jvZj`>OU7UJ1}`^+0`GxG#UX1N)sU6)+?n1& z^qDGKvD={XL>#rz)RA=nPWtD}>KN&al}Dh`6!89?Cv_ZIDdbL#;5g_h=Jn*pqwyhz zD19vE3AM}MfWlD|!!N_PC}3%*(Lq3XYI8wUN`ZYP#z$1gx|x_ z&3VjehvO^08I~ABl^STXPrv8wuonI{c(ti_EwD@G?+GH6xZ`Qh!>-0MYhYmGYW~3` z0%VqWVSJQ2^6*>7yy>@mA;k;^nI{Xb^PRnV!ykf0u$Z!vloHIoDBx zWDXJDW%TgzI7y=w*=rwXEoHUTeGN|FfL||rweh^W(`1v!Oo$j9(DnW)58 zZ=O2>7%a$M_oQA>#Apm9upT(HylG;8J&!|qf3&L-ME6_$h+=qy)u9xsCs#Nu0Dh2o zCGYVJ?r6;K5Hn#784ehRpTI6-AkC5^*oaZ1s8^{xo9g|Yq#qNFpZrmYc8S}+4Y1P6 zr&_su^oiV}U9aTPA&RA}*||f)E6%(p!~e&J=0!g?*CBD2pB;c%q>^&_$>GAz^SzG| zj2}77HPpp_ZMMib-R+wX8CkU1DzF|Yb};x4BSH46d;+WdDM6c8G&+yDR*AJMc%uup z4f`c%48hawD4*maIlH%uSWip!L$>IRq!F^*xdcWqxV6R*D#3~5YA#liGoN@NTE@xb z`&t$)C0mDp%}(=o^)gFOpVnKsntGiv5gwMUZ?|{W@(nP(stX>*#b$^57(g+mnH}== zYI~ZEpHabDU4&H%jVmy-%i;@l=#_535Hu(q$vP!eMF^pzu5z}KRwkMDn7ghbb;NY^ z!SV%W2h@1QcJA!m3W*^$VXkUWGx6;JD<)x^xbg*%{SMPuWzBDooc~fJ&^6C98ql9R z_dv`*&b-5%gs;dlDa}@P4D|Ol{(yd_4^%%q8a|3ovGds}dTTtmBhxLdLy4)JGK;Ez zrwvU)-hIsx{P;F=Pip2sFE$h1EoUU<@wHW2Sb{Q{=(6W_VHfU}NM50Ljd}2UaHNv` zSaEQqoZmz-k!s|xK3N`Zew$F#t)S-JA#G(=tthV!c&MvQYflBx7?@J=ON`hkEs`+k z`iXujvRCw9VnzR`ECNcyPc&f&fGXVo z)Bg!Nl>$gXD;NeW7Ab?cqyYr~pEgjCu{1zJv_+P*uSj_oT(7u?09R-heCf(b`W1E- zTtNmLf)MQgr|$@i?5iK?e?CNCn87C43*!Ax8xj`uFh%>tS2ijc053$Gz?V+}ij)D! zL$bL*fb@f40iY)tfEq+@El5EY;0!4~@_$@n(249OW=Y355V6*92gIT;&1Wkjn`$|M{zlFbJS+d4N0w@EXMU3*ZIm8wmS9hiE}- zzrH5d>H9y57^K$^3lCCP__8pd;r<&tq5#l_Y&(MgPjwu_BZ5>FzXCd65dO2eUl9;N zk}3d1kb)`z7IdWemHCMs@xOyF9EeE&t;kgA%g3Yn4*HveL=GBJ0;ob9+JK0Z0Ui+R zGyn5V3F=b@s6b9|P>`M&|3DgX`0;Gq9i{Hg#I2qh8_sv3X<)Tj#3 zgy3`fAK?k$^RIXRueI5O4hy2y z__AE&F#e0m()ddG%>wg3g{ukBgp6+fUlrSeiTK}nHE9C4A@HR@_F4c^5Ro+2|K0#L zEdVz-Hpouv>ta7!V*fV>%I~i=;X?iRPvJrTKn11!{z}Ph{l6BX_SZ6NadG|&2+{sZ iImL|opZccrrE(f@L4J+6G@u9_04sEnB;e~2`@aB3_`|jU