fix many bugs.

[rec10/rec10-git.git] / rec10 / trunk / src / recdblist.py

diff --git a/rec10/trunk/src/recdblist.py b/rec10/trunk/src/recdblist.py
index ce7f47c..1b60dc9 100644 (file)
--- a/rec10/trunk/src/recdblist.py
+++ b/rec10/trunk/src/recdblist.py
@@ -76,7 +76,7 @@ REC_BAYES_SUGGEST ="bayes_suggest"
 global BONTSDEMUX_DELAY\r
 BONTSDEMUX_DELAY="0"\r
 \r
-version = 100\r
+version = 101\r
 version_str="0.9.10"\r
 \r
 global verbose_level_now\r
@@ -107,11 +107,14 @@ def printuft8ex(unicode,verbose_level=500,log_level=500):
             f.write(str+"\n")\r
             f.close()\r
 def addCommonlogEX(type,place,inst,txt,verbose_level=500,log_level=500):\r
-    lt=datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")+u":"\r
+    lt=unicode(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))+u":"\r
     if txt=="":\r
         lt=lt+u"["+type+u"] "+place+u" "+inst\r
     else:\r
-        lt=lt+u"["+type+u"] "+place+u" "+inst+u"\n"+txt\r
+        try:\r
+            lt=lt+u"["+type+u"] "+place+u" "+inst+u"\n"+txt\r
+        except:\r
+            print [type,place,inst,txt]\r
     lt=lt.encode('utf-8')\r
     logfname="/var/log/rec10"\r
     mode="a"\r
@@ -125,16 +128,26 @@ def addCommonlogEX(type,place,inst,txt,verbose_level=500,log_level=500):
 def addCommandLog(tspath,log_title,cmd,cmd_log=""):\r
     addLog(tspath,cmd,log_title+u"ログ-コマンド")\r
     addLog(tspath,cmd_log,log_title+u"ログ-詳細")\r
-def addCommandLogTar(tspath,log_title,log_filename_add,cmd,cmd_log=""):\r
+def addCommandLogZip(tspath,log_title,log_filename_add,cmd,cmd_log=""):\r
     logtitle=getLogTitle(tspath)\r
     logo=logtitle+"."+log_filename_add+".log"\r
-    logtar=logtitle+"_log.tar.bz2"\r
+    logzip=logtitle+".log.zip"\r
     addLogAll(tspath,cmd+"\n\n"+cmd_log,log_title,logo)\r
-    import tar\r
-    tar.addFile2FileBZ2(logo,logtar)\r
+    import zip\r
+    zip.addFile2FileZip(logo,logzip)\r
+    os.remove(logo)\r
 def addCommandSelfLog(tspath,command):\r
     logpath=getLogTitle(tspath)+".command.log"\r
-    os.system(u"cat "+logpath+" >> "+logpath)\r
+    f=""\r
+    if os.path.exists(logpath):\r
+        f=open(logpath,'a')\r
+    else:\r
+        f=open(logpath,'w')\r
+    tc=command+u"\n\n"\r
+    tc=unicode(tc)\r
+    f.write(tc.encode("utf-8"))\r
+    #f.write(tc.encode('utf-8','ignore'))\r
+    f.close()\r
 def getLogTitle(tspath):\r
     logo=tspath\r
     logo=logo.replace("_1.wav",".ts")\r
@@ -154,6 +167,7 @@ def getLogTitle(tspath):
     logo=logo.replace(".mp3",".ts")\r
     logo=logo.replace(".aac",".ts")\r
     logo=logo.replace(".srt",".ts")\r
+    logo=logo.replace(".264",".ts")\r
     logo=logo.replace(".ts","")\r
     return logo\r
 def addLog(tspath,txt,log_title,maxtextlength=1500):\r