KoD 1.2

- aggiunto nuovo canale: guardaserie.cam
- autoplay migliorato, ora i settaggi sono globali e non più per canale
- adesso in onda riscritto, ora usa EPG (ringraziamo epg-guide.com)
- Riprendi la visione di un film o episodio da server diversi (solo videoteca)
- fix e ottimizzazioni varie

servers/vidtome.py

@@ -1,31 +1,31 @@
 # -*- coding: utf-8 -*-
 
-from core import httptools
-from core import scrapertools
+from core import httptools, scrapertools
 from platformcode import logger, config
+from lib import jsunpack
 
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
+    global data
     data = httptools.downloadpage(page_url).data
     if "Not Found" in data or "File Does not Exist" in data:
-        return False, config.get_localized_string(70292) % 'vidto.me'
+        return False, config.get_localized_string(70292) % 'Vidto.me'
     return True, ""
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("url=" + page_url)
-    data = httptools.downloadpage(page_url).data
+    global data
+    video_urls = []
     code = scrapertools.find_single_match(data, 'name="code" value="([^"]+)')
     hash = scrapertools.find_single_match(data, 'name="hash" value="([^"]+)')
     post = "op=download1&code=%s&hash=%s&imhuman=Proceed+to+video" %(code, hash)
-    data1 = httptools.downloadpage("http://m.vidtome.stream/playvideo/%s" %code, post=post).data
-    video_urls = []
-    media_urls = scrapertools.find_multiple_matches(data1, 'file: "([^"]+)')
-    for media_url in media_urls:
-        ext = scrapertools.get_filename_from_url(media_url)[-4:]
-        video_urls.append(["%s [vidto.me]" % (ext), media_url])
-    video_urls.reverse()
-    for video_url in video_urls:
-        logger.info("%s" % (video_url[0]))
+    data = httptools.downloadpage("http://vidtome.co/playvideos/%s" %code, post=post).data
+    packed = scrapertools.find_multiple_matches(data, r'(eval\s?\(function\(p,a,c,k,e,d\).*?\n)')
+    for p in packed:
+        data = jsunpack.unpack(p)
+        media_url = scrapertools.find_single_match(data, r"source:\\'([^\\']+)")
+        if media_url:
+            video_urls.append([media_url.split('.')[-1] + ' [Vidto.me]', media_url])
     return video_urls