OSDN Git Service

simplify many codes.
authorgn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Tue, 1 Sep 2009 09:06:18 +0000 (09:06 +0000)
committergn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Tue, 1 Sep 2009 09:06:18 +0000 (09:06 +0000)
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@140 4e526526-5e11-4fc0-8910-f8fd03428081

Rec10WEB/trunk/src/finover.htm [deleted file]
Rec10WEB/trunk/src/iepg_fin.htm [deleted file]
Rec10WEB/trunk/src/rec10web.py
Rec10WEB/trunk/src/rec10web_dbMySQL.py
Rec10WEB/trunk/src/rswi.htm
Rec10WEB/trunk/src/rswi_edit.htm [deleted file]

diff --git a/Rec10WEB/trunk/src/finover.htm b/Rec10WEB/trunk/src/finover.htm
deleted file mode 100644 (file)
index c2ab3d2..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <meta http-equiv="refresh" content="3; url=rec10web.py">
-        <title>Rec10 Simple Web Interface ver.0.7.0</title>
-    </head>
-    <body>
-    <h1>Rec10 Simple Web Interface ver.0.7.0</h1><br>
-    <br>
-    最大録画可能数を越えています。
-    </body>
-</html>
diff --git a/Rec10WEB/trunk/src/iepg_fin.htm b/Rec10WEB/trunk/src/iepg_fin.htm
deleted file mode 100644 (file)
index 3c410b4..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <title></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  </head>
-  <body>
-    <h1>Rec10 Simple Web Interface ver.0.7.0</h1><br>
-    epgデータの追加を完了しました。<br>
-    録画を行う場合はもう一度おねがいします。<br>
-  </body>
-</html>
index b6a1e66..faf4101 100644 (file)
@@ -237,22 +237,11 @@ def readHtmlSrcSimple():
     ret=f.read()
     f.close()
     return ret
-def readHtmlEdit():
-    f = open(path+'rswi_edit.htm')
-    ret=f.read()
-    f.close()
-    return ret
-
 def readRecFinisSimple():
     f = open(path+'fin.htm')
     ret=f.read()
     f.close()
     return ret
-def readRecFinisOver():
-    f = open(path+'finover.htm')
-    ret=f.read()
-    f.close()
-    return ret
 def readRecSchedule():
     f = open(path+'schedule.htm')
     ret=f.read()
@@ -263,11 +252,6 @@ def readiEPGadd():
     ret=f.read()
     f.close()
     return ret
-def readiEPGfin():
-    f = open(path+'iepg_fin.htm')
-    ret=f.read()
-    f.close()
-    return ret
 def readiEPGshow():
     f = open(path+'iepg_show.htm')
     ret=f.read()
@@ -291,6 +275,14 @@ def mode_iepg_fin():
 def mode_iepg_show():
     htmdate=readiEPGshow()
     return htmdate
+def mode_iepg_del():
+    s="epgデータを削除しました。"
+    u="rec10web.py?exec=iepg-show"
+    return get_fin(s,u)
+def mode_iepg_del_miss():
+    s="epgデータの削除に失敗しました。"
+    u="rec10web.py?exec=iepg-show"
+    return get_fin(s,u)
 def mode_schedule():
     htmdate=readRecSchedule()
     return htmdate
@@ -299,14 +291,15 @@ def mode_recfin():
     u="rec10web.py?exec=schedule"
     return get_fin(s,u)
 def mode_recover():
-    s="予約が終了しました。移動します。"
+    s="最大予約可能数を超えています"
     u="rec10web.py?exec=schedule"
     return get_fin(s,u)
-def mode_del():
-    ""
+def mode_normal():
+    htmdate=readHtmlSrcSimple()
+    htmdate=htmdate.replace("<!--exec-value//-->","yes")
 def mode_edit():
     editnum=exect.replace("edit:","")
-    htmdate= readHtmlEdit()
+    htmdate= readHtmlSrcSimple()
     iddata=edit_date(editnum)
     htmdate=htmdate.replace("<!--text_for_replace_chtxt_input//-->",getchtxt())
     htmdate=htmdate.replace("<!--ch-value//-->",iddata['chtxt'])
