add emm refresh function.

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

diff --git a/rec10/trunk/src/classify.py b/rec10/trunk/src/classify.py
index 55774af..0ee96f0 100644 (file)
--- a/rec10/trunk/src/classify.py
+++ b/rec10/trunk/src/classify.py
@@ -10,6 +10,7 @@ import glob
 import n_gram
 import os
 import os.path
+import re
 import time
 import optparse
 import sys
@@ -93,7 +94,7 @@ def search_mkv(temppath,recpath):
 
 def veryfySize(path):
     #vsize=[297,497,596,1196]#SD 30m 1h 1.5h 2h
-    vsize=[295,591,830]
+    vsize=[245,275,295,591,830]
     vsize=vsize+[325,560,590,860]
     #vsize=vsize+[458,916]#HD 30m 1h
     #vsize=vsize+[381,895,447]
@@ -152,6 +153,7 @@ def execMove(title,temppath,recpath):
         shutil.move(srcpath, destpath)
         #shutil.copy(srcpath, destpath)
         delpath=[os.path.join(temppath,title+".ts")]
+        delpath.append(os.path.join(temppath,title+".avi"))
         delpath.append(os.path.join(temppath,title+".ts.b25"))
         delpath.append(os.path.join(temppath,title+".ts.tsmix"))
         delpath.append(os.path.join(temppath,title+".ts.log"))
@@ -187,8 +189,39 @@ def destNameMKV(title,temppath,recpath):
     return title
 
 def detName(path,title):
-    ""
-    
+    """
+    type A ---title#<number>
+    type B ---title#<number>subtitle
+    type C ---title subtitle
+    type D ---title(without number)
+    """
+    #if re.match("#\d\s[0,10]\z|#[0-9]\s[0,10]\z", title)
+    #    print "typeA"
+    #elif re.match("#\d\s[0,10].|#[0-9]\s[0,10].", title)
+    #    print "typeB"
+
+def detNameType(title):
+    """
+    type A ---title#<number>
+    type B ---title#<number>subtitle
+    type C ---title subtitle
+    type D ---title(without number)
+    """
+    print title
+    #rA=re.compile(".+(?P<title>)#\d(?P<num>)\s[0,10]\z")
+    rA=re.compile("(.+)#(\d*)\s*\Z")
+    tA=rA.match(title)
+    rB=re.compile("(.+)#(\d*)\s*(\D*)")
+    tB=rB.match(title)
+    if tA:
+        print "typeA"
+        print "title="+tA.group(1)
+        print "num="+tA.group(2)
+    elif tB:
+        print "typeB"
+        print "title="+tB.group(1)
+        print "num="+tB.group(2)
+        print "subtitle="+tB.group(3)
 if __name__ == "__main__":
     usage="usage: %prog read -h"
     version="%prog 0.7.0beta1"

diff --git a/rec10/trunk/src/emm_refresh.py b/rec10/trunk/src/emm_refresh.py
new file mode 100644 (file)
index 0000000..b192418
--- /dev/null
+++ b/rec10/trunk/src/emm_refresh.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+# coding: UTF-8
+# Rec10 TS Recording Tools
+# Copyright (C) 2009 Yukikaze
+import rec10d
+import configreader
+import os
+__author__="yukikaze"
+__date__ ="$2009/10/10 14:12:05$"
+path = str(os.path.dirname(os.path.abspath(__file__))) + "/"
+tmppath = path
+if __name__ == "__main__":
+    print "EMM Refresh script ver 0.8.0";
+    ch=rec10d.rec10db.select_all_chdata()
+    chl=[]
+    for cht in ch:
+        chl.append(cht[3])
+    chl=list(set(chl))
+    for chtt in chl:
+        emmp=os.path.join(tmppath,"emm.ts.b25")
+        emmp2=os.path.join(tmppath,"emm.ts")
+        exect1=configreader.getpath('recpt1')+" "+chtt+" 10 "+emmp
+        exect2=configreader.getpath('b25')+" -m 1 "+emmp+" "+emmp2
+        print exect1
+        os.system(exect1)
+        print exect2
+        os.system(exect2)
+    
\ No newline at end of file

diff --git a/rec10/trunk/src/tester.py b/rec10/trunk/src/tester.py
index 0e12e4a..0219c06 100644 (file)
--- a/rec10/trunk/src/tester.py
+++ b/rec10/trunk/src/tester.py
@@ -12,6 +12,7 @@ import status
 import chdb
 import checker
 import configreader
+import classify
 import epgdb
 import rec10d
 import recdb
@@ -21,7 +22,7 @@ import xml2db
 __author__ = "yukikaze"
 __date__ = "$2009/08/01 22:25:13$"
 path = str(os.path.dirname(os.path.abspath(__file__))) + "/"
-recpath = "/home/ftpusr/ftp3/Recording/"
+recpath = "/home/ftpusr/ftp-tmp/Recording/"
 ftpusr = "/home/ftpusr/ftp-tmp"
 dualtest = ftpusr + "/Encode-Test/DualAudioTest"
 if __name__ == "__main__":
@@ -49,5 +50,7 @@ if __name__ == "__main__":
     #print rec10d.rec10db.select_all_status()
     #print str(status.getBSCSRecording())
     #print str(status.getTERecording())
-    xml2db.xml2db("te18.xml", "te20")
+    #xml2db.xml2db("te18.xml", "te20")
+    #classify.detNameType("te#st#25")
+    #classify.detNameType("te#st#32 subtest")
     ""
\ No newline at end of file