iptv 설정 인수 사항 수정

This commit is contained in:
wonipapa 2017-04-19 18:46:19 +09:00 committed by GitHub
parent fc07e3d2b0
commit 42999f9dfd

View File

@ -19,7 +19,7 @@ import pprint
reload(sys) reload(sys)
sys.setdefaultencoding('utf-8') sys.setdefaultencoding('utf-8')
__version__ = '1.1.7' __version__ = '1.1.7p'
# Set variable # Set variable
debug = False debug = False
@ -56,12 +56,12 @@ def getEpg():
ChannelSource = Channeldata['Source'] ChannelSource = Channeldata['Source']
ChannelServiceId = Channeldata['ServiceId'] ChannelServiceId = Channeldata['ServiceId']
ChannelIconUrl = escape(Channeldata['Icon_url']) ChannelIconUrl = escape(Channeldata['Icon_url'])
ChannelInfos.append([ChannelId, ChannelName, ChannelSource, ChannelServiceId])
print(' <channel id="%s">' % (ChannelId))
print(' <display-name>%s</display-name>' % (ChannelName))
if MyISP != "ALL" and Channeldata[MyISP+'Ch'] is not None: if MyISP != "ALL" and Channeldata[MyISP+'Ch'] is not None:
ChannelInfos.append([ChannelId, ChannelName, ChannelSource, ChannelServiceId])
ChannelNumber = str(Channeldata[MyISP+'Ch']); ChannelNumber = str(Channeldata[MyISP+'Ch']);
ChannelISPName = escape(Channeldata[MyISP+' Name']) ChannelISPName = escape(Channeldata[MyISP+' Name'])
print(' <channel id="%s">' % (ChannelId))
print(' <display-name>%s</display-name>' % (ChannelName))
print(' <display-name>%s</display-name>' % (ChannelISPName)) print(' <display-name>%s</display-name>' % (ChannelISPName))
print(' <display-name>%s</display-name>' % (ChannelNumber)) print(' <display-name>%s</display-name>' % (ChannelNumber))
print(' <display-name>%s</display-name>' % (ChannelNumber+' '+ChannelISPName)) print(' <display-name>%s</display-name>' % (ChannelNumber+' '+ChannelISPName))
@ -70,7 +70,15 @@ def getEpg():
else : else :
print(' <icon src="%s" />' % (ChannelIconUrl)) print(' <icon src="%s" />' % (ChannelIconUrl))
print(' </channel>') print(' </channel>')
elif MyISP == "ALL":
ChannelInfos.append([ChannelId, ChannelName, ChannelSource, ChannelServiceId])
print(' <channel id="%s">' % (ChannelId))
print(' <display-name>%s</display-name>' % (ChannelName))
if IconUrl:
print(' <icon src="%s/%s.png" />' % (IconUrl, ChannelId))
else :
print(' <icon src="%s" />' % (ChannelIconUrl))
print(' </channel>')
# Print Program Information # Print Program Information
for ChannelInfo in ChannelInfos: for ChannelInfo in ChannelInfos:
ChannelId = ChannelInfo[0] ChannelId = ChannelInfo[0]