Pēdējā strādājošā versija

ltcproxy.py

@@ -8,8 +8,8 @@ usage: %s start|stop|restart|manualstart [options]
     -s WSGI_SERVER  - wsgi server - wsgiref,cheroot,mtwsgi,waitress...
     -d              - debug printout
     -r              - remote debug mode (ptvsd)"""
-    
-__version__ = "0.1a"
+
+__version__ = "0.1b"
 
 import os, sys, time
 import urllib,urlparse, urllib2, requests
@@ -37,14 +37,15 @@ cache_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "cache")
 if not os.path.exists(cache_dir):
     os.mkdir(cache_dir)
 
+CFG_FILE = "ltcproxy.cfg" # TODO - iespēja uzdot kā parametru
 config = ConfigParser.ConfigParser()
-proxy_cfg_file = os.path.join(cur_directory, "ltcproxy.cfg")
+proxy_cfg_file = os.path.join(cur_directory, CFG_FILE)
 
 DEBUG = False
 PORT_NUMBER = 8881
 REDIRECT = False
 CACHE = True
-KEY = ["0000","1111"]
+KEY = ["0000","00000"]
 SERVER = "wsgiref"
 WORKERS = 10
 LTC_USER = "user"
@@ -96,7 +97,7 @@ def set_globals():
             s.set("token", token, expire=3600*24*1) #  pēc 1d ekspirejas
             print "** %s: token=%s" % (request.remote_addr,token)
         else:
-            print "Can not login"
+            print "Can not login %s/%s"%(LTC_USER, LTC_PASSWORD)
             raise bottle.HTTPError(500, "Can not login")
 
 # @app.route('/playstream/<url:re:.*>')
@@ -252,7 +253,6 @@ def get_archive(key, ch, ts):
     response.content_type = r2.headers["content-type"] # 'application/vnd.apple.mpegurl' #
     return content
 
-
 def live_get_stream_url(ch):
     global s, token, headers0
     if ch in s:
@@ -294,7 +294,6 @@ def epg_get_stream_url(epgid):
         s.set(epgid, stream_url0, expire=3600*24*7, read=False)
     return str(stream_url)
 
-
 def refresh_live_chunklist_url(ch):
     global s, token, headers0
     stream_url = live_get_stream_url(ch)
@@ -309,8 +308,8 @@ def refresh_live_chunklist_url(ch):
     stream_url2 = base2 + rest2 # chunlist url
     s.set("m"+ch, mediaid, expire=3600*24*7, read=False)
     s.set("c"+ch, stream_url2, expire=3600*24*7, read=False)
-    
-    
+    return stream_url2,mediaid
+
 def refresh_epg_chunklist_url(stream_url):
     global s, token, headers0
     r = requests.get(stream_url)
@@ -443,6 +442,7 @@ def get_epg(ch, start):
 # Run WSGI server
 def start(server,port):
     print "*** Starting ltcproxy ***"
+    print "LTC_USER: %s"% LTC_USER
     options = {}
     if server == "mtwsgi":
         import mtwsgi