change mobile encode option

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

diff --git a/rec10/trunk/src/readme.txt b/rec10/trunk/src/readme.txt
index 5b1c10d..b4401e2 100644 (file)
--- a/rec10/trunk/src/readme.txt
+++ b/rec10/trunk/src/readme.txt
@@ -77,6 +77,8 @@ BonTsDemuxを最新版へ(nogui化によりXvfbが不要)
 epg_chを変更(ontvの削除)
 チャンネルスキャン機能を実装
 キーワード予約の自動実行オプション追加(in_auto_jbkにauto,optの追加)
+番組初頭の解像度変更に対応
+キーワード予約自動実行オプションの重複チェック実装
 
 10/10/09 0.9.8 release
 インターレース保持エンコードに対応

diff --git a/rec10/trunk/src/recdb.py b/rec10/trunk/src/recdb.py
index f912ade..4597da0 100644 (file)
--- a/rec10/trunk/src/recdb.py
+++ b/rec10/trunk/src/recdb.py
@@ -77,4 +77,11 @@ def getall():
 def rec_reclog(title,chtxt,btime,etime,opt,exp,longexp,category):
     rec10d.rec10db.add_in_timeline_log(chtxt,title,btime,etime,opt,exp,longexp,category)
 def get_key():
-    return rec10d.rec10db.select_all_in_auto_jbk_key()
\ No newline at end of file
+    return rec10d.rec10db.select_all_in_auto_jbk_key()
+def checkduplicate(title,chtxt,epgbtime,epgetime):
+    tl=rec10dbselect_byepgtime_all_timeline(epgbtime,epgetime)
+    dup=0
+    for t in tl:
+        if t["title"]==title and t["chtxt"]==chtxt:
+            dup=1
+    return dup
\ No newline at end of file

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index bf92503..bae739b 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -280,8 +280,8 @@ def search_keyword(key):
                             maxnum=epgdb.count_schedule_timeline(btimet, etimet)[0]
                             maxnum=int(configreader.getenv("te_max"))-maxnum
                         if maxnum>0:
-                            topt=status.getSettings_auto_opt()
-                            recdb.recreserv(titlet,chtxtt, btimet, etimet,topt)
+                            if recdb.checkduplicate(titlet, chtxtt, btimet, etimet)==0:
+                                recdb.recreserv(titlet,chtxtt, btimet, etimet,topt)
                     except Exception, inst:
                         recdblist.Commonlogex("Error", "search_keyword_auto_jbk(timerec.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
                 else: