From d287cdefd773cc7cc570ec9cdfa6a9dbfc2790bb Mon Sep 17 00:00:00 2001
From: wonipapa <sungpyohong@gmail.com>
Date: Fri, 1 Sep 2017 18:26:31 +0900
Subject: [PATCH] Update 1.2.2

---
 README.md       | 2 +-
 epg2xml-web.php | 6 +++++-
 epg2xml.php     | 6 +++++-
 epg2xml.py      | 9 ++++++---
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 599e8f4..24b5b88 100644
--- a/README.md
+++ b/README.md
@@ -118,7 +118,7 @@ https://github.com/wonipapa/epg2xml/wiki/FAQ
 ### Version 1.2.2
   - My Channel 추가
   - 소스 추가
-  - Channel.json 분리로 삭제
+  - 에피소드 넘버 xmltv_ns 추가
 ### Version 1.2.1
   - SKB 함수 추가
   - 가져오는 날짜 최대 2일로 변경
diff --git a/epg2xml-web.php b/epg2xml-web.php
index 661faa0..cb8e76c 100644
--- a/epg2xml-web.php
+++ b/epg2xml-web.php
@@ -1511,6 +1511,9 @@ function writeProgram($programdata) {
     $producers = htmlspecialchars($programdata['producers'], ENT_XML1);
     $category = htmlspecialchars($programdata['category'], ENT_XML1);
     $episode = $programdata['episode'];
+    $episode_ns = (int)$episode - 1;
+    $episode_ns = '0' . '.' . $episode_ns . '.' . '0' . '/' . '0';
+    $episode_on = $episode;
     $rebroadcast = $programdata['rebroadcast'];
     if($episode && $GLOBALS['addepisode'] == 'y') $programName = $programName." (".$episode."회)";
     if($rebroadcast == True && $GLOBALS['addrebroadcast'] == 'y') $programName = $programName." (재)";
@@ -1579,7 +1582,8 @@ function writeProgram($programdata) {
     endif;
     if($category) fprintf($fp, "    <category lang=\"kr\">%s</category>\n", $category);
     if($contentType) fprintf($fp, "    <category lang=\"en\">%s</category>\n", $contentType);
-    if($episode) fprintf($fp, "    <episode-num system=\"onscreen\">%s</episode-num>\n", $episode);
+    if($episode) fprintf($fp, "    <episode-num system=\"xmltv_ns\">%s</episode-num>\n", $episode_ns);
+    if($episode) fprintf($fp, "    <episode-num system=\"onscreen\">%s</episode-num>\n", $episode_on);
     if($rebroadcast) fprintf($fp, "    <previously-shown />\n");
     if($rating) :
         fprintf($fp, "    <rating system=\"KMRB\">\n");
diff --git a/epg2xml.php b/epg2xml.php
index 0e37cab..7d77995 100644
--- a/epg2xml.php
+++ b/epg2xml.php
@@ -1530,6 +1530,9 @@ function writeProgram($programdata) {
     $producers = htmlspecialchars($programdata['producers'], ENT_XML1);
     $category = htmlspecialchars($programdata['category'], ENT_XML1);
     $episode = $programdata['episode'];
+    $episode_ns = (int)$episode - 1;
+    $episode_ns = '0' . '.' . $episode_ns . '.' . '0' . '/' . '0';
+    $episode_on = $episode;
     $rebroadcast = $programdata['rebroadcast'];
     if($episode && $GLOBALS['addepisode'] == 'y') $programName = $programName." (".$episode."회)";
     if($rebroadcast == True && $GLOBALS['addrebroadcast'] == 'y') $programName = $programName." (재)";
@@ -1598,7 +1601,8 @@ function writeProgram($programdata) {
     endif;
     if($category) fprintf($fp, "    <category lang=\"kr\">%s</category>\n", $category);
     if($contentType) fprintf($fp, "    <category lang=\"en\">%s</category>\n", $contentType);
-    if($episode) fprintf($fp, "    <episode-num system=\"onscreen\">%s</episode-num>\n", $episode);
+    if($episode) fprintf($fp, "    <episode-num system=\"xmltv_ns\">%s</episode-num>\n", $episode_ns);
+    if($episode) fprintf($fp, "    <episode-num system=\"onscreen\">%s</episode-num>\n", $episode_on);
     if($rebroadcast) fprintf($fp, "    <previously-shown />\n");
     if($rating) :
         fprintf($fp, "    <rating system=\"KMRB\">\n");
diff --git a/epg2xml.py b/epg2xml.py
index b1a005b..0322b39 100644
--- a/epg2xml.py
+++ b/epg2xml.py
@@ -910,6 +910,10 @@ def writeProgram(programdata):
     producers = escape(programdata['producers'])
     category = escape(programdata['category'])
     episode = programdata['episode']
+    if episode :
+        episode_ns = episode - 1
+        episode_ns = '0'+ '.' +  str(episode_ns) + '.' + '0' + '/' + '0'
+    episode_on = episode
     rebroadcast = programdata['rebroadcast']
     if episode and addepisode  == 'y': programName = programName + ' ('+ str(episode) + '회)'
     if rebroadcast  == True and addrebroadcast == 'y' : programName = programName + ' (재)'
@@ -950,12 +954,11 @@ def writeProgram(programdata):
                 for producer in producers.split(','):
                     if producer.strip(): print('      <producer>%s</producer>' % (producer).strip())
             print('    </credits>')
-
     if category: print('    <category lang="kr">%s</category>' % (category))
     if contentType: print('    <category lang="en">%s</category>' % (contentType))
-    if episode: print('    <episode-num system="onscreen">%s</episode-num>' % (episode))
+    if episode: print('    <episode-num system="xmltv_ns">%s</episode-num>' % (episode_ns))
+    if episode: print('    <episode-num system="onscreen">%s</episode-num>' % (episode_on))
     if rebroadcast: print('    <previously-shown />')
-
     if rating:
         print('    <rating system="KMRB">')
         print('      <value>%s</value>' % (rating))