rec10 git
Revision | d7f5926e68d9d12f9bc9e529948250baf4406de8 (tree) |
---|---|
Zeit | 2013-11-13 11:43:07 |
Autor | gn64_jp <gn64@rec1...> |
Commiter | gn64_jp |
classify : fix DB id undefined.
@@ -1,7 +1,7 @@ | ||
1 | 1 | #!/usr/bin/python |
2 | 2 | # coding: UTF-8 |
3 | 3 | # Rec10 TS Recording Tools |
4 | -# Copyright (C) 2009-2011 Yukikaze | |
4 | +# Copyright (C) 2009-2013 Yukikaze,long.inus | |
5 | 5 | |
6 | 6 | import os |
7 | 7 | import os.path |
@@ -18,7 +18,7 @@ recpath=unicode(configreader.getConfPath("recpath"),'utf-8') | ||
18 | 18 | |
19 | 19 | if __name__ == "__main__": |
20 | 20 | usage="usage: %prog read -h" |
21 | - version="%prog 0.9.4" | |
21 | + version="%prog 0.9.10" | |
22 | 22 | parser=optparse.OptionParser(usage=usage,version=version) |
23 | 23 | 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)") |
24 | 24 | parser.add_option("-A","--Auto",action="store_true",dest="auto",default=False,help="auto classifying mode(not a test)") |
@@ -1,7 +1,7 @@ | ||
1 | 1 | #!/usr/bin/python |
2 | 2 | # coding: UTF-8 |
3 | 3 | # Rec10 TS Recording Tools |
4 | -# Copyright (C) 2009-2012 Yukikaze | |
4 | +# Copyright (C) 2009-2013 Yukikaze | |
5 | 5 | import MySQLdb |
6 | 6 | import recdblist |
7 | 7 | import warnings |
@@ -66,6 +66,7 @@ class DB_MySQL: | ||
66 | 66 | self.new_in_settings() |
67 | 67 | self.new_auto_timeline_bayes() |
68 | 68 | self.new_auto_timeline_keyword() |
69 | + self.new_auto_classify() | |
69 | 70 | def connect_db(self): |
70 | 71 | """ |
71 | 72 | dbへの接続 |
@@ -1239,6 +1240,7 @@ vim ") | ||
1239 | 1240 | db[1].execute('\ |
1240 | 1241 | CREATE TABLE auto_classify \ |
1241 | 1242 | (\ |
1243 | + id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,\ | |
1242 | 1244 | frompath VARCHAR(1024),\ |
1243 | 1245 | topath VARCHAR(1024),\ |
1244 | 1246 | do BOOLEAN\ |
@@ -1364,4 +1366,13 @@ vim ") | ||
1364 | 1366 | self.change_installed_in_status(1) |
1365 | 1367 | self.change_version_in_status("102") |
1366 | 1368 | #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()#チャンネルスキャンをさせる | |
1367 | 1378 |
@@ -1,7 +1,7 @@ | ||
1 | 1 | #!/usr/bin/python |
2 | 2 | # coding: UTF-8 |
3 | 3 | # Rec10 TS Recording Tools |
4 | -# Copyright (C) 2009-2011 Yukikaze | |
4 | +# Copyright (C) 2009-2013 Yukikaze | |
5 | 5 | import time |
6 | 6 | import os.path |
7 | 7 | import ConfigParser |
@@ -304,5 +304,8 @@ def update_db(version): | ||
304 | 304 | rec10d.rec10db.update_db_100to101() |
305 | 305 | elif version==101: |
306 | 306 | rec10d.rec10db.update_db_100to102() |
307 | + elif version==102: | |
308 | + rec10d.rec10db.update_db_102to103() | |
309 | + | |
307 | 310 | if __name__ == "__main__": |
308 | 311 | move() |
@@ -1,8 +1,8 @@ | ||
1 | 1 | ########################################### |
2 | 2 | # Rec10 -Ts Recording system- # |
3 | 3 | # 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 # | |
6 | 6 | ########################################### |
7 | 7 | |
8 | 8 | 本ソフトはpythonおよびperlによって書かれた録画ツールです。 |
@@ -1,7 +1,7 @@ | ||
1 | 1 | #!/usr/bin/python |
2 | 2 | # coding: UTF-8 |
3 | 3 | # Rec10 TS Recording Tools |
4 | -# Copyright (C) 2009-2011 Yukikaze | |
4 | +# Copyright (C) 2009-2013 Yukikaze | |
5 | 5 | |
6 | 6 | """ |
7 | 7 | task names |
@@ -76,7 +76,7 @@ REC_BAYES_SUGGEST ="bayes_suggest" | ||
76 | 76 | global BONTSDEMUX_DELAY |
77 | 77 | BONTSDEMUX_DELAY="0" |
78 | 78 | |
79 | -version = 102 | |
79 | +version = 103 | |
80 | 80 | version_str="0.9.10" |
81 | 81 | |
82 | 82 | global verbose_level_now |