fix data format.

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

diff --git a/rec10/trunk/src/classify.py b/rec10/trunk/src/classify.py
index 54a758b..6b963e2 100644 (file)
--- a/rec10/trunk/src/classify.py
+++ b/rec10/trunk/src/classify.py
@@ -175,12 +175,16 @@ def getTitle(title):
     tT2=rT2.match(title)
     rT3=re.compile("(.+)_(.+)_\d-\d-\dT\d:\d:\d\Z")#_(aichi)_2010-02-06T01:59:00.mkv
     tT3=rT3.match(title)
+    rT4=re.compile("(.+)_(.+)_\d-\d-\dT\d-\d-\d\Z")#_(aichi)_2010-02-06T01-59-00.mkv
+    tT4=rT4.match(title)
     ntitle=title
     if tT :
         ntitle=tT.group(0)
     elif tT2:
-        ntitle=tT3.group(0)
+        ntitle=tT2.group(0)
     elif tT3:
+        ntitle=tT3.group(0)
+    elif tT4:
         ntitle=tT4.group(0)
     return ntitle
 def execMove(title,temppath,recpath):

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 48e9d1b..ddb0182 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -350,7 +350,9 @@ def type_final(typetxt,chtxt,title,bt,et,opt):
                 iff=u"("+configreader.getenv("iff")+u")_"
             except:
                 iff=""
-            newtitle=newtitle+u"_"+iff+bt.strftime("%Y-%m-%dT%H:%M:%S")
+            newtime=bt
+            newtime=newtime+datetime.timedelta(seconds=10)
+            newtitle=newtitle+u"_"+iff+newtime.strftime("%Y-%m-%dT%H-%M-%S")
         recdb.rec_reckey(typetxting, newtitle, chtxt, btime, etime, opt)
         recdblist.printutf8(u"録画開始 "+newtitle+" "+btime+" "+etime)
         tv2avi.timetv2b25(recpath + "/" + newtitle + ".avi", chtxt, btime, etime, opt)