change tsepg getting tool to epgdump2.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@76 4e526526-5e11-4fc0-8910-f8fd03428081

diff --git a/rec10/trunk/src/chdata.py b/rec10/trunk/src/chdata.py
index d4f527b..16f912a 100644 (file)
--- a/rec10/trunk/src/chdata.py
+++ b/rec10/trunk/src/chdata.py
@@ -67,6 +67,8 @@ chadd('cs', '1008.ontvjapan.com', 'neco', 'CS6', '223', 'CSDT223', 'SPTV261')
 chadd('cs', '1015.ontvjapan.com', 'family', 'CS22', '293', 'CSDT293', 'ファミリー劇場')
 chadd('cs', '1213.ontvjapan.com', 'disney', 'CS4', '334', 'CSDT334', 'ディズニーチャンネル')
 chadd('cs', '1092.ontvjapan.com', 'teroasa', 'CS12', '303', 'CSDT303', '糞朝チャンネル')
+chadd('cs', '1073.ontvjapan.com', 'fuji-one', 'CS20', '307', 'CSDT307', 'フジテレビONE')
+chadd('cs', '1072.ontvjapan.com', 'fuji-two', 'CS20', '308', 'CSDT308', 'フジテレビTWO')
 chadd('cs', '1009.ontvjapan.com', 'yo-ga', 'CS6', '224', 'CSDT224', 'シネフィル・イマジカ')
 chadd('cs2', '1217.ontvjapan.com', 'thecinema', 'CS10', '228', 'CSDT228', 'none')
 chadd('cs2', '1086.ontvjapan.com', 'nihoneiga', 'CS2', '239', 'CSDT239', '日本映画専門チャンネル')

diff --git a/rec10/trunk/src/config.ini b/rec10/trunk/src/config.ini
index 11ed04f..7f3f072 100644 (file)
--- a/rec10/trunk/src/config.ini
+++ b/rec10/trunk/src/config.ini
@@ -4,7 +4,6 @@ recpt1-bak=/pt1-tools/recpt1/recpt1
 b25-BAK=/pt1-tools/b25/b25
 b25=/usr/local/bin/b25
 splitt=/pt1-tools/tstools/TsSplitter.exe
-tsrename=/pt1-tools/tstools/TsRename.exe
 bontsdemux=/pt1-tools/tstools/BonTsDemux.exe
 tsepg2xml=/pt1-tools/tstools/tsEpg2xml/tsEpg2xml.exe
 temppath=/home/ftpusr/ftp1/rec-temp
@@ -12,7 +11,7 @@ recpath-bak=/home/ftpusr/ftp3/Recording
 recpath=/home/ftpusr/ftp1/rec-temp
 cmdow=/pt1-tools/tstools/cmdow.exe
 cmdwine=wine /pt1-tools/tstools/cmdow.exe /run /hid
-epgdump=/pt1-tools/epgdump/epgdump
+epgdump=/pt1-tools/tstools/epgdump
 gridserver_port=10910
 wine=wine 
 epg2xmlpath=/media/ramdisk

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index beffca4..90e62c1 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -27,7 +27,7 @@ def task():
     inum=recdb.countRecNow("1")
     print "now-rectask"
     print inum
-    if inum==0:
+    if inum < 2:#1個ならTE|BS/CSのどちらかが埋まってる可能性はないので1以下にした。
         update=chdb.update()
         #print "番組表更新処理"
         print update

diff --git a/rec10/trunk/src/ts2epg.py b/rec10/trunk/src/ts2epg.py
index 8218280..2d83c52 100644 (file)
--- a/rec10/trunk/src/ts2epg.py
+++ b/rec10/trunk/src/ts2epg.py
@@ -41,8 +41,8 @@ def write(pout,ch):
         t=t+1
         if t>10:
             break
-    exe="export LANG=ja_JP.UTF-8 && /usr/bin/nice -n 19 wine "+tsepg2xml+" "+mode+" "+pout+".ts >"+pout
-    #exe="export LANG=ja_JP.UTF-8 && /usr/bin/nice -n 19 "+epgdump+" "+mode+" "+pout+".ts "+pout
+    #exe="export LANG=ja_JP.UTF-8 && /usr/bin/nice -n 19 wine "+tsepg2xml+" "+mode+" "+pout+".ts >"+pout
+    exe="export LANG=ja_JP.UTF-8 && /usr/bin/nice -n 15 "+epgdump+" "+mode+" "+pout+".ts "+pout
     print exe
     os.system(exe)
     time.sleep(10)