From 4b62f0140d05c8147839ae662d7d5f57f2687c1a Mon Sep 17 00:00:00 2001 From: wonipapa Date: Fri, 1 Sep 2017 13:11:03 +0900 Subject: [PATCH] =?UTF-8?q?ISCS=20=ED=95=A8=EC=88=98=EA=B9=8C=EC=A7=80=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epg2xml.php | 6 +++--- epg2xml.py | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/epg2xml.php b/epg2xml.php index 6e7c82a..c1662e5 100644 --- a/epg2xml.php +++ b/epg2xml.php @@ -914,7 +914,6 @@ function GetEPGFromNaver($ChannelInfo) { endforeach; endfor; endfor; - epgzip($epginfo); endif; } catch(Exception $e) { if($GLOBALS['debug']) printError($e->getMessage()); @@ -923,6 +922,7 @@ function GetEPGFromNaver($ChannelInfo) { } catch (Exception $e) { if($GLOBALS['debug']) printError($e->getMessage()); } + epgzip($epginfo); } // Get EPG data from Iscs @@ -982,7 +982,6 @@ function GetEPGFromIscs($ChannelInfo) { //ChannelId, startTime, programName, subprogramName, desc, actors, producers, category, episode, rebroadcast, rating $epginfo[] = array($ChannelId, $startTime, $programName, $subprogramName, $desc, $actors, $producers, $category, $episode, $rebroadcast, $rating); endforeach; - epgzip($epginfo); else : if($GLOBALS['debug']) printError($ChannelName.CONTENT_ERROR); endif; @@ -995,6 +994,7 @@ function GetEPGFromIscs($ChannelInfo) { if($GLOBALS['debug']) printError($e->getMessage()); } endforeach; + epgzip($epginfo); } // Get EPG data from Hcn @@ -1044,7 +1044,6 @@ function GetEPGFromHcn($ChannelInfo) { //ChannelId, startTime, programName, subprogramName, desc, actors, producers, category, episode, rebroadcast, rating $epginfo[] = array($ChannelId, $startTime, $programName, $subprogramName, $desc, $actors, $producers, $category, $episode, $rebroadcast, $rating); endforeach; - epgzip($epginfo); else : if($GLOBALS['debug']) printError($ChannelName.CONTENT_ERROR); endif; @@ -1053,6 +1052,7 @@ function GetEPGFromHcn($ChannelInfo) { if($GLOBALS['debug']) printError($e->getMessage()); } endforeach; + epgzip($epginfo); } // Get EPG data from POOQ diff --git a/epg2xml.py b/epg2xml.py index 63038b9..0c4e6af 100644 --- a/epg2xml.py +++ b/epg2xml.py @@ -495,13 +495,13 @@ def GetEPGFromNaver(ChannelInfo): rating = program['grade'] #ChannelId, startTime, programName, subprogramName, desc, actors, producers, category, episode, rebroadcast, rating epginfo.append([ChannelId, startTime, programName, subprogramName, desc, actors, producers, category, episode, rebroadcast, rating]) - epgzip(epginfo) except ValueError: if(debug): printError(ChannelName + CONTENT_ERROR) else: pass except (requests.RequestException) as e: if(debug): printError(ChannelName + str(e)) else: pass + epgzip(epginfo) # Get EPG data from ISCS def GetEPGFromIscs(ChannelInfo): @@ -543,13 +543,14 @@ def GetEPGFromIscs(ChannelInfo): rebroadcast = True if matches.group(3) else False #ChannelId, startTime, programName, subprogramName, desc, actors, producers, category, episode, rebroadcast, rating epginfo.append([ChannelId, startTime, programName, subprogramName, desc, actors, producers, category, episode, rebroadcast, rating]) - epgzip(epginfo) + except ValueError: if(debug): printError(ChannelName + CONTENT_ERROR) else: pass except (requests.RequestException) as e: if(debug): printError(ChannelName + str(e)) else: pass + epgzip(epginfo) # Get EPG data from HCN def GetEPGFromHcn(ChannelInfo): @@ -585,13 +586,13 @@ def GetEPGFromHcn(ChannelInfo): if not (grade is None): rating = int(grade.group(1)) #ChannelId, startTime, programName, subprogramName, desc, actors, producers, category, episode, rebroadcast, rating epginfo.append([ChannelId, startTime, programName, subprogramName, desc, actors, producers, category, episode, rebroadcast, rating]) - epgzip(epginfo) else: if(debug): printError(ChannelName + CONTENT_ERROR) else: pass except (requests.exceptions.RequestException) as e: if(debug): printError(ChannelName + str(e)) else: pass + epgzip(epginfo) # Get EPG data from POOQ def GetEPGFromPooq(ChannelInfo):