X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7c01e1138eaef94a506371c3eccf66329af39e9b..19ce1123c780a9475e2f158712da6e73fa543e9c:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 428ecbc5..aab2b649 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -38,6 +38,8 @@ from time import time, localtime, strftime
 from os import stat as os_stat
 from bisect import insort
 
+from RecordTimer import RecordTimerEntry, RecordTimer
+
 # hack alert!
 from Menu import MainMenu, mdom
 
@@ -1012,7 +1014,7 @@ class InfoBarTimeshiftState(InfoBarPVRState):
 		InfoBarPVRState.__init__(self, screen=TimeshiftState)
 
 	def _mayShow(self):
-		if self.execing and self.timeshift_enabled:
+		if self.execing and self.timeshift_enabled and self.seekstate != self.SEEK_STATE_PLAY:
 			self.pvrStateDialog.show()
 
 class InfoBarShowMovies:
@@ -1274,6 +1276,29 @@ class InfoBarPlugins:
 	def runPlugin(self, plugin):
 		plugin(session = self.session, servicelist = self.servicelist)
 
+from Components.Task import job_manager
+class InfoBarJobman:
+	def __init__(self):
+		self.addExtension(extension = self.getJobList, type = InfoBarExtensions.EXTENSION_LIST)
+
+	def getJobList(self):
+		list = []
+		for job in job_manager.getPendingJobs():
+			list.append(((boundFunction(self.getJobName, job), boundFunction(self.showJobView, job), lambda: True), None))
+		return list
+
+	def getJobName(self, job):
+		return "%s: %s (%d%%)" % (job.getStatustext(), job.name, int(100*job.progress/float(job.end)))
+
+	def showJobView(self, job):
+		from Screens.TaskView import JobView
+		job_manager.in_background = False
+		self.session.openWithCallback(self.JobViewCB, JobView, job)
+	
+	def JobViewCB(self, in_background):
+		from Screens.TaskView import JobView
+		job_manager.in_background = in_background
+
 # depends on InfoBarExtensions
 class InfoBarSleepTimer:
 	def __init__(self):
@@ -1388,7 +1413,7 @@ class InfoBarInstantRecord:
 			pass
 
 		begin = time()
-		end = time() + 3600 * 10
+		end = time() + 3600 * 24 * 365 * 1 # 1 year
 		name = "instant record"
 		description = ""
 		eventid = None
@@ -1404,14 +1429,23 @@ class InfoBarInstantRecord:
 			if limitEvent:
 				self.session.open(MessageBox, _("No event info found, recording indefinitely."), MessageBox.TYPE_INFO)
 
-		# TODO: needed?
 		if isinstance(serviceref, eServiceReference):
 			serviceref = ServiceReference(serviceref)
 
 		recording = RecordTimerEntry(serviceref, begin, end, name, description, eventid, dirname = config.movielist.last_videodir.value)
 		recording.dontSave = True
-
-		self.session.nav.RecordTimer.record(recording)
+		recording.autoincrease = True
+
+		simulTimerList = self.session.nav.RecordTimer.record(recording)
+		if simulTimerList is not None:
+			print "timer conflict detected!"
+			if (len(simulTimerList) > 1):
+				print "tsc_list > 1"
+				recording.end = simulTimerList[1].begin - 30
+				self.session.nav.RecordTimer.record(recording)
+				print "new endtime applied"
+			else:
+				print "conflict with only one timer? ! ?"
 		self.recording.append(recording)
 
 	def isInstantRecordRunning(self):
@@ -1470,6 +1504,8 @@ class InfoBarInstantRecord:
 			if ret[0]:
 				localendtime = localtime(ret[1])
 				print "stopping recording at", strftime("%c", localendtime)
+				if self.recording[self.selectedEntry].end != ret[1]:
+					self.recording[self.selectedEntry].autoincrease = False
 				self.recording[self.selectedEntry].end = ret[1]
 				self.session.nav.RecordTimer.timeChanged(self.recording[self.selectedEntry])
 
@@ -1481,6 +1517,8 @@ class InfoBarInstantRecord:
 	def inputCallback(self, value):
 		if value is not None:
 			print "stopping recording after", int(value), "minutes."
+			if int(value) != 0:
+				self.recording[self.selectedEntry].autoincrease = False
 			self.recording[self.selectedEntry].end = time() + 60 * int(value)
 			self.session.nav.RecordTimer.timeChanged(self.recording[self.selectedEntry])