@@ -398,7 +391,7 @@ elif exect=="iepg-add_yes":
     mode="iepg-add-yes"
 elif exect=="iepg-del":
     mode="iepg-del"
-htmdate= readHtmlSrcSimple()
+htmdate= mode_normal()
 htmdate=htmdate.replace("<!--text_for_replace_chtxt_input//-->",getchtxt())
 htmdate=htmdate.replace("<!--btime-value//-->",btime)
 htmdate=htmdate.replace("<!--etime-value//-->",etime)
@@ -434,7 +427,7 @@ if f.getfirst('type')=="keyday":
     if rett=="":
         htmdate=mode_recfin()
     else:
-        htmdate=readRecFinisOver()
+        htmdate=mode_recover()
     chtxt=""
     exect=""
 if (chtxt != "")and(title != "")and(btime!="")and(etime!="")and(opts!="")and(exect=="yes"):
@@ -442,7 +435,7 @@ if (chtxt != "")and(title != "")and(btime!="")and(etime!="")and(opts!="")and(exe
     if restxt=="":
         htmdate=mode_recfin()
     elif restxt=="over":
-        htmdate=readRecFinisOver()
+        htmdate=mode_recover()
     exect=""
 if (chtxt != "")and(title != "")and(btime!="")and(etime!="")and(opts!="")and(re.search('edit-exec:',exect)):
     editnum=exect.replace("edit-exec:","")
@@ -450,7 +443,7 @@ if (chtxt != "")and(title != "")and(btime!="")and(etime!="")and(opts!="")and(re.
     if restxt=="":
         htmdate=mode_recfin()
     elif restxt=="over":
-        htmdate=readRecFinisOver()
+        htmdate=mode_recover()
     exect=""
 if mode=="schedule":
     htmdate=mode_normal()
@@ -470,7 +463,15 @@ elif mode=="iepg-show":
     getiEPGDate()
     htmdate=mode_iepg_show()
 elif mode=="iepg-del":
-    print f
+    s=f.getfirst('iepgdelnum')
+    htmdate=""
+    try:
+        for st in s.split(","):
+            if st!="":
+                database.del_by_id_iepg(st)
+        htmdate=mode_iepg_del()
+    except:
+        htmdate=mode_iepg_del_miss()
 print "Content-Type: text/html"
 print htmdate
 #print exect
index b8b6f88..d439363 100644 (file)
@@ -200,6 +200,12 @@ class DB_MySQL:
         db=self.connect_db()
         db[1].execute('INSERT IGNORE INTO iepg (station,chtxt) VALUES (%s,%s)', (station,chtxt))
         self.close_db(db)
+    def del_by_id_iepg(self,num):
+        db=self.connect_db()
+        db[1].execute("DELETE FROM iepg \
+        WHERE id=%s",\
+        (num,))
+        self.close_db(db)
     def select_by_chtxt_iepg(self,chtxt):
         db=self.connect_db()
         db[1].execute("\
index e8d074f..a010ddd 100644 (file)
         </div><div dojoType="dijit.form.Button" type="submit">予約</div>
         <div name="exec"
              dojoType="dijit.form.ValidationTextBox"
-             value="yes"
+             value="<!--exec-value//-->"
              style="display:none";>
              </div>
     </body>
diff --git a/Rec10WEB/trunk/src/rswi_edit.htm b/Rec10WEB/trunk/src/rswi_edit.htm
deleted file mode 100644 (file)
index f0f7730..0000000
+++ /dev/null
@@ -1,421 +0,0 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title>Rec10 Simple Web Interface ver.0.6.0 編集画面</title>
-        <!-- dojo.jsの読み込み -->
-        <script src="./dojo/dojo/dojo.js" djConfig="parseOnLoad:true">
-        </script>
-        <!-- テーマの読み込み -->
-        <style type="text/css">
-            @import "./dojo/dojo/resources/dojo.css";
-            @import "./dojo/dijit/themes/tundra/tundra.css";
-
-
-        </style>
-        <script type="text/javascript">
-
-            dojo.require("dojo.parser");
-            // ※ ここで、使用するウィジェットの読み込みを行う
-
-            dojo.require("dijit.form.Button");
-            dojo.require("dijit.form.FilteringSelect");
-            dojo.require("dijit.form.ValidationTextBox");
-            dojo.require("dijit.form.NumberSpinner");
-            dojo.require("dijit.form.CheckBox");
-            dojo.require("dijit.form.Form");
-            //dojo.require("dojox.date");
-            function setType(value){
-                if (value=="rec"){
-                    //alert("Selected "+value);
-                    dijit.byId("deltaday").setDisabled(true);
-                    dijit.byId("deltahour").setDisabled(true);
-                    setDayopt(false);
-                }else if (value=="key"){
-                    //alert("Selected "+value);
-                    dijit.byId("deltaday").setDisabled(true);
-                    dijit.byId("deltahour").setDisabled(false);
-                    setDayopt(false);
-                }else if (value=="keyday"){
-                    dijit.byId("deltahour").setDisabled(false);
-                    setDayopt(true);
-                }else if (value=="keyevery"){
-                    //alert("Selected "+value);
-                    dijit.byId("deltaday").setDisabled(false);
-                    dijit.byId("deltahour").setDisabled(false);
-                    setDayopt(false);
-                }else if (value=="res"){
-                    //alert("Selected "+value);
-                    dijit.byId("deltaday").setDisabled(true);
-                    dijit.byId("deltahour").setDisabled(true);
-                    setDayopt(false);
-                }else if (value=="ts2avi"){
-                    dijit.byId("deltaday").setDisabled(true);
-                    dijit.byId("deltahour").setDisabled(true);
-                    setDayopt(false);
-                }
-
-            }
-            function setDayopt(bool){
-                dijit.byId("day_Sun").setDisabled(!bool);
-                dijit.byId("day_Mon").setDisabled(!bool);
-                dijit.byId("day_Tue").setDisabled(!bool);
-                dijit.byId("day_Wed").setDisabled(!bool);
-                dijit.byId("day_Thu").setDisabled(!bool);
-                dijit.byId("day_Fri").setDisabled(!bool);
-                dijit.byId("day_Sat").setDisabled(!bool);
-            }
-            function changeSize(){
-                var str=dijit.byId("opts").value;
-                var s=dijit.byId("size").value;
-                str=str.replace("S","");
-                str=str.replace("H","");
-                str=str.replace("F","");
-                str=str.replace("Q","");
-                str=str+s;
-                //alert("Selected "+str);
-                dijit.byId("opts").setValue(str);
-
-            }
-            function setOpts(obj){
-                if (obj.checked){
-                    var str=dijit.byId("opts").value;
-                    str=str+obj.value;
-                }else{
-                    var str=dijit.byId("opts").value;
-                    str=str.replace(obj.value,"");
-                }
-                dijit.byId("opts").setValue(str);
-            }
-            function changeOpts(){
-                var str=dijit.byId("opts").value;
-                if (str.indexOf("a")>-1){
-                    dijit.byId("anime").setChecked(true);
-                }else{
-                    dijit.byId("anime").setChecked(false);
-                }
-                if (str.indexOf("2")>-1){
-                    dijit.byId("2pass").setChecked(true);
-                }else{
-                    dijit.byId("2pass").setChecked(false);
-                }
-                if (str.indexOf("x")>-1){
-                    dijit.byId("xvid").setChecked(true);
-                }else{
-                    dijit.byId("xvid").setChecked(false);
-                }
-                if (str.indexOf("d")>-1){
-                    dijit.byId("dualaudio").setChecked(true);
-                }else{
-                    dijit.byId("dualaudio").setChecked(false);
-                }
-                if (str.indexOf("5")>-1){
-                    dijit.byId("pentaaudio").setChecked(true);
-                }else{
-                    dijit.byId("pentaaudio").setChecked(false);
-                }
-                if (str.indexOf("S")>-1){
-                    dijit.byId("size").setValue("S");
-                }else if (str.indexOf("H")>-1){
-                    dijit.byId("size").setValue("H");
-                }else if (str.indexOf("F")>-1){
-                    dijit.byId("size").setValue("F");
-                }else if (str.indexOf("Q")>-1){
-                    dijit.byId("size").setValue("Q");
-                }else{
-                    changeSize();
-                }
-            }
-            function setbtime_now(){
-                var now =new Date();
-                now.setMinutes(0,0,0);
-                setbtime(now);
-            }
-            function setetime_now(){
-                var ds=dijit.byId("btime").value;
-                var d=txt2date(ds);
-                setetime(d);
-            }
-            function setnow(){
-                var now =new Date();
-                now.setMinutes(0,0,0);
-                setbtime(now);
-                setetime(now);
-            }
-            function txt2date(txt){
-                var d=new Date;
-                var ds=txt;
-                if (ds.length>3){
-                    d.setYear(parseInt(ds.substring(0,4)));
-                }
-                if (ds.length>6){
-                    d.setMonth(parseInt(ds.substring(5,7))-1);
-                }
-                if (ds.length>9){
-                    d.setDate(parseInt(ds.substring(8,10)));
-                }
-                if (ds.length>12){
-                    d.setHours(parseInt(ds.substring(11,13)));
-                }
-                if (ds.length>15){
-                    d.setMinutes(parseInt(ds.substring(14,16)));
-                }
-                if (ds.length>18){
-                    d.setSeconds(parseInt(ds.substring(17,19)));
-                }
-                return d
-            }
-            function add_btimemin(min){
-                var ds=dijit.byId("btime").value;
-                var d=txt2date(ds);
-                d.setTime(d.getTime()+min*60*1000);
-                setbtime(d);
-            }
-            function add_etimemin(min){
-                var ds=dijit.byId("etime").value;
-                var d=txt2date(ds);
-                d.setTime(d.getTime()+min*60*1000);
-                setetime(d);
-            }
-
-            function setbtime(date){
-                var nowtxt="";
-                //window.alert("setbtime");
-                nowtxt=String(date.getFullYear())+"-";
-                if (date.getMonth()<10){
-                    nowtxt=nowtxt+"0";
-                }
-                nowtxt=nowtxt+String(date.getMonth()+1)+"-";
-                if (date.getDate()<10){
-                    nowtxt=nowtxt+"0";
-                }
-                nowtxt=nowtxt+String(date.getDate())+" ";
-                if (date.getHours()<10){
-                    nowtxt=nowtxt+"0"
-                }
-                nowtxt=nowtxt+String(date.getHours())+":";
-                if (date.getMinutes()<10){
-                    nowtxt=nowtxt+"0"
-                }
-                nowtxt=nowtxt+String(date.getMinutes())+":00";
-                //console.debug("click");
-                //window.alert("test");
-                dijit.byId("btime").setValue(nowtxt);
-            }
-            function setetime(date){
-                var nowtxt="";
-                //window.alert("test");
-                nowtxt=String(date.getFullYear())+"-";
-                if (date.getMonth()<10){
-                    nowtxt=nowtxt+"0";
-                }
-                nowtxt=nowtxt+String(date.getMonth()+1)+"-";
-                if (date.getDate()<10){
-                    nowtxt=nowtxt+"0";
-                }
-                nowtxt=nowtxt+String(date.getDate())+" ";
-                if (date.getHours()<10){
-                    nowtxt=nowtxt+"0"
-                }
-                nowtxt=nowtxt+String(date.getHours())+":";
-                if (date.getMinutes()<10){
-                    nowtxt=nowtxt+"0"
-                }
-                nowtxt=nowtxt+String(date.getMinutes())+":00";
-                //console.debug("click");
-                //window.alert("test");
-                dijit.byId("etime").setValue(nowtxt);
-            }
-            function title2opts(){
-                var str=dijit.byId("title").value;
-                var stropt=dijit.byId("opts").Value;
-                if (stropt==undefined){
-                    stropt="";
-                }
-                //stropt=stropt.replace("undefined","");
-                //stropt=""
-                if (str.indexOf("(2)")>-1){
-                    //dijit.byId("2pass").setChecked(true);
-                    str=stropt+"d";
-                    dijit.byId("opts").setValue(str);
-                }else if(str.indexOf("(二)")>-1){
-                    //dijit.byId("2pass").setChecked(true);
-                    str=stropt+"d";
-                    dijit.byId("opts").setValue(str);
-                }else if(str.indexOf("[二]")>-1){
-                    //dijit.byId("2pass").setChecked(true);
-                    str=stropt+"d";
-                    dijit.byId("opts").setValue(str);
-                }else if(str.indexOf("(二)")>-1){
-                    //dijit.byId("2pass").setChecked(true);
-                    str=stropt+"d";
-                    dijit.byId("opts").setValue(str);
-                }else if(str.indexOf("(二)")>-1){
-                    //dijit.byId("2pass").setChecked(true);
-                    str=stropt+"d";
-                    dijit.byId("opts").setValue(str);
-                }else if(str.indexOf("5.1")>-1){
-                    //dijit.byId("2pass").setChecked(true);
-                    str=stropt+"5";
-                    dijit.byId("opts").setValue(str);
-                }else if(str.indexOf("5.1")>-1){
-                    //dijit.byId("2pass").setChecked(true);
-                    str=stropt+"5";
-                    dijit.byId("opts").setValue(str);
-                }
-            }
-            //dojo.addOnLoad(init);
-            function init(){
-                //dojo.debug("test")
-                setType("res");
-                title2opts();
-                //changeSize();
-                changeOpts();
-                //changeSize();
-            }
-            dojo.addOnLoad(init);
-        </script>
-    </head>
-    <!-- テーマの読み込み -->
-    <body class="tundra">
-        <div dojoType="dijit.form.Form" action="rec10web.py" onExecute="this.submit()">
-        <h1>Rec10 Simple Web Interface ver.0.6.0 編集画面</h1><br>
-        <select name="type"
-                dojoType="dijit.form.FilteringSelect"
-                autocomplete="false"
-                value="<!--type-value//-->"
-                onChange="setType">
-            <option value="res">通常予約</option>
-            <option value="key">キーワード予約</option>
-            <option value="keyday">曜日予約</option>
-            <option value="keyevery">隔日予約</option>
-            <option value="rec">最終予約</option>
-            <option value="ts2avi">エンコード予約</option>
-            <option value="b252ts">復号化予約</option>
-        </select>番組名/キーワード
-        <input type="text"
-               length="40"
-               dojoType="dijit.form.TextBox"
-               value="<!--title-value//-->"
-               id="title"
-               name="title">チャンネル
-        <select name="chtxt"
-                dojoType="dijit.form.FilteringSelect"
-                autocomplete="false"
-                value="<!--ch-value//-->"
-                onChange="setType">
-            <!--text_for_replace_chtxt_input//-->
-        </select>
-        <br><br>開始時刻
-        <div name="btime"
-             id="btime"
-             dojoType="dijit.form.ValidationTextBox"
-             promptmessage="年-月-日 時間:分:秒"
-             value="<!--btime-value//-->"
-             regexp="\d{4}\-\d{2}\-\d{2} \d{2}\:\d{2}\:\d{2}">
-        </div>
-        <div dojoType="dijit.form.Button" onclick="setbtime_now()">現在</div>
-        <div dojoType="dijit.form.Button" onclick="add_btimemin(30)">+30m</div>
-        <div dojoType="dijit.form.Button" onclick="add_btimemin(180)">+3h</div>
-        <div dojoType="dijit.form.Button" onclick="add_btimemin(720)">+12h</div>
-        終了時刻
-        <div name="etime"
-             id="etime"
-             dojoType="dijit.form.ValidationTextBox"
-             promptmessage="年-月-日 時間:分:秒"
-             value="<!--etime-value//-->"
-             regexp="\d{4}\-\d{2}\-\d{2} \d{2}\:\d{2}\:\d{2}">
-        </div>
-        <div dojoType="dijit.form.Button" onclick="setetime_now()">一致</div>
-        <div dojoType="dijit.form.Button" onclick="add_etimemin(5)">+5m</div>
-        <div dojoType="dijit.form.Button" onclick="add_etimemin(30)">+30m</div>
-        <div dojoType="dijit.form.Button" onclick="add_etimemin(60)">+1h</div>
-        <br>
-        <br>隔日周期(days)
-        <input dojoType="dijit.form.NumberSpinner"
-               value="7"
-               smallDelta="1"
-               largeDelta="10"
-               constraints="{min:0,max:24,places:0}"
-               maxlength="2"
-               id="deltaday"
-               name="deltaday">
-        キーワード録画許容誤差(hours)
-        <input dojoType="dijit.form.NumberSpinner"
-               value="3"
-               smallDelta="1"
-               largeDelta="10"
-               constraints="{min:0,max:24,places:0}"
-               maxlength="2"
-               id="deltahour"
-               name="deltahour"><br><br>
-
-        <input type="checkbox"
-               dojoType="dijit.form.CheckBox"
-               id="day_Mon" name="day_Mon" value="1">月曜</input>
-        <input type="checkbox"
-               dojoType="dijit.form.CheckBox"
-               id="day_Tue" name="day_Tue" value="2">火曜</input>
-        <input type="checkbox"
-               dojoType="dijit.form.CheckBox"
-               id="day_Wed" name="day_Wed" value="3">水曜</input>
-        <input type="checkbox"
-               dojoType="dijit.form.CheckBox"
-               id="day_Thu" name="day_Thu" value="4">木曜</input>
-        <input type="checkbox"
-               dojoType="dijit.form.CheckBox"
-               id="day_Fri" name="day_Fri" value="5">金曜</input>
-        <input type="checkbox"
-               dojoType="dijit.form.CheckBox"
-               id="day_Sat" name="day_Sat" value="6">土曜</input>
-        <input type="checkbox"
-               dojoType="dijit.form.CheckBox"
-               id="day_Sun" name="day_Sun" value="7">日曜</input>
-        <br><br>
-        録画サイズ
-        <select name="size"
-                dojoType="dijit.form.FilteringSelect"
-                autocomplete="false"
-                value="<!--size-value//-->"
-                id="size"
-                onChange="changeSize">
-            <option selected="selected" value="S">SD画質(720x480)</option>
-            <option value="H">HD画質(1280x720)</option>
-            <option value="Q">WQVG画質(400x240)</option>
-            <option value="F">FULLHD画質(1920x1080)</option>
-            <input type="checkbox"
-                   dojoType="dijit.form.CheckBox"
-                   id="anime" name="anime" value="a"
-                   onClick="setOpts(this)">アニメ</input>
-            <input type="checkbox"
-                   dojoType="dijit.form.CheckBox"
-                   id="dualaudio" name="dualaudio" value="d"
-                   onClick="setOpts(this)">二ヶ国語放送</input>
-            <input type="checkbox"
-                   dojoType="dijit.form.CheckBox"
-                   id="pentaaudio" name="pentaaudio" value="5"
-                   onClick="setOpts(this)">5.1ch放送</input>
-            <input type="checkbox"
-                   dojoType="dijit.form.CheckBox"
-                   id="2pass" name="2pass" value="2"
-                   onClick="setOpts(this)">2passモード</input>
-            <input type="checkbox"
-                   dojoType="dijit.form.CheckBox"
-                   id="xvid" name="xvid" value="x"
-                   onClick="setOpts(this)">Xvidモード</input>
-        </select>
-        Options
-        <div name="opts"
-             dojoType="dijit.form.ValidationTextBox"
-             value="<!--opts-value//-->"
-             onChange="changeOpts"
-             id="opts">
-        </div><div dojoType="dijit.form.Button" type="submit">予約</div>
-        <div name="exec"
-             dojoType="dijit.form.ValidationTextBox"
-             value="<!--exec-value//-->"
-             style="display:none";>
-             </div>
-    </body>
-</html>