projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
53893eb
)
fixed timer a bit
author
Felix Domke
<tmbinc@elitedvb.net>
Sat, 15 Oct 2005 20:11:20 +0000
(20:11 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Sat, 15 Oct 2005 20:11:20 +0000
(20:11 +0000)
RecordTimer.py
patch
|
blob
|
history
timer.py
patch
|
blob
|
history
diff --git
a/RecordTimer.py
b/RecordTimer.py
index
286d523
..
58bf676
100644
(file)
--- a/
RecordTimer.py
+++ b/
RecordTimer.py
@@
-1,7
+1,9
@@
import time
import codecs
import time
import codecs
+#from time import datetime
+from Tools import Directories
-from timer import *
+import timer
import xml.dom.minidom
import NavigationInstance
import xml.dom.minidom
import NavigationInstance
@@
-9,20
+11,39
@@
import NavigationInstance
from Tools.XMLTools import elementsWithTag
from ServiceReference import ServiceReference
from Tools.XMLTools import elementsWithTag
from ServiceReference import ServiceReference
-class RecordTimerEntry(TimerEntry):
+class RecordTimerEntry(
timer.
TimerEntry):
def __init__(self, begin, end, serviceref, epg, description):
def __init__(self, begin, end, serviceref, epg, description):
- TimerEntry.__init__(self, int(begin), int(end))
+
timer.
TimerEntry.__init__(self, int(begin), int(end))
assert isinstance(serviceref, ServiceReference)
self.service_ref = serviceref
assert isinstance(serviceref, ServiceReference)
self.service_ref = serviceref
- print self.service_ref.getServiceName()
- self.epg_data = epg
+ if epg is not None:
+ self.epg_data = ""
+ #str(epg.m_event_name)
+ else:
+ self.epg_data = ""
+
self.description = description
self.timer = None
self.record_service = None
self.description = description
self.timer = None
self.record_service = None
+ def calculateFilename(self):
+ service_name = self.service_ref.getServiceName()
+# begin_date = datetime.fromtimestamp(begin).strf...
+ begin_date = ""
+ if self.epg_data is not None:
+ description = " - " + self.epg_data
+ else:
+ description = ""
+
+ print begin_date
+ print service_name
+ print description
+ self.Filename = Directories.getRecordingFilename(service_name)
+ #begin_date + " - " + service_name + description)
+
# build filename from epg
# pff das geht noch nicht...
# build filename from epg
# pff das geht noch nicht...
@@
-32,14
+53,21
@@
class RecordTimerEntry(TimerEntry):
# self.Filename = "record_" + str(epg.m_event_name) + ".ts"
#
# print "------------ record filename: %s" % (self.Filename)
# self.Filename = "record_" + str(epg.m_event_name) + ".ts"
#
# print "------------ record filename: %s" % (self.Filename)
-
+
+
def activate(self, event):
if event == self.EventPrepare:
def activate(self, event):
if event == self.EventPrepare:
+ self.calculateFilename()
self.record_service = NavigationInstance.instance.recordService(self.service_ref)
if self.record_service == None:
print "timer record failed."
else:
self.record_service = NavigationInstance.instance.recordService(self.service_ref)
if self.record_service == None:
print "timer record failed."
else:
- self.record_service.prepare()
+ self.record_service.prepare(self.Filename + ".ts")
+ f = open(self.Filename + ".ts.meta", "w")
+ f.write(str(self.service_ref) + "\n")
+ f.write(self.epg_data + "\n")
+ del f
+
elif self.record_service == None:
if event != self.EventAbort:
print "timer record start failed, can't finish recording."
elif self.record_service == None:
if event != self.EventAbort:
print "timer record start failed, can't finish recording."
@@
-61,11
+89,11
@@
def createTimer(xml):
#filename = xml.getAttribute("filename")
return RecordTimerEntry(begin, end, serviceref, epgdata, description)
#filename = xml.getAttribute("filename")
return RecordTimerEntry(begin, end, serviceref, epgdata, description)
-class RecordTimer(Timer):
+class RecordTimer(
timer.
Timer):
def __init__(self):
def __init__(self):
- Timer.__init__(self)
+
timer.
Timer.__init__(self)
- self.Filename =
"timers.xml"
+ self.Filename =
Directories.resolveFilename(Directories.SCOPE_USERETC, "timers.xml")
try:
self.loadTimer()
try:
self.loadTimer()
@@
-109,11
+137,11
@@
class RecordTimer(Timer):
self.addTimerEntry(entry)
def removeEntry(self, entry):
self.addTimerEntry(entry)
def removeEntry(self, entry):
- if entry.state == TimerEntry.StateRunning:
- entry.
E
nd = time.time()
- print "aborting timer"
- elif entry.state != TimerEntry.StateEnded:
- entry.activate(TimerEntry.EventAbort)
+ if entry.state ==
timer.
TimerEntry.StateRunning:
+ entry.
e
nd = time.time()
+ self.timeChanged(entry)
+ elif entry.state !=
timer.
TimerEntry.StateEnded:
+ entry.activate(
timer.
TimerEntry.EventAbort)
self.timer_list.remove(entry)
print "timer did not yet start - removing"
else:
self.timer_list.remove(entry)
print "timer did not yet start - removing"
else:
diff --git
a/timer.py
b/timer.py
index
023e4e3
..
ad248e1
100644
(file)
--- a/
timer.py
+++ b/
timer.py
@@
-20,9
+20,9
@@
class TimerEntry:
self.state = 0
def getTime(self):
self.state = 0
def getTime(self):
- if self.state ==
0
:
+ if self.state ==
self.StateWait
:
return self.begin - self.prepare_time
return self.begin - self.prepare_time
- elif self.state ==
1
:
+ elif self.state ==
self.StatePrepare
:
return self.begin
else:
return self.end
return self.begin
else:
return self.end
@@
-52,7
+52,7
@@
class Timer:
def setNextActivation(self, when):
delay = int((when - time()) * 1000)
def setNextActivation(self, when):
delay = int((when - time()) * 1000)
- print "next activation: %d (in %d
second
s)" % (when, delay)
+ print "next activation: %d (in %d
m
s)" % (when, delay)
self.timer.start(delay, 1)
self.next = when
self.timer.start(delay, 1)
self.next = when
@@
-70,6
+70,10
@@
class Timer:
self.setNextActivation(min)
self.setNextActivation(min)
+ def timeChanged(self, timer):
+ self.timer_list.remove(timer)
+ bisect.insort(self.timer_list, timer)
+
def doActivate(self, w):
w.activate(w.state)
self.timer_list.remove(w)
def doActivate(self, w):
w.activate(w.state)
self.timer_list.remove(w)