From bd88803e00b68f50acb450433d05f0413f4ba990 Mon Sep 17 00:00:00 2001 From: wonipapa Date: Sun, 25 Jun 2017 01:15:54 +0900 Subject: [PATCH 1/3] =?UTF-8?q?timeout=20=EC=97=90=EB=9F=AC=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epg2xml.py | 52 +++++++++++----------------------------------------- 1 file changed, 11 insertions(+), 41 deletions(-) diff --git a/epg2xml.py b/epg2xml.py index 2dc76e4..02ca020 100644 --- a/epg2xml.py +++ b/epg2xml.py @@ -35,7 +35,7 @@ except ImportError: reload(sys) sys.setdefaultencoding('utf-8') -__version__ = '1.2.0p1' +__version__ = '1.2.0p2' if not sys.version_info[:2] == (2, 7): print("Error : ", "python 2.7 버전이 필요합니다.", file=sys.stderr) @@ -178,10 +178,7 @@ def GetEPGFromEPG(ChannelInfo): subprogramName = matches.group(4).strip() if matches.group(4) else '' #programName, startTime, rating, subprogramName, rebroadcast, episode epginfo.append([programName, startTime, rating, subprogramName, matches.group(5), matches.group(7)]) - except requests.exceptions.HTTPError: - if(debug): printError(ChannelName + HTTP_ERROR) - else: pass - except (requests.exceptions.ChunkedEncodingError, requests.ConnectionError) as e: + except (requests.exceptions.RequestException) as e: if(debug): printError(ChannelName + str(e)) else: pass for epg1, epg2 in zip(epginfo, epginfo[1:]): @@ -224,10 +221,7 @@ def GetEPGFromKT(ChannelInfo): else: if(debug): printError(ChannelName + CONTENT_ERROR) else: pass - except requests.exceptions.HTTPError: - if(debug): printError(ChannelName + HTTP_ERROR) - else: pass - except (requests.exceptions.ChunkedEncodingError, requests.ConnectionError) as e: + except (requests.exceptions.RequestException) as e: if(debug): printError(ChannelName + str(e)) else: pass for epg1, epg2 in zip(epginfo, epginfo[1:]): @@ -281,10 +275,7 @@ def GetEPGFromLG(ChannelInfo): else: if(debug): printError(ChannelName + CONTENT_ERROR) else: pass - except requests.exceptions.HTTPError: - if(debug): printError(ChannelName + HTTP_ERROR) - else: pass - except (requests.exceptions.ChunkedEncodingError, requests.ConnectionError) as e: + except (requests.exceptions.RequestException) as e: if(debug): printError(ChannelName + str(e)) else: pass for epg1, epg2 in zip(epginfo, epginfo[1:]): @@ -358,10 +349,7 @@ def GetEPGFromSK(ChannelInfo): except ValueError: if(debug): printError(ChannelName + CONTENT_ERROR) else: pass - except requests.exceptions.HTTPError: - if(debug): printError(ChannelName + HTTP_ERROR) - else: pass - except (requests.exceptions.ChunkedEncodingError, requests.ConnectionError) as e: + except (requests.exceptions.RequestException) as e: if(debug): printError(ChannelName + str(e)) else: pass @@ -407,10 +395,7 @@ def GetEPGFromSKY(ChannelInfo): except ValueError: if(debug): printError(ChannelName + CONTENT_ERROR) else: pass - except requests.exceptions.HTTPError: - if(debug): printError(ChannelName + HTTP_ERROR) - else: pass - except (requests.exceptions.ChunkedEncodingError, requests.ConnectionError) as e: + except (requests.exceptions.RequestException) as e: if(debug): printError(ChannelName + str(e)) else: pass @@ -456,10 +441,7 @@ def GetEPGFromNaver(ChannelInfo): except ValueError: if(debug): printError(ChannelName + CONTENT_ERROR) else: pass - except requests.exceptions.HTTPError: - if(debug): printError(ChannelName + HTTP_ERROR) - else: pass - except (requests.exceptions.ChunkedEncodingError, requests.ConnectionError) as e: + except (requests.RequestException) as e: if(debug): printError(ChannelName + str(e)) else: pass # Get EPG data from Tbroad @@ -514,10 +496,7 @@ def GetEPGFromMbc(ChannelInfo): except ValueError: if(debug): printError(ChannelName + CONTENT_ERROR) else: pass - except requests.exceptions.HTTPError: - if(debug): printError(ChannelName + HTTP_ERROR) - else: pass - except (requests.exceptions.ChunkedEncodingError, requests.ConnectionError) as e: + except (requests.exceptions.RequestException) as e: if(debug): printError(ChannelName + str(e)) else: pass @@ -567,10 +546,7 @@ def GetEPGFromMil(ChannelInfo): except ValueError: if(debug): printError(ChannelName + CONTENT_ERROR) else: pass - except requests.exceptions.HTTPError: - if(debug): printError(ChannelName + HTTP_ERROR) - else: pass - except (requests.exceptions.ChunkedEncodingError, requests.ConnectionError) as e: + except (requests.exceptions.RequestException) as e: if(debug): printError(ChannelName + str(e)) else: pass @@ -617,10 +593,7 @@ def GetEPGFromIfm(ChannelInfo): except ValueError: if(debug): printError(ChannelName + CONTENT_ERROR) else: pass - except requests.exceptions.HTTPError: - if(debug): printError(ChannelName + HTTP_ERROR) - else: pass - except (requests.exceptions.ChunkedEncodingError, requests.ConnectionError) as e: + except (requests.exceptions.RequestException) as e: if(debug): printError(ChannelName + str(e)) else: pass @@ -653,10 +626,7 @@ def GetEPGFromKbs(ChannelInfo): except ValueError: if(debug): printError(ChannelName + CONTENT_ERROR) else: pass - except requests.exceptions.HTTPError: - if(debug): printError(ChannelName + HTTP_ERROR) - else: pass - except (requests.exceptions.ChunkedEncodingError, requests.ConnectionError) as e: + except (requests.exceptions.RequestException) as e: if(debug): printError(ChannelName + str(e)) else: pass for epg1, epg2 in zip(epginfo, epginfo[1:]): From d198b78859cd7f4955b0e22d9c15e4dfe34ea120 Mon Sep 17 00:00:00 2001 From: wonipapa Date: Sun, 25 Jun 2017 22:57:38 +0900 Subject: [PATCH 2/3] Update Channel.json --- Channel.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Channel.json b/Channel.json index ed58308..953160d 100644 --- a/Channel.json +++ b/Channel.json @@ -91,7 +91,7 @@ {"Id":108,"Name":"KBS W","KT Name":"KBS W","KTCh":83,"LG Name":"KBS W","LGCh":77,"SK Name":"KBS W","SKCh":214,"Icon_url":"http://i.imgur.com/sVqBczs.png","Source":"SKY","ServiceId":509,"Enabled":1}, {"Id":110,"Name":"KBS1","KT Name":"KBS1","KTCh":9,"LG Name":"KBS1","LGCh":9,"SK Name":"KBS1","SKCh":9,"Icon_url":"http://i.imgur.com/e31o5gw.png","Source":"SKY","ServiceId":796,"Enabled":1}, {"Id":111,"Name":"KBS2","KT Name":"KBS2","KTCh":7,"LG Name":"KBS2","LGCh":7,"SK Name":"KBS2","SKCh":7,"Icon_url":"http://i.imgur.com/XgibZbD.png","Source":"SKY","ServiceId":795,"Enabled":1}, -{"Id":112,"Name":"키즈톡톡","KT Name":"","KTCh":null,"LG Name":"키즈톡톡","LGCh":158,"SK Name":"","SKCh":null,"Icon_url":"http://i.imgur.com/0loInJO.png","Source":"SKY","ServiceId":92,"Enabled":1}, +{"Id":112,"Name":"키즈톡톡","KT Name":"","KTCh":null,"LG Name":"키즈톡톡","LGCh":158,"SK Name":"","SKCh":null,"Icon_url":"http://i.imgur.com/0loInJO.png","Source":"LG","ServiceId":805,"Enabled":1}, {"Id":115,"Name":"KIDS-TV","KT Name":"KIDS-TV","KTCh":149,"LG Name":"","LGCh":null,"SK Name":"","SKCh":null,"Icon_url":"http://i.imgur.com/AVCSEdn.png","Source":"NAVER","ServiceId":814999,"Enabled":1}, {"Id":116,"Name":"K-NET TV","KT Name":"K-NET TV","KTCh":230,"LG Name":"","LGCh":null,"SK Name":"","SKCh":null,"Icon_url":"http://i.imgur.com/GelnqjB.png","Source":"KT","ServiceId":230,"Enabled":1}, {"Id":117,"Name":"KTV","KT Name":"KTV","KTCh":64,"LG Name":"KTV","LGCh":171,"SK Name":"KTV","SKCh":290,"Icon_url":"http://i.imgur.com/yUk2RhO.png","Source":"EPG","ServiceId":184,"Enabled":1}, @@ -111,7 +111,7 @@ {"Id":134,"Name":"mplex","KT Name":"mplex","KTCh":103,"LG Name":"Mplex","LGCh":46,"SK Name":"Mplex","SKCh":57,"Icon_url":"http://i.imgur.com/dOOBYJm.png","Source":"NAVER","ServiceId":814712,"Enabled":1}, {"Id":135,"Name":"머니투데이방송","KT Name":"머니투데이방송","KTCh":181,"LG Name":"MTN","LGCh":122,"SK Name":"MTN","SKCh":152,"Icon_url":"http://i.imgur.com/joWd14j.png","Source":"SKY","ServiceId":129,"Enabled":1}, {"Id":136,"Name":"NatGeo People","KT Name":"NatGeo People","KTCh":171,"LG Name":"","LGCh":null,"SK Name":"Natgeo People","SKCh":263,"Icon_url":"http://i.imgur.com/2ghKPUg.png","Source":"NAVER","ServiceId":814946,"Enabled":1}, -{"Id":137,"Name":"NatGeo Wild","KT Name":"NatGeo Wild","KTCh":170,"LG Name":"NatGeo Wild","LGCh":134,"SK Name":"Natgeo Wild HD","SKCh":266,"Icon_url":"http://i.imgur.com/M4nh0Rk.png","Source":"SKY","ServiceId":166,"Enabled":1}, +{"Id":137,"Name":"NatGeo Wild","KT Name":"NatGeo Wild","KTCh":170,"LG Name":"NatGeo Wild","LGCh":134,"SK Name":"Natgeo Wild HD","SKCh":266,"Icon_url":"http://i.imgur.com/M4nh0Rk.png","Source":"SKY","ServiceId":63,"Enabled":1}, {"Id":138,"Name":"NGC","KT Name":"NGC","KTCh":168,"LG Name":"내셔널지오그래픽","LGCh":131,"SK Name":"NGC","SKCh":260,"Icon_url":"http://i.imgur.com/mqTSPMN.png","Source":"SKY","ServiceId":972,"Enabled":1}, {"Id":139,"Name":"NHK WP","KT Name":"NHK WP","KTCh":199,"LG Name":"NHK World Premium","LGCh":143,"SK Name":"NHK World Premium","SKCh":278,"Icon_url":"http://i.imgur.com/ZSHeMzp.png","Source":"NAVER","ServiceId":815432,"Enabled":1}, {"Id":141,"Name":"니켈로디언","KT Name":"니켈로디언","KTCh":136,"LG Name":"니켈로디언","LGCh":154,"SK Name":"Nickelodeon","SKCh":176,"Icon_url":"http://i.imgur.com/6pWpFCX.png","Source":"SKY","ServiceId":685,"Enabled":1}, @@ -342,4 +342,4 @@ {"Id":446,"Name":"인도어스포츠","KT Name":"","KTCh":null,"LG Name":"","LGCh":null,"SK Name":"인도어스포츠","SKCh":139,"Icon_url":"http://i.imgur.com/cb58LLs.png","Source":"NAVER","ServiceId":5949404,"Enabled":1}, {"Id":447,"Name":"한국시니어TV","KT Name":"한국시니어TV","KTCh":264,"LG Name":"","LGCh":null,"SK Name":"","SKCh":null,"Icon_url":"http://i.imgur.com/XaObZ8I.png","Source":"KT","ServiceId":264,"Enabled":1}, {"Id":448,"Name":"GCN","KT Name":"GCN","KTCh":882,"LG Name":"","LGCh":null,"SK Name":"","SKCh":null,"Icon_url":"http://i.imgur.com/0NsDeMa.png","Source":"EPG","ServiceId":652,"Enabled":1} -] \ No newline at end of file +] From d0fbb9d04e3d732f718933fb06ffbbbc8618cfd5 Mon Sep 17 00:00:00 2001 From: wonipapa Date: Mon, 26 Jun 2017 10:59:06 +0900 Subject: [PATCH 3/3] update --- Channel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Channel.json b/Channel.json index 953160d..10518ee 100644 --- a/Channel.json +++ b/Channel.json @@ -109,7 +109,7 @@ {"Id":130,"Name":"MBN Plus","KT Name":"MBN Plus","KTCh":99,"LG Name":"MBN플러스","LGCh":116,"SK Name":"MBN 플러스","SKCh":98,"Icon_url":"http://i.imgur.com/yMZiUUp.png","Source":"NAVER","ServiceId":5286722,"Enabled":1}, {"Id":133,"Name":"마운틴TV","KT Name":"마운틴TV","KTCh":117,"LG Name":"마운틴TV","LGCh":69,"SK Name":"Mountain TV","SKCh":247,"Icon_url":"http://i.imgur.com/4nLYnVC.png","Source":"NAVER","ServiceId":814889,"Enabled":1}, {"Id":134,"Name":"mplex","KT Name":"mplex","KTCh":103,"LG Name":"Mplex","LGCh":46,"SK Name":"Mplex","SKCh":57,"Icon_url":"http://i.imgur.com/dOOBYJm.png","Source":"NAVER","ServiceId":814712,"Enabled":1}, -{"Id":135,"Name":"머니투데이방송","KT Name":"머니투데이방송","KTCh":181,"LG Name":"MTN","LGCh":122,"SK Name":"MTN","SKCh":152,"Icon_url":"http://i.imgur.com/joWd14j.png","Source":"SKY","ServiceId":129,"Enabled":1}, +{"Id":135,"Name":"머니투데이방송","KT Name":"머니투데이방송","KTCh":181,"LG Name":"MTN","LGCh":122,"SK Name":"MTN","SKCh":152,"Icon_url":"http://i.imgur.com/joWd14j.png","Source":"NAVER","ServiceId":814906,"Enabled":1}, {"Id":136,"Name":"NatGeo People","KT Name":"NatGeo People","KTCh":171,"LG Name":"","LGCh":null,"SK Name":"Natgeo People","SKCh":263,"Icon_url":"http://i.imgur.com/2ghKPUg.png","Source":"NAVER","ServiceId":814946,"Enabled":1}, {"Id":137,"Name":"NatGeo Wild","KT Name":"NatGeo Wild","KTCh":170,"LG Name":"NatGeo Wild","LGCh":134,"SK Name":"Natgeo Wild HD","SKCh":266,"Icon_url":"http://i.imgur.com/M4nh0Rk.png","Source":"SKY","ServiceId":63,"Enabled":1}, {"Id":138,"Name":"NGC","KT Name":"NGC","KTCh":168,"LG Name":"내셔널지오그래픽","LGCh":131,"SK Name":"NGC","SKCh":260,"Icon_url":"http://i.imgur.com/mqTSPMN.png","Source":"SKY","ServiceId":972,"Enabled":1},