some fixes

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

diff --git a/rec10/trunk/src/recdb.py b/rec10/trunk/src/recdb.py
index 38d7199..127c579 100644 (file)
--- a/rec10/trunk/src/recdb.py
+++ b/rec10/trunk/src/recdb.py
@@ -36,7 +36,6 @@ try:
     db.execute('create table rectime (type TEXT,chtxt TEXT,title TEXT,btime TEXT,etime TEXT,deltatime TEXT,deltaday TEXT,opt TEXT,id INTEGER PRIMARY KEY,UNIQUE(type,chtxt,title,btime,deltaday))')
 except:
     #print "テーブル作成に失敗しました"
-    
     db.commit()
     db.close()
 def recreserv(title,chtxt,btime,etime,opt):#optにはa(アニメ)d(副音声)v(xvid)

diff --git a/rec10/trunk/src/tester.py b/rec10/trunk/src/tester.py
index 229de2c..a513bd9 100644 (file)
--- a/rec10/trunk/src/tester.py
+++ b/rec10/trunk/src/tester.py
@@ -16,4 +16,6 @@ import ts2x264
 #import datetime
 path=str(os.path.dirname(os.path.abspath(__file__)))+"/"
 recordingpath="/home/ftpusr/ftp3/Recording/"
-recordedpath="/home/ftpusr/ftp3/Recorded/"
\ No newline at end of file
+recordedpath="/home/ftpusr/ftp3/Recorded/"
+
+tv2avi.b252avi(recordingpath+"[二]ザ・ユニバース～宇宙の歴史～【特集：世界天文年2009】#1.avi", "hisch", "Sd2")
\ No newline at end of file

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 87f038a..2e941f5 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -148,6 +148,7 @@ def task():
                         recdb.del_reckey(recdb.REC_TS_DECODING, title, chtxt, btime)
                         recdb.rec_reckey(recdb.REC_MISS_DECODE, title, chtxt, btime, etime, opt)
                     else:
+                        recdb.del_reckey(recdb.REC_TS_DECODING, title, chtxt, btime)
                         tnow=datetime.datetime.now()
                         bt=datetime.datetime.strptime(btime,"%Y-%m-%d %H:%M:%S")
                         et=datetime.datetime.strptime(etime,"%Y-%m-%d %H:%M:%S")
@@ -157,7 +158,6 @@ def task():
                         btime=bt.strftime("%Y-%m-%d %H:%M:%S")
                         etime=et.strftime("%Y-%m-%d %H:%M:%S")
                         recdb.rec_reckey(recdb.REC_ENCODE_QUE,title,chtxt,btime,etime,opt)
-                        recdb.del_reckey(recdb.REC_TS_DECODING, title, chtxt, btime)
                         recdb.rec_reckey(recdb.REC_FIN_DECODE,title,chtxt,btime,etime,opt)
                     sys.exit(0)
         elif task["type"]==recdb.REC_ENCODE_QUE:

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index d71059e..08dfe00 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -1,3 +1,4 @@
+import tv2avi
 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools
@@ -5,6 +6,7 @@
 import status
 import os
 import time
+from tv2avi import tv2avi
 import re
 
 def ts2x264(pin,pout,opts):#sizeは"HD"か"SD"
@@ -39,19 +41,19 @@ def ts2x264(pin,pout,opts):#sizeは"HD"か"SD"
         encvf="-vf pp=l5,"
     if size=="SD":
         encvf=encvf+"scale=720:480,harddup"
-        bitrate="bitrate=1250"
+        bitrate="bitrate="+tv2avi.Bitrate_SD
     elif size=="HD":
         encvf=encvf+"scale=1280:720,harddup"
-        bitrate="bitrate=2000"
+        bitrate="bitrate="+tv2avi.Bitrate_HD
     elif size=="FHD":
         encvf=encvf+"scale=1920:1080,harddup"
-        bitrate="bitrate=2500"
+        bitrate="bitrate="+tv2avi.Bitrate_FHD
     elif size=="WQVGA":
         encvf=encvf+"scale=400:240,harddup"
-        bitrate="bitrate=200"
+        bitrate="bitrate="+tv2avi.Bitrate_WQVGA
     else:
         encvf=encvf+"scale=1280:720,harddup"
-        bitrate="bitrate=2000"
+        bitrate="bitrate="+tv2avi.Bitrate_HD
 
     if dualpass==1:
         pas1exe="mencoder \'"+pin+"\' -ovc x264 "+encvf+" -x264encopts "+bitrate+":threads=auto:pass=1:turbo=2 -passlogfile "+pin+".log "+"-oac mp3lame -lameopts cbr:br=128 -o /dev/null"

