fix rename miss.

[rec10/rec10-git.git] / rec10 / trunk / src / ts2epg.py

diff --git a/rec10/trunk/src/ts2epg.py b/rec10/trunk/src/ts2epg.py
index cdf65ff..a867290 100644 (file)
--- a/rec10/trunk/src/ts2epg.py
+++ b/rec10/trunk/src/ts2epg.py
@@ -1,47 +1,47 @@
-#!/usr/bin/python
-# coding: UTF-8
-# Rec10 TS Recording Tools
-# Copyright (C) 2009-2010 Yukikaze
-#import sys # モジュール属性 argv を取得するため
-import os
-import re
-import time
-
-import chdb
-import configreader
-import tv2ts
-import recdblist
-
-def write(pout, ch):
-    """
-    tsを取得してepgの入ったxmlとして書き出す
-    """
-    timet = "90"
-    if re.search(u'CS', ch):
-        timet = "180"
-    elif len(ch)>2:
-        timet = "240"
-    writeTime(pout, ch ,timet)
-def writeTime(pout, ch ,times):
-    """
-    指定された時間分tsを取得してepgの入ったxmlとして書き出す
-    """
-    recdblist.addCommonlogEX(u"通常","write_time(ts2epg.py)",u"Ts-EPG XML書き出し処理開始" ,u"CH:"+ch,log_level=500)
-    timet = times
-    if re.search(u'CS', ch):
-        mode = "/CS"
-    elif len(ch)>2:
-        mode = "/BS"
-    else:
-        mode = str(chdb.searchFromBctype(u'te' + ch)['ch'])
-    epgdump=configreader.getPathSetting("epgdump")
-    if os.access(pout + ".ts", os.F_OK):
-        os.remove(pout + ".ts")
-    time.sleep(10)
-    tv2ts.tv2tsmix(pout + ".ts", ch, timet)
-    exe = "export LANG=ja_JP.UTF-8 && nice -n 15 " + epgdump + " " + mode + " " + pout + ".ts " + pout
-    recdblist.printutf8(exe)
-    recdblist.addCommonlogEX(u"通常", "write_time(ts2epg.py)", exe,"",log_level=500)
-    os.system(exe)
-    time.sleep(10)
-
+#!/usr/bin/python\r
+# coding: UTF-8\r
+# Rec10 TS Recording Tools\r
+# Copyright (C) 2009-2010 Yukikaze\r
+#import sys # モジュール属性 argv を取得するため\r
+import os\r
+import re\r
+import time\r
+\r
+import chdb\r
+import configreader\r
+import tv2ts\r
+import recdblist\r
+\r
+def writeEpgXML(pout, ch):\r
+    """\r
+    tsを取得してepgの入ったxmlとして書き出す\r
+    """\r
+    timet = "90"\r
+    if re.search(u'CS', ch):\r
+        timet = "180"\r
+    elif len(ch)>2:\r
+        timet = "240"\r
+    writeEpgXMLTime(pout, ch ,timet)\r
+def writeEpgXMLTime(pout, ch ,times):\r
+    """\r
+    指定された時間分tsを取得してepgの入ったxmlとして書き出す\r
+    """\r
+    recdblist.addCommonlogEX(u"通常","write_time(ts2epg.py)",u"Ts-EPG XML書き出し処理開始" ,u"CH:"+ch,log_level=500)\r
+    timet = times\r
+    if re.search(u'CS', ch):\r
+        mode = "/CS"\r
+    elif len(ch)>2:\r
+        mode = "/BS"\r
+    else:\r
+        mode = str(chdb.bctypesearch(u'te' + ch)['ch'])\r
+    epgdump = configreader.getConfPath("epgdump")\r
+    if os.access(pout + ".ts", os.F_OK):\r
+        os.remove(pout + ".ts")\r
+    time.sleep(10)\r
+    tv2ts.tv2tsmix(pout + ".ts", ch, timet)\r
+    exe = "export LANG=ja_JP.UTF-8 && nice -n 15 " + epgdump + " " + mode + " " + pout + ".ts " + pout\r
+    recdblist.printutf8(exe)\r
+    recdblist.addCommonlogEX(u"通常", "write_time(ts2epg.py)", exe,"",log_level=500)\r
+    os.system(exe)\r
+    time.sleep(10)\r
+\r