Merge branch 'master' of http://git.blue.lv/home/content

ContentSources.py

@@ -21,6 +21,8 @@ class ContentSources(object):
     def __init__(self, plugin_path, cfg_file="streams.cfg", cfg_file2=None):
         self.plugins = {}
         self.error_content = [("..atpakaļ", "back", "back.png", "Kļūda, atgriezties atpakaļ")]
+        if not plugin_path:
+            plugin_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "sources")
         sys.path.insert(0, plugin_path)
         #for f in os.listdir(plugin_path):
         #for f in next(os.walk(plugin_path))[2]:
@@ -31,7 +33,7 @@ class ContentSources(object):
             fname = os.path.split(fname)[1]
             if fname == "__init__": continue
             if ext == '.py':
-                print "Importing %s"%fname
+                #print "Importing %s"%fname
                 mod = __import__(fname)
                 reload(mod)
                 if "Source" in dir(mod):

playstreamproxy.py

@@ -57,7 +57,7 @@ slinks = {}
 sessions = {}
 
 cfg_file = "streams.cfg"
-sources = ContentSources("sources", cfg_file)
+sources = ContentSources("", cfg_file)
 
 class StreamHandler(BaseHTTPRequestHandler):
 
@@ -404,18 +404,13 @@ def hls_base2(url):
     rest = url.replace(base, "")
     return base
 
-print streamproxy_encode3("get_content", "ltc::home", qs={"user": "ivars777", "password": "Kaskade7"})
-print streamproxy_encode3("get_content", "ltc::content/live-streams/101?include=quality", qs={"user": "ivars777", "password": "Kaskade7"})
-urlp = streamproxy_encode3("playstream",
-                          "ltc::content/live-streams/101?include=quality",
-                          #headers=headers0,
-                          qs={"user": "ivars777", "password": "Kaskade7"})
-print urlp
-print streamproxy_encode3("playstream", "replay::tiesraide/ltv1")
-print streamproxy_encode3("playstream", "tvdom::tiesraides/ltv1/")
-print streamproxy_encode3("playstream", "tvplay::asset/10311641")
-print streamproxy_encode3("playstream", "xtv::rigatv24/video/Zw4pVPqr7OX-festivals_mainam_pasauli_sakam_ar_sevi")
-print streamproxy_encode3("playstream", "iplayer::episodes/b094f49s")
+
+#print urlp
+#print streamproxy_encode3("playstream", "replay::tiesraide/ltv1")
+#print streamproxy_encode3("playstream", "tvdom::tiesraides/ltv1/")
+#print streamproxy_encode3("playstream", "tvplay::asset/10311641")
+#print streamproxy_encode3("playstream", "xtv::rigatv24/video/Zw4pVPqr7OX-festivals_mainam_pasauli_sakam_ar_sevi")
+#print streamproxy_encode3("playstream", "iplayer::episodes/b094f49s")
 #cmd, data, headers, qs = streamproxy_decode3(urlp)
 
 if __name__ == "__main__":

sources/streams.cfg

@@ -22,6 +22,7 @@ cinemalive.tv|cinemalive::home|cinemalive.png|Filmas latviski
 SerialGURU.ru|serialguru::home|http://serialguru.ru/images/xlogo_new.png.pagespeed.ic.0sre2_2OJN.png|Serialguru.ru portāla satura skatīšanās
 MoviePlace.lv|movieplace::home|movieplace.png|Movieplace.lv - filmas latviesu valodā
 Engima2|enigma2::home|enigma2.png|Get streams from engima2 sat receiver
+test|http://mfe1-iptv.baltcom.lv/dash/CH_7_50.ism/playlist.mpd||testa strīms
 
 [my_tv]
 My Tv