addon.py

diff --git a/addon.py b/addon.py
index 61d375e030495a19f7ec04020e5c665fe2ce3d7b..18852aa4e4c9406d420c92f6d505ce53419d8271 100644 (file)
--- a/addon.py
+++ b/addon.py
@@ -7,7 +7,6 @@
 import sys
 import os
 import re,json
-import youtube_dl
 
 def get_params():
        param = []
@@ -28,6 +27,8 @@ def get_params():
 
 
 def resolve_url(url):
+       if TEST:
+               return url
        duration=7500 #in milliseconds
        message = "Cannot Play URL"
        stream_url = urlresolver.HostedMediaFile(url=url).resolve()
@@ -40,6 +41,8 @@ def resolve_url(url):
                return stream_url
 
 def getUrl(url):
+       import urllib2
+       return urllib2.urlopen(url).read()
        import urllib.request
        req = urllib.request.Request(
          url, 
@@ -89,6 +92,8 @@ def addDir(name,url,mode,iconimage,description):
   return ok
 
 def ytUrl(id):
+       #return 'http://www.youtube.com/watch?v='+id
+       import youtube_dl
        ydl = youtube_dl.YoutubeDL({'outtmpl': '%(id)s%(ext)s', 'quiet': True})
        with ydl:
                result = ydl.extract_info(