diff --git a/rec10/trunk/src/ts2xvid.py b/rec10/trunk/src/ts2xvid.py
index d0745b2..3390ec0 100644 (file)
--- a/rec10/trunk/src/ts2xvid.py
+++ b/rec10/trunk/src/ts2xvid.py
@@ -36,19 +36,19 @@ def ts2xvid(pin,pout,opts):#sizeは"HD"か"SD"
         encvf="-vf pp=l5,"
     if size=="SD":
         encvf=encvf+"scale=720:480,harddup"
-        bitrate="bitrate=1250"
+        bitrate="bitrate="+tv2avi.Bitrate_SD
     elif size=="HD":
         encvf=encvf+"scale=1280:720,harddup"
-        bitrate="bitrate=2000"
+        bitrate="bitrate="+tv2avi.Bitrate_HD
     elif size=="FHD":
         encvf=encvf+"scale=1920:1080,harddup"
-        bitrate="bitrate=2500"
+        bitrate="bitrate="+tv2avi.Bitrate_FHD
     elif size=="WQVGA":
         encvf=encvf+"scale=400:240,harddup"
-        bitrate="bitrate=200"
+        bitrate="bitrate="+tv2avi.Bitrate_WQVGA
     else:
         encvf=encvf+"scale=1280:720,harddup"
-        bitrate="bitrate=2000"
+        bitrate="bitrate="+tv2avi.Bitrate_HD
 
     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"
@@ -61,6 +61,6 @@ def ts2xvid(pin,pout,opts):#sizeは"HD"か"SD"
         time.sleep(5)
         os.system(pas2exe)
     else:
-        pas1exe="mencoder \'"+pin+"\' -ovc xvid "+encvf+" -xvidencopts fixed_quant=4:threads=2 -oac mp3lame -lameopts cbr:br=128  -o \'"+pout+"\'"
+        pas1exe="mencoder \'"+pin+"\' -ovc xvid "+encvf+" -xvidencopts "+bitrate+":threads=2 -oac mp3lame -lameopts cbr:br=128  -o \'"+pout+"\'"
         os.system(pas1exe)
     status.setEncoding(status.getEncoding()-1)
\ No newline at end of file

diff --git a/rec10/trunk/src/tv2avi.py b/rec10/trunk/src/tv2avi.py
index 934a556..b4e682d 100644 (file)
--- a/rec10/trunk/src/tv2avi.py
+++ b/rec10/trunk/src/tv2avi.py
@@ -12,6 +12,16 @@ import ts2x264
 import ts2xvid
 import tv2ts
 import recdb
+
+global Bitrate_HD
+global Bitrate_FHD
+global Bitrate_SD
+global Bitrate_WQVGA
+Bitrate_HD="2000"
+Bitrate_FHD="2500"
+Bitrate_SD="1250"
+Bitrate_WQVGA="200"
+
 def timetv2avi(pout, chtxt, btime, etime,opt):
     bt = datetime.datetime.strptime(btime, "%Y-%m-%d %H:%M:%S")
     et = datetime.datetime.strptime(etime, "%Y-%m-%d %H:%M:%S")

diff --git a/rec10/trunk/src/tv2ts.py b/rec10/trunk/src/tv2ts.py
index b8054a3..1fce8df 100644 (file)
--- a/rec10/trunk/src/tv2ts.py
+++ b/rec10/trunk/src/tv2ts.py
@@ -10,6 +10,7 @@ import base64
 #import re
 #import glob
 import time
+import hashlib
 #japanesenkf.overrideEncodings()
 
 mypath=str(os.path.dirname(os.path.abspath(__file__)))+"/"
@@ -30,7 +31,11 @@ def tv2ts(pout,ch,csch,time):
     #tsmix2ts(temp[0]+"mix."+temp[1],pout,csch)
     #os.remove(temp[0]+"mix."+temp[1])
     temp=pout.split(".")
-    t=base64.b16encode(pout)
+    #t=base64.b16encode(pout)
+    #t=t[0:30]
+    t=hashlib.md5(pout).hexdigest()
+    #m.update(pout)
+    #t=m.hexdigest()
     #t=str(random.randint(10000,90000))
     tempt=os.path.split(pout)
     path=tempt[0]
@@ -46,7 +51,12 @@ def tv2ts(pout,ch,csch,time):
 
 def b252ts(pout,ch,csch):
     temp=pout.split(".")
-    t=base64.b16encode(pout)
+    #m=hashlib.md5
+    #m.update(pout)
+    #t=m.hexdigest()
+    t=hashlib.md5(pout).hexdigest()
+    #t=base64.b16encode(pout)
+    #t=t[0:30]
     #t=str(random.randint(10000,90000))
     tempt=os.path.split(pout)
     path=tempt[0]