make it more easy to read.

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

diff --git a/rec10/trunk/src/recdb.py b/rec10/trunk/src/recdb.py
index 048868f..a6d7ee0 100644 (file)
--- a/rec10/trunk/src/recdb.py
+++ b/rec10/trunk/src/recdb.py
@@ -21,11 +21,7 @@ except:
     db.commit()
     db.close()
 def recreserv(title,chtxt,btime,etime,opt):#optにはa(アニメ)d(副音声)v(xvid)
-    db=sqlite3.connect(dbpath)
-    recline="\"res\",\""+chtxt+"\",\""+title+"\",datetime(\""+btime+"\"),datetime(\""+etime+"\"),\""+opt+"\""
-    db.execute('insert into rectime ("type","chtxt","title","btime","etime","opt") values ('+recline+')')
-    db.commit()
-    db.close()
+    rec_reckey("res",title,chtxt,btime,etime,opt)
 def keyreserv(keyword,chtxt,btime,etime,deltatime,opt):
     db=sqlite3.connect(dbpath)
     recline="\"key\",\""+chtxt+"\",\""+keyword+"\",datetime(\""+btime+"\"),datetime(\""+etime+"\"),\""+deltatime+"\",\""+opt+"\""
@@ -39,25 +35,11 @@ def everyreserv(keyword,chtxt,btime,etime,deltatime,opt,deltaday):
     db.commit()
     db.close()
 def lastrecreserv(title,chtxt,btime,etime,opt):#optにはa(アニメ)d(副音声)v(xvid)##btimeなどは2006-07-17 13:25:23の形
-    db=sqlite3.connect(dbpath)
-    recline="\"rec\",\""+chtxt+"\",\""+title+"\",datetime(\""+btime+"\"),datetime(\""+etime+"\"),\""+opt+"\""
-    #db.execute('insert into rectime ("type","chtxt","title","btime","etime","opt") values ('+recline+')')
-    db.execute('insert into rectime (type,chtxt,title,btime,etime,opt) values ('+recline+')')
-    db.commit()
-    db.close()
+    rec_reckey("rec",title,chtxt,btime,etime,opt)
 def misrecwrite(title,chtxt,btime,etime,opt):
-    db=sqlite3.connect(dbpath)
-    recline="\"miss\",\""+chtxt+"\",\""+title+"\",datetime(\""+btime+"\"),datetime(\""+etime+"\"),\""+opt+"\""
-    #db.execute('insert into rectime ("type","chtxt","title","btime","etime","opt") values ('+recline+')')
-    db.execute('insert into rectime (type,chtxt,title,btime,etime,opt) values ('+recline+')')
-    db.commit()
-    db.close()
+    rec_reckey("miss",title,chtxt,btime,etime,opt)
 def recend(title,chtxt,btime,etime,opt):#optにはa(アニメ)d(副音声)v(xvid)
-    db=sqlite3.connect(dbpath)
-    recline="\"end\",\""+chtxt+"\",\""+title+"\",datetime(\""+btime+"\"),datetime(\""+etime+"\"),\""+opt+"\""
-    db.execute('insert into rectime ("type","chtxt","title","btime","etime","opt") values ('+recline+')')
-    db.commit()
-    db.close()
+    rec_reckey("end",title,chtxt,btime,etime,opt)
 def rec_reckey(type,title,chtxt,btime,etime,opt):
     db=sqlite3.connect(dbpath)
     recline="\""+type+"\",\""+chtxt+"\",\""+title+"\",datetime(\""+btime+"\"),datetime(\""+etime+"\"),\""+opt+"\""
@@ -65,31 +47,21 @@ def rec_reckey(type,title,chtxt,btime,etime,opt):
     db.commit()
     db.close()
 def delrec(title,chtxt,btime):
-    db=sqlite3.connect(dbpath)
-    db.execute("delete from rectime where type = \'res\' AND title = \'"+title+"\' AND chtxt = \'"+chtxt+"\' AND btime = datetime(\""+btime+"\")")
-    db.commit()
-    db.close()
+    del_reckey("res",title,chtxt,btime)
 def delkey(keyword,chtxt,btime,deltatime):
     db=sqlite3.connect(dbpath)
     db.execute("delete from rectime where deltatime = \'"+deltatime+"\' AND type = \'key\' AND title = \'"+keyword+"\' AND chtxt = \'"+chtxt+"\' AND btime = datetime(\""+btime+"\")")
     db.commit()
     db.close()
 def dellastrec(title,chtxt,btime):
-    db=sqlite3.connect(dbpath)
-    db.execute("delete from rectime where type = \'rec\' AND title = \'"+title+"\' AND chtxt = \'"+chtxt+"\' AND btime = datetime(\""+btime+"\")")
-    db.commit()
-    db.close()
+    del_reckey("rec",title,chtxt,btime)
 def delevery(keyword,chtxt,btime,deltatime,deltaday):
     db=sqlite3.connect(dbpath)
     db.execute("delete from rectime where deltaday = \'"+deltaday+"\' AND deltatime = \'"+deltatime+"\' AND type = \'keyevery\' AND title = \'"+keyword+"\' AND chtxt = \'"+chtxt+"\' AND btime = datetime(\""+btime+"\")")
     db.commit()
     db.close()
 def delend(title,chtxt,btime):
