X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/13e3018673a588fe5225bc1c3fe893593a9eadb3..da81f2941ca129621d6511d1dcbc96bd29f4802b:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 718c2d54..cdaa2c1e 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
 
@@ -401,8 +403,8 @@ class InfoBarEPG:
 		self.eventView = None
 		self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions",
 			{
-				"showEventInfo": (self.openEventView, _("show EPG...")),
-				"showSingleServiceEPG": (self.openSingleServiceEPG, _("show single service EPG...")),
+				"showEventView": (self.openEventView, _("show EPG...")),
+				"showEventInfoPlugin": (self.showEventInfoPlugins, _("show single service EPG...")),
 				"showInfobarOrEpgWhenInfobarAlreadyVisible": self.showEventInfoWhenNotVisible,
 			})
 
@@ -487,6 +489,23 @@ class InfoBarEPG:
 		ref=self.session.nav.getCurrentlyPlayingServiceReference()
 		self.session.open(EPGSelection, ref)
 
+	def showEventInfoPlugins(self):
+		list = []
+		for p in plugins.getPlugins(where = PluginDescriptor.WHERE_EVENTINFO):
+			list.append((p.name, boundFunction(self.runPlugin, p)))
+		if len(list):
+			list.append((_("show single service EPG..."), self.openSingleServiceEPG))
+			self.session.openWithCallback(self.EventInfoPluginChosen, ChoiceBox, title=_("Please choose an extension..."), list = list)
+		else:
+			self.openSingleServiceEPG()
+			
+	def runPlugin(self, plugin):
+		plugin(session = self.session, servicelist = self.servicelist)
+		
+	def EventInfoPluginChosen(self, answer):
+		if answer is not None:
+			answer[1]()
+
 	def openSimilarList(self, eventid, refstr):
 		self.session.open(EPGSelection, refstr, None, eventid)
 
@@ -1012,7 +1031,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:
@@ -1256,7 +1275,6 @@ class InfoBarExtensions:
 from Tools.BoundFunction import boundFunction
 
 # depends on InfoBarExtensions
-from Components.PluginComponent import plugins
 
 class InfoBarPlugins:
 	def __init__(self):
@@ -1274,6 +1292,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 +1429,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 +1445,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 +1520,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 +1533,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])
 
@@ -1731,10 +1785,11 @@ class InfoBarSubserviceSelection:
 class InfoBarAdditionalInfo:
 	def __init__(self):
 
-		self["RecordingPossible"] = Boolean(fixed=harddiskmanager.HDDCount() > 0)
-		self["TimeshiftPossible"] = Boolean(fixed=(harddiskmanager.HDDCount() > 0 and config.misc.rcused.value == 1))
+		self["RecordingPossible"] = Boolean(fixed=harddiskmanager.HDDCount() > 0 and config.misc.rcused.value == 1)
+		self["TimeshiftPossible"] = self["RecordingPossible"]
 		self["ShowTimeshiftOnYellow"] = Boolean(fixed=(not config.misc.rcused.value == 0))
 		self["ShowAudioOnYellow"] = Boolean(fixed=config.misc.rcused.value == 0)
+		self["ShowRecordOnRed"] = Boolean(fixed=config.misc.rcused.value == 1)
 		self["ExtensionsAvailable"] = Boolean(fixed=1)
 
 class InfoBarNotifications: