From 48d189b1eda3d3cb9d63610985dd0538b0438053 Mon Sep 17 00:00:00 2001 From: wonipapa Date: Mon, 11 Sep 2017 18:03:23 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=90=ED=94=BC=EC=86=8C=EB=93=9C=20xmlns=20?= =?UTF-8?q?=ED=95=AD=EB=AA=A9=20=EC=98=B5=EC=85=98=20=ED=95=AD=EB=AA=A9?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epg2xml.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/epg2xml.py b/epg2xml.py index d53ac99..bc1ebb6 100644 --- a/epg2xml.py +++ b/epg2xml.py @@ -38,7 +38,7 @@ except ImportError: reload(sys) sys.setdefaultencoding('utf-8') -__version__ = '1.2.2p2' +__version__ = '1.2.3' if not sys.version_info[:2] == (2, 7): print("Error : ", "python 2.7 버전이 필요합니다.", file=sys.stderr) @@ -981,7 +981,7 @@ def writeProgram(programdata): print(' ') if category: print(' %s' % (category)) if contentType: print(' %s' % (contentType)) - if episode: print(' %s' % (episode_ns)) + if episode and addxmltvns == 'y' : print(' %s' % (episode_ns)) if episode: print(' %s' % (episode_on)) if rebroadcast: print(' ') if rating: @@ -1027,6 +1027,7 @@ try: default_rebroadcast = Settings['default_rebroadcast'] if 'default_rebroadcast' in Settings else '' default_episode = Settings['default_episode'] if 'default_episode' in Settings else '' default_verbose = Settings['default_verbose'] if 'default_verbose' in Settings else '' + default_xmltvns = Settings['default_xmltvns'] if 'default_xmltvns' in Settings else '' except EnvironmentError: printError("epg2xml." + JSON_FILE_ERROR) sys.exit() @@ -1048,6 +1049,7 @@ argu3.add_argument('-l', '--limit', dest = 'limit', type=int, metavar = "1-7", c argu3.add_argument('--rebroadcast', dest = 'rebroadcast', metavar = 'y, n', choices = 'yn', help = '제목에 재방송 정보 출력', default = default_rebroadcast) argu3.add_argument('--episode', dest = 'episode', metavar = 'y, n', choices = 'yn', help = '제목에 회차 정보 출력', default = default_episode) argu3.add_argument('--verbose', dest = 'verbose', metavar = 'y, n', choices = 'yn', help = 'EPG 정보 추가 출력', default = default_verbose) +argu3.add_argument('--xmltvns', dest = 'xmltvns', metavar = 'y, n', choices = 'yn', help = '회차정보 xmltv_ns 출력', default = default_xmltvns) args = parser.parse_args() if args.MyISP : MyISP = args.MyISP @@ -1064,6 +1066,7 @@ if args.limit : default_fetch_limit = args.limit if args.rebroadcast : default_rebroadcast = args.rebroadcast if args.episode : default_episode = args.episode if args.verbose : default_verbose = args.verbose +if args.xmltvns : default_xmltvns = args.xmltvns if MyISP: if not any(MyISP in s for s in ['ALL', 'KT', 'LG', 'SK']): @@ -1120,6 +1123,16 @@ else : printError("epg2xml.json 파일의 default_verbose항목이 없습니다."); sys.exit() +if default_xmltvns : + if not any(default_xmltvns in s for s in ['y', 'n']): + printError("default_xmltvns는 y, n만 가능합니다.") + sys.exit() + else : + addxmltvns = default_xmltvns +else : + printError("epg2xml.json 파일의 default_verbose항목이 없습니다."); + sys.exit() + if default_fetch_limit : if not any(str(default_fetch_limit) in s for s in ['1', '2', '3', '4', '5', '6', '7']): printError("default_fetch_limit 는 1, 2, 3, 4, 5, 6, 7만 가능합니다.")