From 4b3250740c73e78ab47e3ca508a727f3482b0b55 Mon Sep 17 00:00:00 2001
From: wonipapa <sungpyohong@gmail.com>
Date: Thu, 13 Apr 2017 12:16:00 +0900
Subject: [PATCH] =?UTF-8?q?IPTV=20=EC=9E=85=EB=A0=A5=20ALL=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80,=20=EC=A4=91=EB=B3=B5=20=EB=8D=B0=EC=9D=B4=ED=84=B0?=
 =?UTF-8?q?=20=EC=B6=9C=EB=A0=A5=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epg2xml.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/epg2xml.py b/epg2xml.py
index eae1499..658d7ea 100644
--- a/epg2xml.py
+++ b/epg2xml.py
@@ -54,21 +54,21 @@ def getEpg():
             ChannelName = escape(Channeldata['Name'])
             ChannelSource = Channeldata['Source']
             ChannelServiceId = Channeldata['ServiceId']
-            ChannelNumber = str(Channeldata[MyISP+'Ch']);
-            ChannelISPName = escape(Channeldata[MyISP+' Name'])
             ChannelIconUrl = escape(Channeldata['Icon_url'])
-            if not (Channeldata[MyISP+'Ch'] is None):
-                ChannelInfos.append([ChannelId,  ChannelName, ChannelSource, ChannelServiceId])
-                print('  <channel id="%s">' % (ChannelId))
-                print('    <display-name>%s</display-name>' % (ChannelName))
+            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:
+                ChannelNumber = str(Channeldata[MyISP+'Ch']);
+                ChannelISPName = escape(Channeldata[MyISP+' Name'])
                 print('    <display-name>%s</display-name>' % (ChannelISPName))
                 print('    <display-name>%s</display-name>' % (ChannelNumber))
                 print('    <display-name>%s</display-name>' % (ChannelNumber+' '+ChannelISPName))
-                if IconUrl:
-                    print('    <icon src="%s/%s.png" />' % (IconUrl, ChannelId))
-                else :
-                    print('    <icon src="%s" />' % (ChannelIconUrl))
-                print('  </channel>')
+            if IconUrl:
+                print('    <icon src="%s/%s.png" />' % (IconUrl, ChannelId))
+            else :
+                print('    <icon src="%s" />' % (ChannelIconUrl))
+            print('  </channel>')
 
     # Print Program Information
     for ChannelInfo in ChannelInfos:
@@ -513,7 +513,7 @@ except ValueError:
 
 parser = argparse.ArgumentParser(description = 'EPG 정보를 출력하는 방법을 선택한다')
 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.add_argument('-v', '--version', action = 'version', version = '%(prog)s version : ' + __version__)
 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 MyISP:
-    if not any(MyISP in s for s in ['KT', 'LG', 'SK']):
-        printError("MyISP는 KT, LG, SK만 가능합니다.")
+    if not any(MyISP in s for s in ['ALL', 'KT', 'LG', 'SK']):
+        printError("MyISP는 ALL, KT, LG, SK만 가능합니다.")
         sys.exit()
 else :
     printError("epg2xml.json 파일의 MyISP항목이 없습니다.")