IPTV 입력 ALL 추가, 중복 데이터 출력 수정
This commit is contained in:
parent
7ce11db93c
commit
4b3250740c
12
epg2xml.py
12
epg2xml.py
@ -54,13 +54,13 @@ def getEpg():
|
|||||||
ChannelName = escape(Channeldata['Name'])
|
ChannelName = escape(Channeldata['Name'])
|
||||||
ChannelSource = Channeldata['Source']
|
ChannelSource = Channeldata['Source']
|
||||||
ChannelServiceId = Channeldata['ServiceId']
|
ChannelServiceId = Channeldata['ServiceId']
|
||||||
ChannelNumber = str(Channeldata[MyISP+'Ch']);
|
|
||||||
ChannelISPName = escape(Channeldata[MyISP+' Name'])
|
|
||||||
ChannelIconUrl = escape(Channeldata['Icon_url'])
|
ChannelIconUrl = escape(Channeldata['Icon_url'])
|
||||||
if not (Channeldata[MyISP+'Ch'] is None):
|
|
||||||
ChannelInfos.append([ChannelId, ChannelName, ChannelSource, ChannelServiceId])
|
ChannelInfos.append([ChannelId, ChannelName, ChannelSource, ChannelServiceId])
|
||||||
print(' <channel id="%s">' % (ChannelId))
|
print(' <channel id="%s">' % (ChannelId))
|
||||||
print(' <display-name>%s</display-name>' % (ChannelName))
|
print(' <display-name>%s</display-name>' % (ChannelName))
|
||||||
|
if MyISP != "ALL" and Channeldata[MyISP+'Ch'] is not None:
|
||||||
|
ChannelNumber = str(Channeldata[MyISP+'Ch']);
|
||||||
|
ChannelISPName = escape(Channeldata[MyISP+' Name'])
|
||||||
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))
|
||||||
@ -513,7 +513,7 @@ except ValueError:
|
|||||||
|
|
||||||
parser = argparse.ArgumentParser(description = 'EPG 정보를 출력하는 방법을 선택한다')
|
parser = argparse.ArgumentParser(description = 'EPG 정보를 출력하는 방법을 선택한다')
|
||||||
argu1 = parser.add_argument_group(description = 'IPTV 선택')
|
argu1 = parser.add_argument_group(description = 'IPTV 선택')
|
||||||
argu1.add_argument('-i', dest = 'MyISP', choices = ['KT', 'LG', 'SK'], help = '사용하는 IPTV : KT, LG, SK', default = MyISP)
|
argu1.add_argument('-i', dest = 'MyISP', choices = ['ALL', 'KT', 'LG', 'SK'], help = '사용하는 IPTV : ALL, KT, LG, SK', default = MyISP)
|
||||||
argu2 = parser.add_mutually_exclusive_group()
|
argu2 = parser.add_mutually_exclusive_group()
|
||||||
argu2.add_argument('-v', '--version', action = 'version', version = '%(prog)s version : ' + __version__)
|
argu2.add_argument('-v', '--version', action = 'version', version = '%(prog)s version : ' + __version__)
|
||||||
argu2.add_argument('-d', '--display', action = 'store_true', help = 'EPG 정보 화면출력')
|
argu2.add_argument('-d', '--display', action = 'store_true', help = 'EPG 정보 화면출력')
|
||||||
@ -543,8 +543,8 @@ if args.episode : default_episode = args.episode
|
|||||||
if args.verbose : default_verbose = args.verbose
|
if args.verbose : default_verbose = args.verbose
|
||||||
|
|
||||||
if MyISP:
|
if MyISP:
|
||||||
if not any(MyISP in s for s in ['KT', 'LG', 'SK']):
|
if not any(MyISP in s for s in ['ALL', 'KT', 'LG', 'SK']):
|
||||||
printError("MyISP는 KT, LG, SK만 가능합니다.")
|
printError("MyISP는 ALL, KT, LG, SK만 가능합니다.")
|
||||||
sys.exit()
|
sys.exit()
|
||||||
else :
|
else :
|
||||||
printError("epg2xml.json 파일의 MyISP항목이 없습니다.")
|
printError("epg2xml.json 파일의 MyISP항목이 없습니다.")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user