modify tune software and recording script.

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

diff --git a/rec10/trunk/src/recording_earth_pt1.py b/rec10/trunk/src/recording_earth_pt1.py
index f2ea3ba..57df045 100644 (file)
--- a/rec10/trunk/src/recording_earth_pt1.py
+++ b/rec10/trunk/src/recording_earth_pt1.py
@@ -1,4 +1,3 @@
-import os.path
 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools
@@ -8,6 +7,7 @@ import sys
 import subprocess
 import time
 import os
+import os.path
 import signal
 
 import configreader
@@ -72,32 +72,30 @@ def getActiveAdapter(channel):
             return str(i)
 def record(channel,tsid,out,timelength,decode=1):
     if not os.path.exists(tmppath+u"rec.sh"):
-        ft=open(tmppath+u"rec.sh")
-        ft.write(u"#!/bin/bash\n/bin/cat $1 > $2")
+        ft=open(tmppath+u"rec.sh","w")
+        ft.write(u"#!/bin/bash\n/bin/cat $1 > \"$2\"")
         ft.close()
         os.system(u"chmod +x "+tmppath+u"rec.sh")
     adapt=getActiveAdapter(channel)
     my_env=recdblist.getEnv()
     if adapt!=None:
-        f=open(out,"w")
-        tunecmd=configreader.getConfDVB("DVBtune")+u" "+adapt+u" "+channel2freq(channel)+u" "+tsid
-        reccmd=u"/bin/cat \""+configreader.getConfDVB("DVBadapter")+adapt+u"/dvr0\" > \""+out+u"\""
-        if decode==1:
-            reccmd=configreader.getConfPath("b25")+u" -v 0 \""+configreader.getConfDVB("DVBadapter")+adapt+u"/dvr0\" \""+out+"\""
+        tunecmd=configreader.getConfDVB("DVBtune")+u" "+adapt+u" "+channel2freq(channel)+u" "+tsid+u" "+timelength+u" "+out
+        #reccmd=u"/bin/cat \""+configreader.getConfDVB("DVBadapter")+adapt+u"/dvr0\" > \""+out+u"\""
+        #if decode==1:
+        #    reccmd=configreader.getConfPath("b25")+u" -v 0 \""+configreader.getConfDVB("DVBadapter")+adapt+u"/dvr0\" \""+out+"\""
         recdblist.addLog(out, tunecmd+"\n"+reccmd, "record(DVB)",100)
-        p1=subprocess.Popen([configreader.getConfDVB("DVBtune"),adapt,channel2freq(channel),tsid],env=my_env)
-        time.sleep(0.2)
-        if decode==1:
-            p2=subprocess.Popen([configreader.getConfPath("b25"),u"-v 0",u"\""+configreader.getConfDVB("DVBadapter")+adapt+"/dvr0\"","\""+out+"\""],preexec_fn=os.setsid,env=my_env,bufsize=-1)
-        else:
-            p2=subprocess.Popen([tmppath+u"rec.sh",configreader.getConfDVB("DVBadapter")+adapt+"/dvr0",out],preexec_fn=os.setsid,env=my_env,bufsize=-1)
+        p1=subprocess.Popen([configreader.getConfDVB("DVBtune"),adapt,channel2freq(channel),tsid,timelength,out],env=my_env)
+        #time.sleep(0.2)
+        #if decode==1:
+        #    p2=subprocess.Popen([configreader.getConfPath("b25"),u"-v 0",u"\""+configreader.getConfDVB("DVBadapter")+adapt+"/dvr0\"","\""+out+"\""],preexec_fn=os.setsid,env=my_env,bufsize=-1)
+        #else:
+        #    p2=subprocess.Popen([tmppath+u"rec.sh",configreader.getConfDVB("DVBadapter")+adapt+"/dvr0",out],preexec_fn=os.setsid,env=my_env,bufsize=-1)
             #p2=subprocess.Popen(reccmd,shell=True,preexec_fn=os.setsid,env=my_env,bufsize=-1)
-        time.sleep(float(timelength))
-        os.killpg(p2.pid,signal.SIGKILL)
-        p2.wait()
-        os.kill(p1.pid,signal.SIGKILL)
+        #time.sleep(float(timelength))
+        #os.killpg(p2.pid,signal.SIGKILL)
+        #p2.wait()
+        #os.kill(p1.pid,signal.SIGKILL)
         p1.wait()
-        f.close()
     else:
         recdblist.printutf8ex(u"tuner busy",100,100)
 def useDVB():