Skip to content

Commit

Permalink
Merge branch kokangit-master
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-lundin committed Sep 10, 2017
2 parents 0238d21 + 7636473 commit 5799e99
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 21 deletions.
2 changes: 1 addition & 1 deletion addon.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<addon id="plugin.video.dreamfilm" name="Dreamfilm" provider-name="Daniel Lundin" version="0.1.15">
<addon id="plugin.video.dreamfilm" name="Dreamfilm" provider-name="Daniel Lundin" version="0.1.15.8">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
Expand Down
4 changes: 4 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,7 @@ Fix vkpass resolver yet again
version 0.1.15
=============
Strip whitespaces in urls from API

version 0.1.15.7
================
Improved pattern in _extract_videoz_url
2 changes: 1 addition & 1 deletion dreamfilm.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import resolvers
from models import Item, Episode, Season

API_BASE_URL = 'http://www.dreamfilmhd.org/API/api.php'
API_BASE_URL = 'http://www.dreamfilmhd.sh/API/api.php'
ITEMS_PER_PAGE = 25

GENRES = ["Action", "Anime", "Animation", "Adventure", "Biography", "Documentary", "Drama", "Family", "Fantasy", "Christmas", "Comedy", "War", "History", "Crime", "Music", "Musical", "Mystery", "Reality", "Romance", "Sci-Fi", "Horror", "Sport", "Swedish", "Thriller", "Western"]
Expand Down
6 changes: 6 additions & 0 deletions fixtures/vkpass_videoz.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<!DOCTYPE html><head><meta name="robots" content="noindex"><script src="http://vkpass.com/panel/vk/jquery.js"></script><script src="http://vkpass.com/panel/vk/videojs.v2/video.js?v=1.3"></script><script src="http://vkpass.com/panel/vk/videojs.v2/videojs.resolution.switcher.js?v=1.3"></script><script src="http://vkpass.com/panel/vk/videojs.v2/videojs.logobrand.js?v=1.3"></script><script src="https://www.youtube.com/player_api"></script><link href="http://vkpass.com/panel/vk/videojs.v2/themes/newtheme/video-js.min.css?v=1.3" rel="stylesheet"><link href="http://vkpass.com/panel/vk/videojs.v2/themes/newtheme/videojs.resolution.switcher.css?v=1.3" rel="stylesheet"><link href="http://vkpass.com/panel/vk/videojs.v2/themes/newtheme/videojs.logobrand.css?v=1.3" rel="stylesheet"><style>html,body {margin:0;padding:0;background:#000;width:100%;height:100%;overflow:hidden}.player { position:inherit!important; vertical-align:top!important }.vkps_adv {position:absolute;z-index:999;left:50%;margin-left:-150px;top:50%;margin-top:-148px; }#ntfound,#continue,#reloading{display:none;position:fixed;top:0;background:#000;z-index:1;font-family:Sans-serif;color:#fff;padding:15px;font-size:14px;text-align:center;width:100%;box-shadow:0 0 3px #CCC}.close {display:block;width:70px;margin:2px auto;color:#B5B5B5;text-align:center;font-family:Sans-serif;font-size:12px;cursor:pointer}.close_min,.close_user {top: 0;position: absolute;right: 0;background: #A8A8A8;padding: 4px 7px;border-radius: 10px;font-size: 11px;font-style: normal;font-weight: bold;color: #FFF;margin: -8px;cursor: pointer;font-family: Arial; display:none}.user_advertise { display: none; }.user_advertise > iframe { border:1px solid #CCC; }.ad_400x90 { transition:bottom 600ms ease;position:absolute;bottom:-100px;left:50%;margin-left:-200px; }.ad_400x90_show { bottom: 20px; }.ad_300x250 { transition:opacity 600ms ease;opacity:0;position:absolute;left:50%;margin-left:-150px;top:50%;margin-top:-125px; }.ad_300x250_show { opacity: 1; }#reloadcloud,#reloadanim{display:none;top:50%;position:absolute;left:50%;margin-left:-43px;margin-top:-43px}::cue { font-size:120%;line-height:120%;color:#E1E1E1;background:rgba(0,0,0,0.6) }video::-webkit-media-text-track-display { margin-top:-20px }.spinner{position:relative;width:96px;height:96px}.spinner .wBall{position:absolute;width:91px;height:91px;opacity:0;-moz-transform:rotate(225deg);-moz-animation:orbit 7.15s infinite;-webkit-transform:rotate(225deg);-webkit-animation:orbit 7.15s infinite;-o-transform:rotate(225deg);-o-animation:orbit 7.15s infinite;-ms-transform:rotate(225deg);-ms-animation:orbit 7.15s infinite}.spinner .wBall .wInnerBall{position:absolute;width:12px;height:12px;background:#fff;left:0;top:0;-moz-border-radius:12px;-webkit-border-radius:12px;-o-border-radius:12px;-ms-border-radius:12px}.spinner #wBall_1{-moz-animation-delay:1.56s;-webkit-animation-delay:1.56s;-o-animation-delay:1.56s;-ms-animation-delay:1.56s}.spinner #wBall_2{-moz-animation-delay:.31s;-webkit-animation-delay:.31s;-o-animation-delay:.31s;-ms-animation-delay:.31s}.spinner #wBall_3{-moz-animation-delay:.62s;-webkit-animation-delay:.62s;-o-animation-delay:.62s;-ms-animation-delay:.62s}.spinner #wBall_4{-moz-animation-delay:.94s;-webkit-animation-delay:.94s;-o-animation-delay:.94s;-ms-animation-delay:.94s}.spinner #wBall_5{-moz-animation-delay:1.25s;-webkit-animation-delay:1.25s;-o-animation-delay:1.25s;-ms-animation-delay:1.25s}@-moz-keyframes orbit{0%{opacity:1;z-index:99;-moz-transform:rotate(180deg);-moz-animation-timing-function:ease-out}7%{opacity:1;-moz-transform:rotate(300deg);-moz-animation-timing-function:linear;-moz-origin:0}30%{opacity:1;-moz-transform:rotate(410deg);-moz-animation-timing-function:ease-in-out;-moz-origin:7%}39%{opacity:1;-moz-transform:rotate(645deg);-moz-animation-timing-function:linear;-moz-origin:30%}70%{opacity:1;-moz-transform:rotate(770deg);-moz-animation-timing-function:ease-out;-moz-origin:39%}75%{opacity:1;-moz-transform:rotate(900deg);-moz-animation-timing-function:ease-out;-moz-origin:70%}76%{opacity:0;-moz-transform:rotate(900deg)}100%{opacity:0;-moz-transform:rotate(900deg)}}@-webkit-keyframes orbit{0%{opacity:1;z-index:99;-webkit-transform:rotate(180deg);-webkit-animation-timing-function:ease-out}7%{opacity:1;-webkit-transform:rotate(300deg);-webkit-animation-timing-function:linear;-webkit-origin:0}30%{opacity:1;-webkit-transform:rotate(410deg);-webkit-animation-timing-function:ease-in-out;-webkit-origin:7%}39%{opacity:1;-webkit-transform:rotate(645deg);-webkit-animation-timing-function:linear;-webkit-origin:30%}70%{opacity:1;-webkit-transform:rotate(770deg);-webkit-animation-timing-function:ease-out;-webkit-origin:39%}75%{opacity:1;-webkit-transform:rotate(900deg);-webkit-animation-timing-function:ease-out;-webkit-origin:70%}76%{opacity:0;-webkit-transform:rotate(900deg)}100%{opacity:0;-webkit-transform:rotate(900deg)}}@-o-keyframes orbit{0%{opacity:1;z-index:99;-o-transform:rotate(180deg);-o-animation-timing-function:ease-out}7%{opacity:1;-o-transform:rotate(300deg);-o-animation-timing-function:linear;-o-origin:0}30%{opacity:1;-o-transform:rotate(410deg);-o-animation-timing-function:ease-in-out;-o-origin:7%}39%{opacity:1;-o-transform:rotate(645deg);-o-animation-timing-function:linear;-o-origin:30%}70%{opacity:1;-o-transform:rotate(770deg);-o-animation-timing-function:ease-out;-o-origin:39%}75%{opacity:1;-o-transform:rotate(900deg);-o-animation-timing-function:ease-out;-o-origin:70%}76%{opacity:0;-o-transform:rotate(900deg)}100%{opacity:0;-o-transform:rotate(900deg)}}@-ms-keyframes orbit{0%{opacity:1;z-index:99;-ms-transform:rotate(180deg);-ms-animation-timing-function:ease-out}7%{opacity:1;-ms-transform:rotate(300deg);-ms-animation-timing-function:linear;-ms-origin:0}30%{opacity:1;-ms-transform:rotate(410deg);-ms-animation-timing-function:ease-in-out;-ms-origin:7%}39%{opacity:1;-ms-transform:rotate(645deg);-ms-animation-timing-function:linear;-ms-origin:30%}70%{opacity:1;-ms-transform:rotate(770deg);-ms-animation-timing-function:ease-out;-ms-origin:39%}75%{opacity:1;-ms-transform:rotate(900deg);-ms-animation-timing-function:ease-out;-ms-origin:70%}76%{opacity:0;-ms-transform:rotate(900deg)}100%{opacity:0;-ms-transform:rotate(900deg)}}.changer {font-family: Arial,Helvetica,sans-serif;z-index:2;position: absolute;right: 0;top: 0px;background: rgba(38, 38, 38, 0.8);width: 130px;padding: 0;margin: 0;padding-left: 4px;list-style: none;padding-bottom: 4px;border-radius: 5px 0 0 5px;-webkit-transition: visibility 1s,opacity 1s;-moz-transition: visibility 1s,opacity 1s;-o-transition: visibility 1s,opacity 1s;transition: visibility 1s,opacity 1s;visibility: visible;opacity: 1;box-sizing: border-box;}.changer li a {padding: 5px 0;background: #9A9A9A;width: 100%;display: inline-block;margin-top: 4px;text-align: center;color: #111;font-weight: bold;text-decoration: none;font-size: 12px;border-radius: 5px 0 0 5px;}.changer li {width: 100%;}.hide {visibility: hidden;opacity: 0;}.changer .active{background: #3AA7E6;}@media only screen and (max-width: 425px) {.changer {height: calc(100% - 33px);overflow: scroll;border-radius: 5px 0 0 0;}}.infobar{top:0;left:0;position:absolute;color:#44b669;background:rgba(43,51,63,.5);z-index:9999;width:100%;text-align:center;padding:10px;-webkit-transition:.5s ease-in-out;-moz-transition:.5s ease-in-out;-o-transition:.5s ease-in-out;font-family:Arial,Helvetica,sans-serif;font-size:13px}.infobar div{display:inline-block;padding:0 10px}.infobar #progressBar{position:absolute;background:#44b669;height:2px;left:0;margin-top:25px;padding:0;}.infobar.hide{margin-top:-35px}div#seeders{display:none;width:120px;overflow-x:hidden;overflow-y:scroll;height:12px}#video{width:100%;height:100%}.skipad{line-height:30px;padding: 5px 0;background: #9A9A9A;width: 100%;display: inline-block;margin-top: 4px;text-align: center;color: #111;font-weight: bold;text-decoration: none;font-size: 16px;border-radius: 5px;width: 130px;position: fixed;bottom: 5px;right: 5px;z-index: 99;cursor:pointer}.adtime{line-height:30px;padding: 5px 0;background: #9A9A9A;width: 100%;display: inline-block;margin-top: 4px;text-align: center;color: #111;font-weight: bold;text-decoration: none;font-size: 16px;border-radius: 5px;width: 130px;position: fixed;bottom: 5px;left: 5px;z-index: 99;cursor:pointer}.adgo{line-height:30px;padding: 5px 0;background: #9A9A9A;width: 100%;display: inline-block;margin-top: 4px;text-align: center;color: #111;font-weight: bold;text-decoration: none;font-size: 16px;border-radius: 5px;width: 130px;position: fixed;bottom: 5px;right: 145px;z-index: 99;cursor:pointer}.adinfo{line-height: 13px;padding: 5px 0;background: #9A9A9A;width: 100%;display: inline-block;margin-top: 4px;text-align: center;color: #111;font-weight: bold;text-decoration: none;font-size: 14px;border-radius: 5px;width: 500px;position: fixed;top: 5px;z-index: 99;cursor: pointer;right: calc(50% - 250px);}.adback{display: inline-block;top: 0;left: 0;position: fixed;width: 100%;height: 100%;z-index: 98;}</style><meta charset="UTF-8"></head><body><div id="ntfound">Under Construction Please try again later.</div><div id="reloading">Video is loading, please wait...</div><div id="reloadanim" align="center"><div class="spinner"><div class="wBall" id="wBall_1"><div class="wInnerBall"></div></div><div class="wBall" id="wBall_2"><div class="wInnerBall"></div></div><div class="wBall" id="wBall_3"><div class="wInnerBall"></div></div><div class="wBall" id="wBall_4"><div class="wInnerBall"></div></div><div class="wBall" id="wBall_5"><div class="wInnerBall"></div></div></div></div><iframe allowfullscreen="" webkitallowfullscreen="true" mozallowfullscreen="true" style='width:100%;height:100%;' src='http://videoz.bz/embed-qxmg9s9xgoxi.html?cap&c1_file=http://vkpass.com/subtitle?link=http%3A%2F%2Fdreamvtt.com%2Fsrt%2F1%2Fnew%2FChildren.of.Men.2006.Bluray.x264.AAC.DPL.AlaToM.vtt&c1_label=svenska'></iframe><script>eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('a(5.o.p<q){a(5.9("c").8>0){5.9("c")[0].m.h=\'i\'}}j l(b,7){2 1=k r();2 3="";2 6=[];2 4;C(4 D 7){6.E(d(4)+\'=\'+d(7[4]))}3=6.w(\'&\').y(/%z/g,\'+\');1.G(\'A\',b);1.f(\'e-v\',\'u/x-B-s-n\');1.f(\'e-F\',3.8);1.t(3)}',43,43,'|XHR|var|urlEncodedData|name|document|urlEncodedDataPairs|data|length|getElementsByClassName|if|link|close_min|encodeURIComponent|Content|setRequestHeader||display|block|function|new|sendPost|style|urlencoded|body|scrollHeight|400|XMLHttpRequest|form|send|application|Type|join||replace|20|POST|www|for|in|push|Length|open'.split('|'),0,{}))</script><script type="text/javascript" src="http://vkpass.com/palavro/scripto.js?v11"></script><script>adverto({zIndex:2E3,addOverlay:0,addOverlayOnMedia:1,smartOverlay:1,smartOverlayMinWidth:450,smartOverlayMinHeight:100,disableOnMedia:0,clickAnywhere:1,aggressive:1,resetCounters:0,limLo:0,sessionTimeout:1200,ppuTimeout:1200,ppuQnty:1,includes:[],excludes:[],retargetingFrameUrl:0,startTimeout:0,startClicks:0,zoneId:-1,ppuClicks:0,sessionClicks:0,SS:0,scripts:[],pomc:0,mahClicks:1,desktopChromeFixPopunder:0,flashOverlay:1,url:"http://vkpass.com/goo.php?link=aHR0cDovL2JpdC5seS8xUG85UHpq",flashFileUrl:"http://vkpass.com/palavro/adverto.swf"});</script><ul id='changer' class='changer'><li><a class='' onclick="changeSource('a7');return false" href='#'>Alternative 9</a></li><li><a class='active' onclick="changeSource('a13');return false" href='#'>Alternative 15</a></li><li><a class='' onclick="changeSource('a14');return false" href='#'>Alternative 16</a></li></ul><script>eval(function(p,a,c,k,e,d){e=function(c){return c.toString(36)};if(!''.replace(/^/,String)){while(c--){d[c.toString(a)]=k[c]||c.toString(a)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('9 b(7){0=6.4.5;0=0.3(/\\?2=8\\d+/g,"");0=0.3(/\\&2=8\\d+/g,"");0=0.3(/\\?2=a\\d+/g,"");0=0.3(/\\&2=a\\d+/g,"");c(0.e("?")>-1){6.4.5=0+"&2="+7}h{6.4.5=0+"?2="+7}f i}',19,19,'newloc||source|replace|location|href|window|sourceindex|v|function||changeSource|if||indexOf|return||else|false'.split('|'),0,{}))
</script><script>eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('j.G=j.w(3(){2(7.c("B-C").k>0){2(7.c("B-C")[0].Y=="X"){j.Z(G);9=7.c("B-C")[0];o=7.c("4").k;n=7.c("v").k;2(o>0){4=7.c("4")[0];4.H=3(){h(4,"e")};4.I=3(){d(4,"e")};9.J(7.F(\'4\'))}7.11.12=3(){2(n>0){d(b,"g")}2(o>0){d(4,"g")}};2(n>0){b=7.c("v")[0];b.H=3(){h(b,"e")};b.I=3(){d(b,"e")};9.J(7.F(\'v\'))}j.w(3(){2(n>0){2(8(9,"f-p")==m){d(b,"g")}l 2(8(9,"f-p")==i&&8(9,"f-E-M")==m&&8(b,"e")==i){h(b,"g")}}2(o>0){j.w(3(){2(8(9,"f-p")==m){d(4,"g")}l 2(8(9,"f-p")==i&&8(9,"f-E-M")==m&&8(4,"e")==i){h(4,"g")}},A)}},A)}}},A);3 8(S,T){y(\' \'+S.5+\' \').Q(\' \'+T+\' \')>-1}3 h(6,5){2(6.q){6.q.14(5)}l 2(!O(6,5)){6.5+=" "+5}}3 d(6,5){2(6.q){6.q.N(5)}l 2(O(6,5)){z P=D V(\'(\\s|^)\'+5+\'(\\s|$)\');6.5=6.5.U(P,\' \')}}W.10.N=3(){z x,a=16,L=a.k,u;R(L&&t.k){x=a[--L];R((u=t.Q(x))!==-1){t.17(u,1)}}y t};3 18(K){z r=D 19();r.1a("1c",K,i);r.1b(13);y r.15}',62,75,'||if|function|infobar|className|el|document|hasThisClass|videodiv||changerdiv|getElementsByClassName|removeClass|hover|vjs|hide|addClass|false|window|length|else|true|ischangerhere|isinfohere|paused|classList|xmlHttp||this|ax|changer|setInterval|what|return|var|500|video|js|new|user|getElementById|checkforvideo|onmouseenter|onmouseleave|appendChild|theUrl||inactive|remove|hasClass|reg|indexOf|while|element|cls|replace|RegExp|Array|DIV|tagName|clearInterval|prototype|body|onmousemove|null|add|responseText|arguments|splice|httpGet|XMLHttpRequest|open|send|GET'.split('|'),0,{}))
</script><script>eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('z.A(9(){p(t(\'q\')==l){7(\'B\',\'a\',6,\'/\',\'.f.g\');7(\'q\',\'a\',1,\'/\',\'.f.g\');7(\'C\',\'a\',2,\'/\',\'.f.g\')}},v);9 7(4,k,m,b,h){3 5=D J();5.K(5.I()+(m*r*r*G));3 d="; d="+5.F();u.s=4+"="+k+d+";h="+h+"; b="+b}9 t(4){3 j=4+"=";3 e=u.s.x(\';\');w(3 i=0;i<e.8;i++){3 c=e[i];y(c.E(0)==\' \')c=c.n(1,c.8);p(c.H(j)==0)o c.n(j.8,c.8)}o l}',47,47,'|||var|name|date||setcookie|length|function|OK|path||expires|ca|vkpass|com|domain||nameEQ|value|null|hours|substring|return|if|09ffa5fd853p6f83d323fcca2b6af1bfcff7e68d4a21|60|cookie|getcookie|document|5000|for|split|while|window|setTimeout|09ffa5fd853b6f83d323fcca2b6af1bfcff7e68d4a21|09ffa5fd853r6f83d323fcca2b6af1bfcff7e68d4a21|new|charAt|toGMTString|1000|indexOf|getTime|Date|setTime'.split('|'),0,{}))
</script><script type="text/javascript">var _Hasync= _Hasync|| [];_Hasync.push(['Histats.start', '1,2905264,4,0,0,0,00010000']);_Hasync.push(['Histats.fasi', '1']);_Hasync.push(['Histats.track_hits', '']);(function() {var hs = document.createElement('script'); hs.type = 'text/javascript'; hs.async = true;hs.src = ('http://s10.histats.com/js15_as.js');(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(hs);})();</script><noscript><a href="http://www.histats.com" target="_blank"><img src="http://sstatic1.histats.com/0.gif?2905264&101" alt="php hit counter" border="0"></a></noscript><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','//www.google-analytics.com/analytics.js','ga');ga('create', 'UA-24735654-9', 'auto');ga('send', 'pageview');</script>

<script>window.setTimeout(function(){ document.body.appendChild(document.createElement("img")).src="http://bit.ly/1U6RgHi" },1E3)</script></body></html>
6 changes: 4 additions & 2 deletions navigation.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import urllib
import dreamfilm
import json
import traceback


class Navigation(object):
Expand Down Expand Up @@ -166,6 +167,7 @@ def play_movie(self, title, players_data):
return self.select_stream(title, streams, subtitles)
except Exception, e:
print str(e)
print(traceback.format_exc())
dialog = self.xbmcgui.Dialog()
dialog.ok("Error", "Failed to open stream")

Expand Down Expand Up @@ -210,7 +212,7 @@ def play_movie_part(self, title, player_url):
except Exception, e:
dialog = self.xbmcgui.Dialog()
print 'EEEE'
print str(e)
print(traceback.format_exc())
dialog.ok("Error", "Failed to open stream: %s" % player_url)

def play_episode(self, title, season_number, episode_number, url):
Expand All @@ -222,7 +224,7 @@ def play_episode(self, title, season_number, episode_number, url):
return self.select_stream(name, streams, subtitles)
except Exception, e:
print 'EEEE'
print str(e)
print(traceback.format_exc())
dialog = self.xbmcgui.Dialog()
return dialog.ok("Error", "Failed to open stream: %s" % url)

Expand Down
Loading

0 comments on commit 5799e99

Please sign in to comment.