X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ef4faf6f9fc8840b36b5f25206fd0722d5e36e85..cd3cd96e2ff4c6e6a9a38393e4d93167d30f74ea:/lib/python/Components/Playlist.py

diff --git a/lib/python/Components/Playlist.py b/lib/python/Components/Playlist.py
index 22799692..c9ebe479 100644
--- a/lib/python/Components/Playlist.py
+++ b/lib/python/Components/Playlist.py
@@ -58,6 +58,7 @@ class PlaylistIOM3U(PlaylistIO):
 	
 	def open(self, filename):
 		self.clear()
+		self.displayname = None
 		try:
 			file = open(filename, "r")
 		except IOError:
@@ -66,12 +67,22 @@ class PlaylistIOM3U(PlaylistIO):
 			entry = file.readline().strip()
 			if entry == "":
 				break
-			if entry[0] != "#":
+			if entry.startswith("#EXTINF:"):
+				extinf = entry.split(',',1)
+				if len(extinf) > 1:
+					self.displayname = extinf[1]
 				# TODO: use e2 facilities to create a service ref from file
+			elif entry[0] != "#":
 				if entry[0] == "/":
-					self.addService(ServiceReference("4097:0:0:0:0:0:0:0:0:0:" + entry))
+					sref = ServiceReference("4097:0:0:0:0:0:0:0:0:0:" + entry)
+				elif entry.startswith("http"):
+					sref = ServiceReference("4097:0:0:0:0:0:0:0:0:0:" + entry.replace(':',"%3a"))
 				else:
-					self.addService(ServiceReference("4097:0:0:0:0:0:0:0:0:0:" + os.path.dirname(filename) + "/" + entry))
+					sref = ServiceReference("4097:0:0:0:0:0:0:0:0:0:" + os.path.dirname(filename) + "/" + entry)
+				if self.displayname:
+					sref.ref.setName(self.displayname)
+					self.displayname = None
+				self.addService(sref)
 		file.close()
 		return self.list