-    db=sqlite3.connect(dbpath)
-    db.execute("delete from rectime where type = \'end\' AND title = \'"+title+"\' AND chtxt = \'"+chtxt+"\' AND btime = datetime(\""+btime+"\")")
-    db.commit()
-    db.close()
-
+    del_reckey("end",title,chtxt,btime)
 def deltitle(key):
     db=sqlite3.connect(dbpath)
     i=0
@@ -104,19 +76,6 @@ def del_reckey(type,title,chtxt,btime):
     db.execute("delete from rectime where type = \'"+type+"\' AND title = \'"+title+"\' AND chtxt = \'"+chtxt+"\' AND btime = datetime(\""+btime+"\")")
     db.commit()
     db.close()
-"""def delkeyword(key):
-    db=sqlite3.connect(dbpath)
-    i=0
-    #print "SELECT * FROM rectime WHERE keyword like \'%"+key+"+%\'"
-    for keyword in db.execute("SELECT * FROM rectime WHERE keyword like \'%"+key+"%\'"):
-        i=i+1
-        print keyword
-    print i
-    if i==1:
-        db.execute("delete from rectime where keyword like \'%"+key+"%\'")
-    db.commit()
-    db.close()
-    """
 def getnow(dhour):
     db=sqlite3.connect(dbpath)
     recdata=[]
@@ -135,80 +94,6 @@ def getnow(dhour):
             ret['deltatime']=deltatime
             ret['deltaday']=deltaday
         recdata.append(ret)
-        """
-        if typet=='res':
-            ret={}
-            ret['type']='res'
-            ret['chtxt']=chtxt
-            ret['title']=title.encode('utf-8')
-            ret['btime']=btime
-            ret['etime']=etime
-            ret['opt']=opt
-            #print ret
-            recdata.append(ret)
-        elif typet=='rec':
-            ret={}
-            ret['type']='rec'
-            ret['chtxt']=chtxt
-            ret['title']=title.encode('utf-8')
-            ret['btime']=btime
-            ret['etime']=etime
-            ret['opt']=opt
-            #print title.encode('utf-8')
-            recdata.append(ret)
-        elif typet=='key':
-            ret={}
-            ret['type']='key'
-            ret['chtxt']=chtxt
-            ret['title']=title.encode('utf-8')
-            ret['btime']=btime
-            ret['etime']=etime
-            ret['deltatime']=deltatime
-            ret['opt']=opt
-            recdata.append(ret)
-        elif typet=='keyevery':
-            ret={}
-            ret['type']='keyevery'
-            ret['chtxt']=chtxt
-            ret['title']=title.encode('utf-8')
-            ret['btime']=btime
-            ret['etime']=etime
-            ret['deltatime']=deltatime
-            ret['opt']=opt
-            ret['deltaday']=deltaday
-            recdata.append(ret)
-        elif typet=='end':
-            ret={}
-            ret['type']='end'
-            ret['chtxt']=chtxt
-            ret['title']=title.encode('utf-8')
-            ret['btime']=btime
-            ret['etime']=etime
-            ret['opt']=opt
-            #print ret
-            recdata.append(ret)
-        elif typet=='miss':
-            ret={}
-            ret['type']='miss'
-            ret['chtxt']=chtxt
-            ret['title']=title.encode('utf-8')
-            ret['btime']=btime
-            ret['etime']=etime
-            ret['opt']=opt
-            #print ret
-            recdata.append(ret)
-        elif typet=='b25-avi':
-            ret={}
-            ret['type']='b25-avi'
-            ret['chtxt']=chtxt
-            ret['title']=title.encode('utf-8')
-            ret['btime']=btime
-            ret['etime']=etime
-            ret['opt']=opt
-            #print ret
-            recdata.append(ret)
-
-        """
     db.commit()
     db.close()
     return recdata
@@ -229,57 +114,5 @@ def getall():
             ret['deltatime']=deltatime
             ret['deltaday']=deltaday
         recdata.append(ret)
-        """
-        if typet=='res':
-            ret={}
-            ret['type']='res'
-            ret['chtxt']=chtxt
-            ret['title']=title.encode('utf-8')
-            ret['btime']=btime
-            ret['etime']=etime
-            ret['opt']=opt
-            #print ret
-            recdata.append(ret)
-        elif typet=='rec':
-            ret={}
-            ret['type']='rec'
-            ret['chtxt']=chtxt
-            ret['title']=title.encode('utf-8')
-            ret['btime']=btime
-            ret['etime']=etime
-            ret['opt']=opt
-            #print ret
-            recdata.append(ret)
-        elif typet=='key':
-            ret={}
-            ret['type']='key'
-            ret['chtxt']=chtxt
-            ret['title']=title.encode('utf-8')
-            ret['btime']=btime
-            ret['deltatime']=deltatime
-            ret['opt']=opt
-            recdata.append(ret)
-        elif typet=='keyevery':
-            ret={}
-            ret['type']='keyevery'
-            ret['chtxt']=chtxt
-            ret['title']=title.encode('utf-8')
-            ret['btime']=btime
-            ret['deltatime']=deltatime
-            ret['opt']=opt
-            ret['deltaday']=deltaday
-            recdata.append(ret)
-        if typet=='miss':
-            ret={}
-            ret['type']='miss'
-            ret['chtxt']=chtxt
-            ret['title']=title.encode('utf-8')
-            ret['btime']=btime
-            ret['etime']=etime
-            ret['opt']=opt
-            #print ret
-            recdata.append(ret)
-
-            """
     db.close()
     return recdata