fix LANG.

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

diff --git a/rec10/trunk/src/auto_process.py b/rec10/trunk/src/auto_process.py
index 175df6b..5523768 100644 (file)
--- a/rec10/trunk/src/auto_process.py
+++ b/rec10/trunk/src/auto_process.py
@@ -72,7 +72,7 @@ def autoCheck(path):
                 dir = os.path.split(fn)[0]\r
                 file = os.path.split(fn)[1]\r
                 title = os.path.splitext(file)[0]\r
-                title = unicode(title,'utf-8')\r
+                title = unicode(title,'utf-8',errors='replace')\r
                 ext = os.path.splitext(file)[1]\r
                 if ext == ".b25":\r
                     title=title.replace(".ts","")\r

diff --git a/rec10/trunk/src/recording_earth_pt1.py b/rec10/trunk/src/recording_earth_pt1.py
index 5826ff2..efedd5a 100644 (file)
--- a/rec10/trunk/src/recording_earth_pt1.py
+++ b/rec10/trunk/src/recording_earth_pt1.py
@@ -72,8 +72,9 @@ def record(channel,tsid,out,timelength,decode=1):
     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+"/dvr0\" > "+out
+        reccmd=u"/bin/cat \""+configreader.getConfDVB("DVBadapter")+adapt+"/dvr0\" > \""+out+"\""
         if decode==1:
             reccmd=configreader.getConfPath("b25")+u" -v 0 \""+configreader.getConfDVB("DVBadapter")+adapt+"/dvr0\" \""+out+"\""
         recdblist.addLog(out, tunecmd+"\n"+reccmd, "record(DVB)",100)
@@ -82,15 +83,16 @@ def record(channel,tsid,out,timelength,decode=1):
         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(reccmd,shell=True,preexec_fn=os.setsid,env=my_env,bufsize=-1)
+            p2=subprocess.Popen(["/bin/cat","\""+configreader.getConfDVB("DVBadapter")+adapt+"/dvr0\""],stdout=f,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)
         p1.wait()
+        f.close()
     else:
         recdblist.printutf8ex(u"tuner busy",100,100)
-        #f.close()
 def useDVB():
     try:
         if int(configreader.getConfDVB("useDVB").replace(" ",""))==1: