Version = '$Header$';
from Components.Sources.Source import Source
-from Components.Sources.Source import Source
from Components.Sources.ServiceList import ServiceList
+from Components.config import config
from enigma import eServiceReference
from re import sub
SERVICELIST = 2
OPTIONLIST = 3
FILLVALUE = 4
- DELETEOLD = 5
+ LOCATIONLIST = 5
+ TAGLIST = 6
+ DELETEOLD = 7
lut = {"Name":0
,"Value":1
self.result = self.fillOptionList(cmd)
elif self.func is self.FILLVALUE:
self.result = self.fillValue(cmd)
+ elif self.func is self.LOCATIONLIST:
+ self.result = self.locationList(cmd)
+ elif self.func is self.TAGLIST:
+ self.result = self.tagList(cmd)
elif self.func is self.DELETEOLD:
self.result = self.deleteOldSaved(cmd)
else:
timePlusTwo = end
t = {}
- t["sday"]=strftime("%d", localtime(timeNow))
- t["smonth"]=strftime("%m", localtime(timeNow))
- t["syear"]=strftime("%Y", localtime(timeNow))
+ t["day"]=strftime("%d", localtime(timeNow))
+ t["month"]=strftime("%m", localtime(timeNow))
+ t["year"]=strftime("%Y", localtime(timeNow))
t["smin"]=strftime("%M", localtime(timeNow))
t["shour"]=strftime("%H", localtime(timeNow))
-
- t["eday"]=strftime("%d", localtime(timePlusTwo))
- t["emonth"]=strftime("%m", localtime(timePlusTwo))
- t["eyear"]=strftime("%Y", localtime(timePlusTwo))
t["emin"]=strftime("%M", localtime(timePlusTwo))
t["ehour"]=strftime("%H", localtime(timePlusTwo))
if p != "sRef":
key = p
- cutKey = sub("^[es]", "", key, 1)
-
- if cutKey == "min":
+ if key == "smin" or key == "emin" :
start = 0
end = 59
- elif cutKey == "hour":
+ elif key == "shour" or key == "ehour":
start = 1
end = 24
- elif cutKey == "day":
+ elif key == "day":
start = 1
end = 31
- elif cutKey == "month":
+ elif key == "month":
start = 1
end = 12
else:
else:
input = param[key] or 0
input = int(input)
- #print cutKey,param[key],input
self.result = self.fillOptionListAny(input,start,end)
return self.result
def getServiceList(self, ref):
self.servicelist.root = ref
-
+
+ def locationList(self,param):
+ print "locationList",param
+ dirname = param
+ lst = config.movielist.videodirs.value
+ if not dirname:
+ dirname = "/hdd/movie/"
+ if not dirname in lst:
+ lst = [dirname] + lst
+ returnList = [[lst[i], i, dirname == lst[i] and "selected" or ""] for i in range(len(lst))]
+ return returnList
+
+ def tagList(self,param):
+ print "tagList",param
+ tag = param
+ try:
+ file = open("/etc/enigma2/movietags")
+ taglist = [x.rstrip() for x in file.readlines()]
+ while "" in taglist:
+ taglist.remove("")
+ file.close()
+ except IOError, ioe:
+ taglist = []
+ if not tag in taglist:
+ taglist = [tag]+taglist
+ if not "" in taglist:
+ taglist.append("")
+ returnList = [[taglist[i], i, tag == taglist[i] and "selected" or ""] for i in range(len(taglist))]
+ return returnList
+
def fillOptionList(self,param):
-
print "fillOptionList",param
returnList = []
if param.has_key("justplay"):
number = param["justplay"] or 0
number = int(number)
- if number == 1:
- returnList.append(["Record",0,""])
- returnList.append(["Zap",1,"selected"])
- else:
- returnList.append(["Record",0,"selected"])
- returnList.append(["Zap",1,""])
+ returnList.append(["Record",0,number==0 and "selected" or ""])
+ returnList.append(["Zap",1,number==1 and "selected" or ""])
elif param.has_key("afterevent"):
number = param["afterevent"] or 0
number = int(number)
- if number == 3:
- returnList.append(["Nothing",0,""])
- returnList.append(["Standby",1,""])
- returnList.append(["Deepstandby/Shutdown",2,""])
- returnList.append(["Auto",3,"selected"])
- elif number == 2:
- returnList.append(["Nothing",0,""])
- returnList.append(["Standby",1,""])
- returnList.append(["Deepstandby/Shutdown",2,"selected"])
- returnList.append(["Auto",3,""])
- elif number == 1:
- returnList.append(["Nothing",0,""])
- returnList.append(["Standby",1,"selected"])
- returnList.append(["Deepstandby/Shutdown",2,""])
- returnList.append(["Auto",3,""])
- else:
- returnList.append(["Nothing",0,"selected"])
- returnList.append(["Standby",1,""])
- returnList.append(["Deepstandby/Shutdown",2,""])
- returnList.append(["Auto",3,""])
-
+ returnList.append(["Nothing",0,number==0 and "selected" or ""])
+ returnList.append(["Standby",1,number==1 and "selected" or ""])
+ returnList.append(["Deepstandby/Shutdown",2,number==2 and "selected" or ""])
+ returnList.append(["Auto",3,number==3 and "selected" or ""])
return returnList
def deleteOldSaved(self,param):
<meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
<title>Enigma 2 Webinterface (ALPHA)</title>
- <link href="/webdata/style.css" type="text/css" rel="stylesheet" />
- <link rel="shortcut icon" type="image/x-icon" href="/webdata/gfx/favicon.ico"/>
+ <link href="/web-data/tpl/default/style.css" type="text/css" rel="stylesheet" />
+ <link rel="shortcut icon" type="image/x-icon" href="/web-data/img/favicon.ico"/>
</head>
<body>
<h1 style="text-align: center;"><big>Dreambox 7025</big></h1>
<div style="text-align: center;">
<a href="/web/wap/wapremote.html?command=0">Remote Control</a><br/>
<a href="/web/wap/timerlist.html">Timerlist</a><br/>
-<a href="/web/wap/timeredit.html?name=&description=&justplay=&afterevent=&repeated=&bouquet=&sRef=&ehour=now&shour=now&emin=now&smin=now&sday=now&eday=now&smonth=now&emonth=now&syear=now&eyear=now&end=&begin=&deleteOldOnSave=0&command=add">Add Timer</a><br/>
+<a href="/web/wap/timeredit.html?name=&description=&dirname=&tags=&justplay=&afterevent=&repeated=&bouquet=&sRef=&ehour=now&shour=now&emin=now&smin=now&day=now&month=now&year=now&end=&begin=&deleteOldOnSave=0&command=add">Add Timer</a><br/>
<a href="/web/wap/power.html">PowerState</a><br/>
</div>
</body>
<meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
<title>Enigma 2 Webinterface (ALPHA)</title>
- <link href="/webdata/style.css" type="text/css" rel="stylesheet" />
- <link rel="shortcut icon" type="image/x-icon" href="/webdata/gfx/favicon.ico"/>
+ <link href="/web-data/tpl/default/style.css" type="text/css" rel="stylesheet" />
+ <link rel="shortcut icon" type="image/x-icon" href="/web-data/img/favicon.ico"/>
</head>
<body>
<p><center><a href="/web/powerstate?newstate=1">deepstandby Dreambox</a></center></p>
<e2:screen name="TimerWebScreen">
- <e2:element source="TVBrowser" id="sRef,name,description,eit,disabled,justplay,afterevent,syear,smonth,sday,shour,smin,eyear,emonth,eday,ehour,emin,mo,tu,we,th,fr,sa,su,mf,ms,command,deleteOldOnSave,beginOld,endOld,channelOld">
+ <e2:element source="TVBrowser" id="sRef,name,description,dirname,tags,eit,disabled,justplay,afterevent,year,month,day,shour,smin,ehour,emin,mo,tu,we,th,fr,sa,su,mf,ms,command,deleteOldOnSave,beginOld,endOld,channelOld">
<e2:convert type="web:TextToHTML" />
</e2:element>
</e2:screen>
\ No newline at end of file
<meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
<title>Enigma 2 Webinterface (ALPHA)</title>
<meta http-equiv="refresh" content="1; URL=/web/wap/timerlist.html">
- <link rel="shortcut icon" type="image/x-icon" href="/webdata/gfx/favicon.ico"/>
+ <link rel="shortcut icon" type="image/x-icon" href="/web-data/img/favicon.ico"/>
</head>
<body>
<p><center>You will be redirected in a second</center></p>
</body>
</html>
-<e2:element source="TimerChange" id="sRef,begin,end,name,description,eit,disabled,justplay,afterevent,repeated,channelOld,beginOld,endOld,deleteOldOnSave">
+<e2:element source="TimerChange" id="sRef,begin,end,name,description,dirname,tags,eit,disabled,justplay,afterevent,repeated,channelOld,beginOld,endOld,deleteOldOnSave">
<e2:convert type="web:TextToHTML" />
</e2:element>
</e2:screen>
\ No newline at end of file
<meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
<title>Enigma 2 Webinterface (ALPHA)</title>
<meta http-equiv="refresh" content="1; URL=/web/wap/timerlist.html">
- <link rel="shortcut icon" type="image/x-icon" href="/webdata/gfx/favicon.ico"/>
+ <link rel="shortcut icon" type="image/x-icon" href="/web-data/img/favicon.ico"/>
</head>
<body>
<p><center>You will be redirected in a second</center></p>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
<title>Enigma 2 Webinterface (ALPHA)</title>
-<!-- <link href="/webdata/style.css" type="text/css" rel="stylesheet" />-->
- <link rel="shortcut icon" type="image/x-icon" href="/webdata/gfx/favicon.ico"/>
+<!-- <link href="/web-data/tpl/default/style.css" type="text/css" rel="stylesheet" />-->
+ <link rel="shortcut icon" type="image/x-icon" href="/web-data/img/favicon.ico"/>
</head>
<body>
<form action="/web/wap/timeradd" method="get">
</td>
</tr><tr>
<td colspan="3"></td>
- <td colspan="3">Note: For recurring events start/end day/month are not required.</td>
+ <td colspan="3">Note: For recurring events date is not required.</td>
</tr><tr>
- <td colspan="3">Start:</td><td colspan="3">
- <select name="syear" size="1">
- <e2:element source="WAPFillOptionListSyear" id="syear,sRef,begin"><e2:convert type="web:ListFiller" >
+ <td colspan="3">Date:</td><td colspan="3">
+ <select name="year" size="1">
+ <e2:element source="WAPFillOptionListYear" id="year,sRef,begin"><e2:convert type="web:ListFiller" >
<option value="<e2:item name="Value"/>" <e2:item name="Selected"/>><e2:item name="Name"/></option>
</e2:convert>
<e2:convert type="web:TextToHTML"/></e2:element>
</select>.
- <select name="smonth">
- <e2:element source="WAPFillOptionListSmonth" id="smonth,sRef,begin"><e2:convert type="web:ListFiller" >
+ <select name="month">
+ <e2:element source="WAPFillOptionListMonth" id="month,sRef,begin"><e2:convert type="web:ListFiller" >
<option value="<e2:item name="Value"/>" <e2:item name="Selected"/>><e2:item name="Name"/></option>
</e2:convert>
<e2:convert type="web:TextToHTML"/></e2:element>
</select>.
- <select name="sday">
- <e2:element source="WAPFillOptionListSday" id="sday,sRef,begin"><e2:convert type="web:ListFiller" >
+ <select name="day">
+ <e2:element source="WAPFillOptionListDay" id="day,sRef,begin"><e2:convert type="web:ListFiller" >
<option value="<e2:item name="Value"/>" <e2:item name="Selected"/>><e2:item name="Name"/></option>
</e2:convert>
<e2:convert type="web:TextToHTML"/></e2:element>
-</select>---
+ </select></td>
+</tr><tr>
+ <td colspan="3">Start:</td><td colspan="3">
<select name="shour">
<e2:element source="WAPFillOptionListShour" id="shour,sRef,begin"><e2:convert type="web:ListFiller" >
<option value="<e2:item name="Value"/>" <e2:item name="Selected"/>><e2:item name="Name"/></option>
<e2:convert type="web:TextToHTML"/></e2:element>
</select></td>
</tr><tr>
- <td colspan="3">End:</td><td colspan="3"><select name="eyear">
- <e2:element source="WAPFillOptionListEyear" id="eyear,sRef,end"><e2:convert type="web:ListFiller" >
- <option value="<e2:item name="Value"/>" <e2:item name="Selected"/>><e2:item name="Name"/></option>
- </e2:convert>
- <e2:convert type="web:TextToHTML"/></e2:element>
-</select>.
- <select name="emonth">
- <e2:element source="WAPFillOptionListEmonth" id="emonth,sRef,end"><e2:convert type="web:ListFiller" >
- <option value="<e2:item name="Value"/>" <e2:item name="Selected"/>><e2:item name="Name"/></option>
- </e2:convert>
- <e2:convert type="web:TextToHTML"/></e2:element>
-</select>.
- <select name="eday">
- <e2:element source="WAPFillOptionListEday" id="eday,sRef,end"><e2:convert type="web:ListFiller" >
- <option value="<e2:item name="Value"/>" <e2:item name="Selected"/>><e2:item name="Name"/></option>
- </e2:convert>
- <e2:convert type="web:TextToHTML"/></e2:element>
-</select>---
+ <td colspan="3">End:</td><td colspan="3">
<select name="ehour">
<e2:element source="WAPFillOptionListEhour" id="ehour,sRef,end"><e2:convert type="web:ListFiller" >
<option value="<e2:item name="Value"/>" <e2:item name="Selected"/>><e2:item name="Name"/></option>
<e2:convert type="web:TextToHTML"/></e2:element>
</td>
</tr><tr>
+ <td colspan="3">Location:</td><td colspan="3">
+ <select name="dirname" size="1">
+ <e2:element source="WAPFillLocation" id="dirname"><e2:convert type="web:ListFiller" >
+ <option value="<e2:item name="Name"/>" <e2:item name="Selected"/>><e2:item name="Name"/></option>
+ </e2:convert>
+ <e2:convert type="web:TextToHTML"/></e2:element>
+ </select>
+ </td>
+</tr><tr>
+ <td colspan="3">Tags:</td><td colspan="3">
+ <select name="tags" size="1">
+ <e2:element source="WAPFillTags" id="tags"><e2:convert type="web:ListFiller" >
+ <option value="<e2:item name="Name"/>" <e2:item name="Selected"/>><e2:item name="Name"/></option>
+ </e2:convert>
+ <e2:convert type="web:TextToHTML"/></e2:element>
+ </select>
+ </td>
+</tr><tr>
<td colspan="3">After event do:</td><td colspan="3"><select name="afterevent" size="1">
<e2:element source="WAPFillOptionListAfterEvent" id="afterevent,sRef"><e2:convert type="web:ListFiller" >
<option value="<e2:item name="Value"/>" <e2:item name="Selected"/>><e2:item name="Name"/></option>
<meta content="text/html; charset=UTF-8" http-equiv="content-type">
<title>Enigma 2 Webinterface (ALPHA)</title>
- <link href="/webdata/style.css" type="text/css" rel="stylesheet" >
- <link rel="shortcut icon" type="image/x-icon" href="/webdata/gfx/favicon.ico">
+ <link href="/web-data/tpl/default/style.css" type="text/css" rel="stylesheet" >
+ <link rel="shortcut icon" type="image/x-icon" href="/web-data/img/favicon.ico">
</head>
<body>
</tr>
<tr>
<e2:element source="TimerList" ><e2:convert type="web:ListFiller" >
- <td><font color=#<e2:item name="Color"/>><e2:item name="ServiceName"/> </font></td>
- <td><font color=#<e2:item name="Color"/>><e2:item name="Name"/> </font></td>
- <td><font color=#<e2:item name="Color"/>><e2:item name="Description"/> </font></td>
- <td><a href="/web/timerdelete?sRef=<e2:item name="ServiceReference"/>&begin=<e2:item name="TimeBegin"/>&end=<e2:item name="TimeEnd"/>"><img src=/webdata/gfx/trash.gif title=delete_timer_entry border=0></a>
- <a href="/web/wap/timerchange.html?sRef=<e2:item name="ServiceReference"/>&begin=<e2:item name="TimeBegin"/>&end=<e2:item name="TimeEnd"/>&name=<e2:item name="Name"/>&description=<e2:item name="Description"/>&afterevent=<e2:item name="afterEvent"/>&justplay=<e2:item name="justPlay"/>&repeated=<e2:item name="Repeated"/>&disabled=<e2:item name="toggleDisabled"/>&channelOld=<e2:item name="ServiceReference"/>&beginOld=<e2:item name="TimeBegin"/>&endOld=<e2:item name="TimeEnd"/>&deleteOldOnSave=1"><img src=/webdata/gfx/<e2:item name="toggleDisabledIMG"/>.png title=toggleOnOff border=0></a>
- <a href="/web/wap/timeredit.html?bouquet=&sRef=<e2:item name="ServiceReference"/>&begin=<e2:item name="TimeBegin"/>&end=<e2:item name="TimeEnd"/>&name=<e2:item name="Name"/>&description=<e2:item name="Description"/>&afterevent=<e2:item name="afterEvent"/>&justplay=<e2:item name="justPlay"/>&repeated=<e2:item name="Repeated"/>&disabled=<e2:item name="toggleDisabled"/>&deleteOldOnSave=1&command=change&ehour=end&emin=end&eday=end&emonth=end&eyear=end&shour=begin&smin=begin&sday=begin&smonth=begin&syear=begin"><img src=/webdata/gfx/edit.gif title=EditTimer border=0></a>
+ <td><font><e2:item name="ServiceName"/> </font></td>
+ <td><font><e2:item name="Name"/> </font></td>
+ <td><font><e2:item name="Description"/> </font></td>
+ <td><a href="/web/timerdelete?sRef=<e2:item name="ServiceReference"/>&begin=<e2:item name="TimeBegin"/>&end=<e2:item name="TimeEnd"/>"><img src=/web-data/img/delete.png title=delete_timer_entry border=0></a>
+ <a href="/web/wap/timerchange.html?sRef=<e2:item name="ServiceReference"/>&begin=<e2:item name="TimeBegin"/>&end=<e2:item name="TimeEnd"/>&name=<e2:item name="Name"/>&description=<e2:item name="Description"/>&afterevent=<e2:item name="afterEvent"/>&justplay=<e2:item name="justPlay"/>&dirname=<e2:item name="Location"/>&tags=<e2:item name="Tags"/>&repeated=<e2:item name="Repeated"/>&disabled=<e2:item name="toggleDisabled"/>&channelOld=<e2:item name="ServiceReference"/>&beginOld=<e2:item name="TimeBegin"/>&endOld=<e2:item name="TimeEnd"/>&deleteOldOnSave=1"><img src=/web-data/img/<e2:item name="toggleDisabledIMG"/>.png title=toggleOnOff border=0></a>
+ <a href="/web/wap/timeredit.html?bouquet=&sRef=<e2:item name="ServiceReference"/>&begin=<e2:item name="TimeBegin"/>&end=<e2:item name="TimeEnd"/>&name=<e2:item name="Name"/>&description=<e2:item name="Description"/>&afterevent=<e2:item name="afterEvent"/>&justplay=<e2:item name="justPlay"/>&dirname=<e2:item name="Location"/>&tags=<e2:item name="Tags"/>&repeated=<e2:item name="Repeated"/>&disabled=<e2:item name="toggleDisabled"/>&deleteOldOnSave=1&command=change&ehour=end&emin=end&day=begin&month=begin&year=begin&shour=begin&smin=begin"><img src=/web-data/img/edit.png title=EditTimer border=0></a>
</td>
</tr>
</e2:convert>
<meta content="text/html; charset=UTF-8" http-equiv="content-type">
<title>Enigma 2 Webinterface (ALPHA)</title>
- <link href="/webdata/style.css" type="text/css" rel="stylesheet" >
- <link rel="shortcut icon" type="image/x-icon" href="/webdata/gfx/favicon.ico">
+ <link href="/web-data/tpl/default/style.css" type="text/css" rel="stylesheet" >
+ <link rel="shortcut icon" type="image/x-icon" href="/web-data/img/favicon.ico">
</head>
<body>
<div style="text-align: center;">
-<img border="0" usemap="#RemoteControl" src="/webdata/gfx/remotecontrol_static.jpg">
+<img border="0" usemap="#RemoteControl" src="/web-data/gfx/remotecontrol_static.jpg">
<map name="RemoteControl">
<area shape=circle coords="65,8,7" href="/web/wap/wapremote.html?command=116" alt="onoff">
projects / vuplus_dvbapp-plugin / commitdiff