bug fixes.

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

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index 46a6bc8..a3dc998 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -142,7 +142,7 @@ class DB_MySQL:
                 ret={}
                 ret['type']=typet
                 ret['chtxt']=chtxt
-                ret['title']=title
+                ret['title']=title.encode('utf-8')
                 btime=btime.strftime("%Y-%m-%d %H:%M:%S")
                 etime=etime.strftime("%Y-%m-%d %H:%M:%S")
                 ret['btime']=btime
@@ -175,7 +175,7 @@ class DB_MySQL:
                 ret={}
                 ret['type']=typet
                 ret['chtxt']=chtxt
-                ret['title']=title
+                ret['title']=title.encode('utf-8')
                 btime=btime.strftime("%Y-%m-%d %H:%M:%S")
                 etime=etime.strftime("%Y-%m-%d %H:%M:%S")
                 ret['btime']=btime
@@ -238,7 +238,7 @@ class DB_MySQL:
                     chtxt=chdb.ontvsearch(ch)['chtxt']
                 except:
                     chtxt="Unknown"
-                ret.append(chtxt+","+title+","+btime+","+etime)
+                ret.append(chtxt+","+title.encode('utf-8')+","+btime+","+etime)
         return ret
     def select_by_time_ngram_tv(self,btime,etime,chtxt):
         db=self.connect_db()

diff --git a/rec10/trunk/src/readme.txt b/rec10/trunk/src/readme.txt
index dad53a3..ecce222 100644 (file)
--- a/rec10/trunk/src/readme.txt
+++ b/rec10/trunk/src/readme.txt
@@ -27,6 +27,12 @@ b25(non-included)
 recpt1(recfriioでもいいはずです)(non-included)
 
 以上のソフトについては実行パスをconfig.iniに書いておいてください
+
+まず/usr/lib/python(バージョン)/site-package/sitecustomize.pyを作成し
+import sys
+sys.setdefaultencoding('utf-8')
+を追記します。
+
 その後chdate.pyのチャンネル設定部分を書き換え、chdate.pyを実行してください
 次にinstall.pyを実行すると番組表の取得が始まります。
 wwwフォルダにあるrectool.plを好みの場所に移動させ、そのフォルダにch.dbにたいするリンクを作成してください。

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

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 66aedb5..b6bbb5e 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -55,8 +55,8 @@ def ts2x264(pin,pout,opts):#sizeは"HD"か"SD"
     if dualpass==1:
         pas1exe="mencoder \'"+pin+"\' -quiet -ovc x264 "+encvf+" -x264encopts "+bitrate+":threads=auto:pass=1:turbo=2 -passlogfile \'"+pin+".log\' "+"-oac mp3lame -lameopts cbr:br=128 -o /dev/null"
         pas2exe="mencoder \'"+pin+"\' -quiet -ovc x264 "+encvf+" -x264encopts "+bitrate+":threads=auto:pass=2 -passlogfile \'"+pin+".log\' "+"-oac mp3lame -lameopts cbr:br=128 -o \'"+pout+"\'"
-        pas1exe="/usr/bin/nice -n 19 "+pas1exe
-        pas2exe="/usr/bin/nice -n 19 "+pas2exe
+        pas1exe="nice -n 19 "+pas1exe
+        pas2exe="nice -n 19 "+pas2exe
         print pas2exe
         os.system(pas1exe)
         print "1pass終了"
@@ -64,5 +64,5 @@ def ts2x264(pin,pout,opts):#sizeは"HD"か"SD"
         os.system(pas2exe)
     else:
         pas1exe="mencoder \'"+pin+"\' -quiet -ovc x264 "+encvf+" -x264encopts "+bitrate+":threads=auto -oac mp3lame -lameopts cbr:br=128  -o \'"+pout+"\'"
-        pas1exe="/usr/bin/nice -n 19 "+pas1exe
+        pas1exe="nice -n 19 "+pas1exe
         os.system(pas1exe)
