fix bug,

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

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 4cbe28e..2aa468e 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -533,7 +533,7 @@ def type_decode_que(typetxt,chtxt,title,bt,et,opt):
             dt = et-bt
             if not typetxtencque=="":
                 tnow = datetime.datetime.now()
-                bt = tnow + datetime.timedelta(seconds=900)
+                bt = tnow + datetime.timedelta(seconds=600)
                 et = bt + dt
                 btime = bt.strftime("%Y-%m-%d %H:%M:%S")
                 etime = et.strftime("%Y-%m-%d %H:%M:%S")

diff --git a/rec10/trunk/src/tv2mkv.py b/rec10/trunk/src/tv2mkv.py
index d9e7cd9..0455ed8 100644 (file)
--- a/rec10/trunk/src/tv2mkv.py
+++ b/rec10/trunk/src/tv2mkv.py
@@ -28,7 +28,7 @@ def avi2mkv(pin,pout):
     logo=pout.replace(".mkv",".log")
     os.environ['LANG']="ja_JP.UTF-8"
     txt= doexe+"\n"
-    txt = txt+commands.getoutput(doexe.encode('utf-8'))
+    txt = txt+unicode(commands.getoutput(doexe.encode('utf-8')),'utf-8')
     txt = "\n####mkvmerge-log####\n"+txt
     f=open(logo,'a')
     f.write(txt.encode('utf-8'))

diff --git a/rec10/trunk/src/tv2ts.py b/rec10/trunk/src/tv2ts.py
index 5cf9e9e..b94b14c 100644 (file)
--- a/rec10/trunk/src/tv2ts.py
+++ b/rec10/trunk/src/tv2ts.py
@@ -77,8 +77,8 @@ def tv2b25ts(pout, ch, time):
         status.changeTERecording(1)
     doexe = exe + ' ' + ch + ' ' + time + ' \'' + pout + '\''
     print doexe
-    txt="####recpt1-log####\n"
-    txt = txt + commands.getoutput(doexe.encode('utf-8'))
+    txt=u"####recpt1-log####\n"
+    txt = txt + unicode(commands.getoutput(doexe.encode('utf-8')),'utf-8')
     logo=pout.replace(".ts.b25",".log")
     f=open(logo,'w')
     f.write(txt.encode('utf-8'))
@@ -104,7 +104,7 @@ def b252tsmix(pin, pout):
         print doexe
         sys.stdout.flush()
         logo=pin.replace(".ts.b25",".log")
-        txt = commands.getoutput(doexe.encode('utf-8'))
+        txt = unicode(commands.getoutput(doexe.encode('utf-8')),'utf-8')
         s=len(txt)
         stxt=""
         if s>1000:
@@ -128,7 +128,7 @@ def tsmix2ts(pin, pout, csch):#csch=0ならcsの処理をしない
     doexe = "nice -n 18 " + doexe
     logo=pin.replace(".ts.tsmix",".log")
     os.environ['LANG']="ja_JP.UTF-8"
-    txt = commands.getoutput(doexe.encode('utf-8'))
+    txt = unicode(commands.getoutput(doexe.encode('utf-8')),'utf-8')
     stxt=txt
     txt = "\n####tssplit-log####\nCommand:"+doexe+"\nlog:\n"+stxt
     f=open(logo,'a')

diff --git a/rec10/trunk/src/xml2db.py b/rec10/trunk/src/xml2db.py
index 07a3e1c..c0699af 100644 (file)
--- a/rec10/trunk/src/xml2db.py
+++ b/rec10/trunk/src/xml2db.py
@@ -120,7 +120,7 @@ def char_data(data):
     data = data.replace("  ", "")
     data = data.replace("\"", "")
     data = data.replace("\'", "")
-    datat = zenhan.toHankaku_ABC123(data)
+    data = zenhan.toHankaku_ABC123(data)
     #data = datat.encode('utf-8')
     if xmldate.has_key(lastflag):
         if xmldate[lastflag] != data: