fix no ts bug.

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

diff --git a/rec10/trunk/src/chlist_cs.xml b/rec10/trunk/src/chlist_cs.xml
index 01593bc..d050fad 100644 (file)
--- a/rec10/trunk/src/chlist_cs.xml
+++ b/rec10/trunk/src/chlist_cs.xml
@@ -6,41 +6,41 @@
     -->\r
     <!--標準のパックに入ったもの-->\r
     <!--映画-->\r
-    <channel bctype="cs1" ch="CS6" csch="223" chtxt="neco" ontvcode="1008.ontvjapan.com"/>\r
-    <channel bctype="cs1" ch="CS6" csch="224" chtxt="yo-ga" ontvcode="1009.ontvjapan.com"/>\r
-    <channel bctype="cs2" ch="CS10" csch="228" chtxt="thecinema" ontvcode="1217.ontvjapan.com"/>\r
-    <channel bctype="cs2" ch="CS2" csch="239" chtxt="nihoneiga" ontvcode="1086.ontvjapan.com"/>\r
-    <channel bctype="cs1" ch="CS18" csch="240" chtxt="movieplus" ontvcode="1007.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS6" csch="223" chtxt="neco" ontvcode="1008.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS6" csch="224" chtxt="yo-ga" ontvcode="1009.ontvjapan.com"/>\r
+    <channel bctype="cs1" ch="CS10" csch="228" chtxt="thecinema" ontvcode="1217.ontvjapan.com"/>\r
+    <channel bctype="cs1" ch="CS2" csch="239" chtxt="nihoneiga" ontvcode="1086.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS18" csch="240" chtxt="movieplus" ontvcode="1007.ontvjapan.com"/>\r
     <!--スポーツ-->\r
     <!--音楽-->\r
     <!--バラエティ-->\r
-    <channel bctype="cs1" ch="CS22" csch="293" chtxt="family" ontvcode="1015.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS22" csch="293" chtxt="family" ontvcode="1015.ontvjapan.com"/>\r
     <!--総合エンターテインメント-->\r
-    <!--<channel bctype="cs1" ch="CS24" csch="300" chtxt="nittereplus" ontvcode="300ch.ontvjapan.com"/>-->\r
-    <channel bctype="cs1" ch="CS22" csch="301" chtxt="tbsch" ontvcode="3201.ontvjapan.com"/>\r
-    <channel bctype="cs1" ch="CS12" csch="303" chtxt="tereasa" ontvcode="1092.ontvjapan.com"/>\r
-    <!--<channel bctype="cs1" ch="CS16" csch="305" chtxt="ginga" ontvcode="305ch.ontvjapan.com"/>-->\r
-    <channel bctype="cs1" ch="CS20" csch="307" chtxt="fuji-one" ontvcode="1073.ontvjapan.com"/>\r
-    <channel bctype="cs1" ch="CS20" csch="308" chtxt="fuji-two" ontvcode="1072.ontvjapan.com"/>\r
+    <!--<channel bctype="cs2" ch="CS24" csch="300" chtxt="nittereplus" ontvcode="300ch.ontvjapan.com"/>-->\r
+    <channel bctype="cs2" ch="CS22" csch="301" chtxt="tbsch" ontvcode="3201.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS12" csch="303" chtxt="tereasa" ontvcode="1092.ontvjapan.com"/>\r
+    <!--<channel bctype="cs2" ch="CS16" csch="305" chtxt="ginga" ontvcode="305ch.ontvjapan.com"/>-->\r
+    <channel bctype="cs2" ch="CS20" csch="307" chtxt="fuji-one" ontvcode="1073.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS20" csch="308" chtxt="fuji-two" ontvcode="1072.ontvjapan.com"/>\r
     <!--海外ドラマ-->\r
-    <channel bctype="cs1" ch="CS6" csch="311" chtxt="axn" ontvcode="1014.ontvjapan.com"/>\r
-    <channel bctype="cs1" ch="CS4" csch="312" chtxt="fox" ontvcode="1016.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS6" csch="311" chtxt="axn" ontvcode="1014.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS4" csch="312" chtxt="fox" ontvcode="1016.ontvjapan.com"/>\r
     <!--アニメ-->\r
