Use "application/octet-stream" as mime type for m3u files.

This force download and prevents direct playback in browser.

Author: jbleyel

plugin/controllers/file.py

@@ -40,7 +40,7 @@ def new_getRequestHostname(self):
 	return self.getHost().host.encode('ascii')
 
 # Do wee need this?
-#http.Request.getRequestHostname = new_getRequestHostname
+# http.Request.getRequestHostname = new_getRequestHostname
 
 
 class FileController(resource.Resource):
@@ -69,7 +69,7 @@ def render(self, request):
 
 				response = f"#EXTM3U\n#EXTVLCOPT:http-reconnect=true\n#EXTINF:-1,{name}\n{proto}://{request.getRequestHostname()}:{port}/file?action=download&file={quote(filename)}"
 				request.setHeader("Content-Disposition", f'attachment;filename="{name}.m3u"')
-				request.setHeader("Content-Type", "application/x-mpegurl")
+				request.setHeader("Content-Type", "application/octet-stream")
 				return response
 			elif action == "delete":
 				request.setResponseCode(http.OK)

plugin/controllers/models/stream.py

@@ -145,11 +145,12 @@ def getStream(session, request, m3ufile):
 		if "http://" in sref or "https://" in sref:
 			link = sref.split(":http")[1]
 			response = f"#EXTM3U \n#EXTVLCOPT:http-reconnect=true\n{progopt}http{link}\n"
-	request.setHeader("Content-Type", "application/x-mpegurl")
+
+	request.setHeader("Content-Type", "application/octet-stream")
 	# Note: do not rename the m3u file all the time
 	fname = getUrlArg(request, "fname")
 	if fname is not None:
-		request.setHeader("Content-Disposition", f"inline; filename={fname}.m3u8;")
+		request.setHeader("Content-Disposition", f"attachment; filename={fname}.m3u8;")
 	return response
 
 
@@ -258,7 +259,7 @@ def getTS(self, request):
 			auth = ""
 
 		response = f"#EXTM3U \n#EXTVLCOPT:http-reconnect=true \n{progopt}{proto}://{auth}{request.getRequestHostname()}:{portnumber}/file?file={quote(filename)}{args}\n"
-		request.setHeader("Content-Type", "application/x-mpegurl")
+		request.setHeader("Content-Type", "application/octet-stream")
 		return response
 	else:
 		return "Missing file parameter"

plugin/controllers/web.py

@@ -555,7 +555,7 @@ def P_servicesxspf(self, request):
 		bouquetname = getUrlArg(request, "bName")
 		if bouquetname:
 			bouquetname = bouquetname.replace(",", "_").replace(";", "_")
-			request.setHeader('Content-Disposition', f'inline; filename={bouquetname}.xspf;')
+			request.setHeader('Content-Disposition', f'attachment; filename={bouquetname}.xspf;')
 		services = getServices(bref, False)
 		if comp_config.OpenWebif.auth_for_streaming.value:
 			session = GetSession()
@@ -590,11 +590,11 @@ def P_servicesm3u(self, request):
 			:query string bRef: bouquet reference
 		"""
 		bref = getUrlArg(request, "bRef", "")
-		request.setHeader('Content-Type', 'application/x-mpegurl')
+		request.setHeader('Content-Type', 'application/octet-stream')
 		bouquetname = getUrlArg(request, "bName")
 		if bouquetname:
 			bouquetname = bouquetname.replace(",", "_").replace(";", "_")
-			request.setHeader('Content-Disposition', f'inline; filename={bouquetname}.m3u8;')
+			request.setHeader('Content-Disposition', f'attachment; filename={bouquetname}.m3u8;')
 		services = getServices(bref, False)
 		if comp_config.OpenWebif.auth_for_streaming.value:
 			session = GetSession()
@@ -820,7 +820,7 @@ def P_movielistm3u(self, request):
 		Returns:
 			HTTP response with headers
 		"""
-		request.setHeader('Content-Type', 'application/x-mpegurl')
+		request.setHeader('Content-Type', 'application/octet-stream')
 		movielist = getMovieList(request.args)
 		movielist["host"] = f"{whoami(request)['proto']}://{request.getRequestHostname()}:{whoami(request)['port']}"
 		return movielist