OSDN Git Service
(root)
/
rec10
/
rec10-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add tsid channel information for complete BS support.
[rec10/rec10-git.git]
/
rec10
/
trunk
/
src
/
timerec.py
diff --git
a/rec10/trunk/src/timerec.py
b/rec10/trunk/src/timerec.py
index
f93d680
..
fd5068f
100644
(file)
--- a/
rec10/trunk/src/timerec.py
+++ b/
rec10/trunk/src/timerec.py
@@
-1,7
+1,7
@@
#!/usr/bin/python
# coding: UTF-8
# Rec10 TS Recording Tools
#!/usr/bin/python
# coding: UTF-8
# Rec10 TS Recording Tools
-# Copyright (C) 2009-201
1
Yukikaze
+# Copyright (C) 2009-201
2
Yukikaze
import datetime
import os
import os.path
import datetime
import os
import os.path
@@
-337,7
+337,7
@@
def type_reserve(typetxt,chtxt,title,bt,et,opt):
if (dt < 58 * 60 and dt > 30 * 60):
bctypet = chdb.searchCHFromChtxt(chtxt)['bctype']
chdatat = rec10d.rec10db.select_by_bctype_epg_ch(bctypet)
if (dt < 58 * 60 and dt > 30 * 60):
bctypet = chdb.searchCHFromChtxt(chtxt)['bctype']
chdatat = rec10d.rec10db.select_by_bctype_epg_ch(bctypet)
- dt1 = bt - datetime.datetime.strptime(chdatat[0][
4
], "%Y-%m-%d %H:%M:%S")
+ dt1 = bt - datetime.datetime.strptime(chdatat[0][
5
], "%Y-%m-%d %H:%M:%S")
dt1 = dt1.days * 24 * 60 * 60 + dt1.seconds
if dt1 < 60 * 60:
recdata = epgdb.searchTime(title, btime, "5", chtxt)
dt1 = dt1.days * 24 * 60 * 60 + dt1.seconds
if dt1 < 60 * 60:
recdata = epgdb.searchTime(title, btime, "5", chtxt)
@@
-365,7
+365,7
@@
def type_reserve(typetxt,chtxt,title,bt,et,opt):
else:
recdblist.printutf8(u"追いかけ機能エラー:番組データが見付かりません。")
else:
else:
recdblist.printutf8(u"追いかけ機能エラー:番組データが見付かりません。")
else:
- if rec10d.rec10db.select_by_bctype_epg_ch(bctypet)[0][
5
] != "0":
+ if rec10d.rec10db.select_by_bctype_epg_ch(bctypet)[0][
6
] != "0":
rec10d.rec10db.update_status_by_bctype_epg_ch(bctypet, "3")
sys.exit()
elif (dt <= 30 * 60 and dt > 20 * 60):
rec10d.rec10db.update_status_by_bctype_epg_ch(bctypet, "3")
sys.exit()
elif (dt <= 30 * 60 and dt > 20 * 60):