-    <!--<channel bctype="cs1" ch="CS22" csch="330" chtxt="kids" ontvcode="1045.ontvjapan.com"/>#Before 2010 April 1-->\r
-    <channel bctype="cs2" ch="CS8" csch="335" chtxt="kids" ontvcode="1045.ontvjapan.com"/>\r
-    <channel bctype="cs1" ch="CS20" csch="332" chtxt="animax" ontvcode="1047.ontvjapan.com"/>\r
-    <channel bctype="cs1" ch="CS4" csch="334" chtxt="disney" ontvcode="1213.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS22" csch="330" chtxt="kids" ontvcode="1045.ontvjapan.com"/>\r
+    <channel bctype="cs1" ch="CS8" csch="335" chtxt="kidshd" ontvcode="335ch.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS20" csch="332" chtxt="animax" ontvcode="1047.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS4" csch="334" chtxt="disney" ontvcode="1213.ontvjapan.com"/>\r
     <!--ドキュメンタリー-->\r
-    <channel bctype="cs1" ch="CS20" csch="340" chtxt="disch" ontvcode="1062.ontvjapan.com"/>\r
-    <channel bctype="cs1" ch="CS20" csch="341" chtxt="anipla" ontvcode="1193.ontvjapan.com"/>\r
-    <channel bctype="cs1" ch="CS16" csch="342" chtxt="hisch" ontvcode="1050.ontvjapan.com"/>\r
-    <channel bctype="cs1" ch="CS6" csch="343" chtxt="natiogeo" ontvcode="1204.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS20" csch="340" chtxt="disch" ontvcode="1062.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS20" csch="341" chtxt="anipla" ontvcode="1193.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS16" csch="342" chtxt="hisch" ontvcode="1050.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS6" csch="343" chtxt="natiogeo" ontvcode="1204.ontvjapan.com"/>\r
     <!--ニュース-->\r
-    <channel bctype="cs1" ch="CS12" csch="353" chtxt="bbc" ontvcode="1070.ontvjapan.com"/>\r
-    <channel bctype="cs1" ch="CS12" csch="354" chtxt="cnn" ontvcode="1069.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS12" csch="353" chtxt="bbc" ontvcode="1070.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS12" csch="354" chtxt="cnn" ontvcode="1069.ontvjapan.com"/>\r
     <!--趣味-->\r
     <!--その他-->\r
     <!--\r
-    <channel bctype="cs1" ch="CS16" csch="333" chtxt="atx" ontvcode="1201.ontvjapan.com"/>\r
+    <channel bctype="cs2" ch="CS16" csch="333" chtxt="atx" ontvcode="1201.ontvjapan.com"/>\r
     -->\r
 </rec10_ch>
\ No newline at end of file

diff --git a/rec10/trunk/src/tv2mkv.py b/rec10/trunk/src/tv2mkv.py
index fa84689..9fd2fae 100644 (file)
--- a/rec10/trunk/src/tv2mkv.py
+++ b/rec10/trunk/src/tv2mkv.py
@@ -17,10 +17,11 @@ def ts2mkv(pin, pout, opt):
     title=os.path.splitext(title)[0]
     tpraw=os.path.join(dir, title+".264")
     tpmkv=os.path.join(dir, title+".mkv")
-    tv2avi.ts2raw(pin, tpraw, opt)
-    time.sleep(10)
-    if os.path.isfile(tpraw) and os.path.getsize(tpraw)>10*1000:
-        raw2mkv(tpraw, tpmkv, opt)
+    if os.path.isfile(pin) and os.path.getsize(pin)>10*1000:
+        tv2avi.ts2raw(pin, tpraw, opt)
+        time.sleep(10)
+        if os.path.isfile(tpraw) and os.path.getsize(tpraw)>10*1000:
+            raw2mkv(tpraw, tpmkv, opt)
 def raw2mkv(pin,pout,opt):#x264
     dir=os.path.split(pout)[0]
     title=os.path.split(pout)[1]

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index 4692e4f..1f18a52 100644 (file)
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -21,10 +21,11 @@ def ts2mp4(pin, pout, opt):
     title=os.path.splitext(title)[0]\r
     tpraw=os.path.join(dir, title+".264")\r
     tpmp4=os.path.join(dir, title+".mp4")\r
-    tv2avi.ts2raw(pin, tpraw, opt)\r
-    time.sleep(10)\r
-    if os.path.isfile(tpraw) and os.path.getsize(tpraw)>10*1000:\r
-        raw2mp4(tpraw, tpmp4, opt)\r
+    if os.path.isfile(pin) and os.path.getsize(pin)>10*1000:\r
+        tv2avi.ts2raw(pin, tpraw, opt)\r
+        time.sleep(10)\r
+        if os.path.isfile(tpraw) and os.path.getsize(tpraw)>10*1000:\r
+            raw2mp4(tpraw, tpmp4, opt)\r
 def raw2mp4(pin,pout,opt):\r
     dir=os.path.split(pout)[0]\r
     title=os.path.split(pout)[1]\r