• R/O
  • HTTP
  • SSH
  • HTTPS

rec10-git: Commit

rec10 git


Commit MetaInfo

Revisiond7f5926e68d9d12f9bc9e529948250baf4406de8 (tree)
Zeit2013-11-13 11:43:07
Autorgn64_jp <gn64@rec1...>
Commitergn64_jp

Log Message

classify : fix DB id undefined.

Ändern Zusammenfassung

Diff

--- a/rec10/classify.py
+++ b/rec10/classify.py
@@ -1,7 +1,7 @@
11 #!/usr/bin/python
22 # coding: UTF-8
33 # Rec10 TS Recording Tools
4-# Copyright (C) 2009-2011 Yukikaze
4+# Copyright (C) 2009-2013 Yukikaze,long.inus
55
66 import os
77 import os.path
@@ -18,7 +18,7 @@ recpath=unicode(configreader.getConfPath("recpath"),'utf-8')
1818
1919 if __name__ == "__main__":
2020 usage="usage: %prog read -h"
21- version="%prog 0.9.4"
21+ version="%prog 0.9.10"
2222 parser=optparse.OptionParser(usage=usage,version=version)
2323 parser.add_option("-s","--search",action="store",type="string",dest="ltitle",default="",metavar="TITLE",help="test to search where the title should be contained(test for -e)")
2424 parser.add_option("-A","--Auto",action="store_true",dest="auto",default=False,help="auto classifying mode(not a test)")
--- a/rec10/dbMySQL.py
+++ b/rec10/dbMySQL.py
@@ -1,7 +1,7 @@
11 #!/usr/bin/python
22 # coding: UTF-8
33 # Rec10 TS Recording Tools
4-# Copyright (C) 2009-2012 Yukikaze
4+# Copyright (C) 2009-2013 Yukikaze
55 import MySQLdb
66 import recdblist
77 import warnings
@@ -66,6 +66,7 @@ class DB_MySQL:
6666 self.new_in_settings()
6767 self.new_auto_timeline_bayes()
6868 self.new_auto_timeline_keyword()
69+ self.new_auto_classify()
6970 def connect_db(self):
7071 """
7172 dbへの接続
@@ -1239,6 +1240,7 @@ vim ")
12391240 db[1].execute('\
12401241 CREATE TABLE auto_classify \
12411242 (\
1243+ id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,\
12421244 frompath VARCHAR(1024),\
12431245 topath VARCHAR(1024),\
12441246 do BOOLEAN\
@@ -1364,4 +1366,13 @@ vim ")
13641366 self.change_installed_in_status(1)
13651367 self.change_version_in_status("102")
13661368 #self.change_installed_in_status()#チャンネルスキャンをさせる
1369+ def update_db_102to103(sekf):
1370+ self.drop_in_settings()
1371+ self.new_in_settings()
1372+ self.new_epg_ch()
1373+ self.new_auto_classify()
1374+ self.close_db(db)
1375+ self.change_installed_in_status(1)
1376+ self.change_version_in_status("103")
1377+ #self.change_installed_in_status()#チャンネルスキャンをさせる
13671378
--- a/rec10/install.py
+++ b/rec10/install.py
@@ -1,7 +1,7 @@
11 #!/usr/bin/python
22 # coding: UTF-8
33 # Rec10 TS Recording Tools
4-# Copyright (C) 2009-2011 Yukikaze
4+# Copyright (C) 2009-2013 Yukikaze
55 import time
66 import os.path
77 import ConfigParser
@@ -304,5 +304,8 @@ def update_db(version):
304304 rec10d.rec10db.update_db_100to101()
305305 elif version==101:
306306 rec10d.rec10db.update_db_100to102()
307+ elif version==102:
308+ rec10d.rec10db.update_db_102to103()
309+
307310 if __name__ == "__main__":
308311 move()
--- a/rec10/readme.txt
+++ b/rec10/readme.txt
@@ -1,8 +1,8 @@
11 ###########################################
22 # Rec10 -Ts Recording system- #
33 # Ver.0.9.10 #
4-# 2012/05/12 Yukikaze & long.inus #
5-# Copyright (C) 2009-2012 Yukikaze #
4+# 2013/11/12 Yukikaze & long.inus #
5+# Copyright (C) 2009-2013 Yukikaze #
66 ###########################################
77
88 本ソフトはpythonおよびperlによって書かれた録画ツールです。
--- a/rec10/recdblist.py
+++ b/rec10/recdblist.py
@@ -1,7 +1,7 @@
11 #!/usr/bin/python
22 # coding: UTF-8
33 # Rec10 TS Recording Tools
4-# Copyright (C) 2009-2011 Yukikaze
4+# Copyright (C) 2009-2013 Yukikaze
55
66 """
77 task names
@@ -76,7 +76,7 @@ REC_BAYES_SUGGEST ="bayes_suggest"
7676 global BONTSDEMUX_DELAY
7777 BONTSDEMUX_DELAY="0"
7878
79-version = 102
79+version = 103
8080 version_str="0.9.10"
8181
8282 global verbose_level_now
Show on old repository browser