\ No newline at end of file

diff --git a/rec10/trunk/src/ts2xvid.py b/rec10/trunk/src/ts2xvid.py
index cd64f43..516eaf3 100644 (file)
--- a/rec10/trunk/src/ts2xvid.py
+++ b/rec10/trunk/src/ts2xvid.py
@@ -54,8 +54,8 @@ def ts2xvid(pin,pout,opts):#sizeは"HD"か"SD"
     if dualpass==1:
         pas1exe="mencoder \'"+pin+"\' -ovc xvid "+encvf+" -xvidencopts "+bitrate+":threads=2:pass=1:turbo -passlogfile \'"+pin+".log\' "+"-oac mp3lame -lameopts cbr:br=128 -o /dev/null"
         pas2exe="mencoder \'"+pin+"\' -ovc xvid "+encvf+" -xvidencopts "+bitrate+":threads=2:pass=2 -passlogfile \'"+pin+".log\' "+"-oac mp3lame -lameopts cbr:br=128 -o \'"+pout+"\'"
-        pas1exe="/usr/bin/nice -n 19 "+pas1exe
-        pas2exe="/usr/bin/nice -n 19 "+pas2exe
+        pas1exe="nice -n 19 "+pas1exe
+        pas2exe="nice -n 19 "+pas2exe
         print pas2exe
         os.system(pas1exe)
         print "1pass終了"
@@ -63,5 +63,6 @@ def ts2xvid(pin,pout,opts):#sizeは"HD"か"SD"
         os.system(pas2exe)
     else:
         pas1exe="mencoder \'"+pin+"\' -ovc xvid "+encvf+" -xvidencopts "+bitrate+":threads=2 -oac mp3lame -lameopts cbr:br=128  -o \'"+pout+"\'"
+        pas1exe="nice -n 19 "+pas1exe
         os.system(pas1exe)
     
\ No newline at end of file

diff --git a/rec10/trunk/src/tv2ts.py b/rec10/trunk/src/tv2ts.py
index 9ec7ee7..54c2e73 100644 (file)
--- a/rec10/trunk/src/tv2ts.py
+++ b/rec10/trunk/src/tv2ts.py
@@ -70,6 +70,8 @@ def b252ts(pout,ch,csch):
 
 def tv2b25ts(pout,ch,time):
     exe=configreader.getpath('recpt1')
+    #print [exe,ch,time,pout]
+    #doexe=""
     doexe=exe+' '+ch+' '+time+' \''+pout+'\''
     os.system(doexe)
 def tv2b25ts_b25(pout,ch,time):
@@ -79,7 +81,7 @@ def tv2b25ts_b25(pout,ch,time):
 def b252tsmix(pin,pout):
     exe=configreader.getpath('b25')
     doexe=exe.encode('utf-8')+u' \''+pin.encode('utf-8')+u'\' \''+pout.encode('utf-8')+u'\''
-    doexe="/usr/bin/nice -n 17 "+doexe
+    doexe="nice -n 17 "+doexe
     txt=commands.getoutput(doexe)
 def tsmix2ts(pin,pout,csch):#csch=0ならcsの処理をしない
     wine=configreader.getpath('wine')
@@ -101,7 +103,7 @@ def tsmix2ts(pin,pout,csch):#csch=0ならcsの処理をしない
         #doexe=wine+u' '+exe+u' -SD -1SEG -EIT '+csopt+u'-SEPA3 -OUT '+path+'/ '+pin
         doexe=wine+u' '+exe+u' -SD -1SEG -EIT '+csopt+' -OUT '+path.encode('utf-8')+'/ '+pin.encode('utf-8')
         doexe='xvfb-run -a -e xvfberror.txt '+doexe
-        doexe="/usr/bin/nice -n 18 "+doexe
+        doexe="nice -n 18 "+doexe
         os.system(doexe)
         time.sleep(1)
         for i in xrange(10):