Switch to unified view

a/rdpl2stream/fetchStream.py b/rdpl2stream/fetchStream.py
...
...
7
from StreamDecoder import StreamDecoder
7
from StreamDecoder import StreamDecoder
8
8
9
class myCfg:
9
class myCfg:
10
    def __init__(self):
10
    def __init__(self):
11
        self.cf = dict()
11
        self.cf = dict()
12
        self.cf["url_timeout"] = "20"
12
        self.cf["url_timeout"] = "10"
13
14
    def getConfigValue(self, s):
13
    def getConfigValue(self, s):
15
        if s in self.cf:
14
        if s in self.cf:
16
            return self.cf[s]
15
            return self.cf[s]
17
        else:
16
        else:
18
            return None
17
            return None
19
20
    def setConfigValue(self, s, v):
18
    def setConfigValue(self, s, v):
21
        self.cf[s] = v
19
        self.cf[s] = v
22
20
23
21
24
25
logger = logging.getLogger('radiotray')
22
logger = logging.getLogger('upmpdcli')
26
logger.setLevel(logging.ERROR)
23
logger.setLevel(logging.ERROR)
27
handler = logging.StreamHandler()
24
handler = logging.StreamHandler()
28
#handler = logging.NullHandler()
25
#handler = logging.NullHandler()
29
formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
26
formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
30
handler.setFormatter(formatter)
27
handler.setFormatter(formatter)
31
logger.addHandler(handler)
28
logger.addHandler(handler)
32
29
33
30
34
35
decoder = StreamDecoder(myCfg())
31
decoder = StreamDecoder(myCfg())
36
37
32
38
urlInfo = decoder.getMediaStreamInfo(sys.argv[1])
33
urlInfo = decoder.getMediaStreamInfo(sys.argv[1])
39
34
40
while urlInfo is not None and urlInfo.isPlaylist():
35
while urlInfo is not None and urlInfo.isPlaylist():
41
    playlist = decoder.getPlaylist(urlInfo)
36
    playlist = decoder.getPlaylist(urlInfo)