Stream Menu: add "zap before Stream"

needed for Single Tuner STB´s

plugin/controllers/base.py

@@ -13,7 +13,7 @@
 from Cheetah.Template import Template
 
 from models.info import getInfo, getBasePath, getPublicPath, getViewsPath
-from models.config import getCollapsedMenus, getRemoteGrabScreenshot
+from models.config import getCollapsedMenus, getRemoteGrabScreenshot, getZapStream
 
 import imp
 import sys
@@ -134,6 +134,7 @@ def prepareMainTemplate(self):
 		# here will be generated the dictionary for the main template
 		ret = getCollapsedMenus()
 		ret['remotegrabscreenshot'] = getRemoteGrabScreenshot()['remotegrabscreenshot']
+		ret['zapstream'] = getZapStream()['zapstream']
 		ret['box'] = "dmm"
 		if fileExists("/proc/stb/info/vumodel"):
 			ret['box'] = open("/proc/stb/info/vumodel").read().strip()

plugin/controllers/models/config.py

@@ -46,6 +46,19 @@ def getRemoteGrabScreenshot():
 		"remotegrabscreenshot": config.OpenWebif.webcache.remotegrabscreenshot.value
 	}
 
+def setZapStream(value):
+	config.OpenWebif.webcache.zapstream.value = value
+	config.OpenWebif.webcache.zapstream.save()
+	return {
+		"result": True
+	}
+
+def getZapStream():
+	return {
+		"result": True,
+		"zapstream": config.OpenWebif.webcache.zapstream.value
+	}
+
 def getJsonFromConfig(cnf):
 	if cnf.__class__.__name__ == "ConfigSelection" or cnf.__class__.__name__ == "ConfigSelectionNumber":
 		if type(cnf.choices.choices) == dict:

plugin/controllers/views/main.tmpl

@@ -89,6 +89,11 @@
 			<ul>
 				<li><a href='#' onclick="load_maincontent('ajax/movies'); return false;">Movies</a></li>
 				<li><a href='#' onclick="load_maincontent('ajax/workinprogress'); return false;">Web Tv</a></li>
+				#if $zapstream
+				<li><input type="checkbox" name="zapstream" checked="checked" />zap before Stream</li>
+				#else
+				<li><input type="checkbox" name="zapstream" />zap before Stream</li>
+				#end if
 			</ul>
 			#end def
 

plugin/controllers/web.py

@@ -16,8 +16,7 @@
 from models.timers import getTimers, addTimer, addTimerByEventId, editTimer, removeTimer, cleanupTimer, writeTimerList, recordNow, tvbrowser
 from models.message import sendMessage
 from models.movies import getMovieList
-from models.config import addCollapsedMenu, removeCollapsedMenu, setRemoteGrabScreenshot, saveConfig
-from models.config import addCollapsedMenu, removeCollapsedMenu, setRemoteGrabScreenshot
+from models.config import addCollapsedMenu, removeCollapsedMenu, setRemoteGrabScreenshot, setZapStream, saveConfig, getZapStream
 from models.stream import getStream, getTS
 from models.servicelist import reloadServicesLists
 
@@ -566,8 +565,20 @@ def P_remotegrabscreenshot(self, request):
 
 		return setRemoteGrabScreenshot(request.args["checked"][0] == "true")
 
+	def P_zapstream(self, request):
+		res = self.testMandatoryArguments(request, ["checked"])
+		if res:
+			return res
+
+		return setZapStream(request.args["checked"][0] == "true")
+
 	def P_streamm3u(self,request):
 		self.isCustom = True
+
+		if getZapStream()['zapstream']:
+			if request.args["ref"][0]:
+				zapService(self.session, request.args["ref"][0], request.args["name"][0])
+
 		return getStream(self.session,request,"stream.m3u")
 
 	def P_tsm3u(self,request):

plugin/plugin.py

@@ -33,6 +33,7 @@
 # FIXME: anything better than a ConfigText?
 config.OpenWebif.webcache.collapsedmenus = ConfigText(default = "remote", fixed_size = False)
 config.OpenWebif.webcache.remotegrabscreenshot = ConfigYesNo(default = True)
+config.OpenWebif.webcache.zapstream = ConfigYesNo(default = False)
 
 class OpenWebifConfig(Screen, ConfigListScreen):
 	skin = """

plugin/public/js/openwebif.js

@@ -295,6 +295,13 @@ $(function() {
 	});
 });
 
+$(function() {
+	$("input[name=zapstream]").click(function(evt) {
+		$('input[name=zapstream]').attr('checked', evt.currentTarget.checked);
+		webapi_execute("api/zapstream?checked=" + evt.currentTarget.checked);
+	});
+});
+
 var shiftbutton = false;
 $(window).keydown(function(evt) {
 	if (evt.which == 16) {