git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
define a foreground color, so we can see in/out positions
[enigma2.git]
/
lib
/
python
/
Components
/
Playlist.py
diff --git
a/lib/python/Components/Playlist.py
b/lib/python/Components/Playlist.py
index 744ee3af23da134345bae05a44ac64899d9d7ab4..c9ebe479d852aa1f319d5210ad0a027901e8465f 100644
(file)
--- 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()
def open(self, filename):
self.clear()
+ self.displayname = None
try:
file = open(filename, "r")
except IOError:
try:
file = open(filename, "r")
except IOError:
@@
-66,14
+67,22
@@
class PlaylistIOM3U(PlaylistIO):
entry = file.readline().strip()
if entry == "":
break
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
# TODO: use e2 facilities to create a service ref from file
+ elif entry[0] != "#":
if entry[0] == "/":
if entry[0] == "/":
- s
elf.addService(ServiceReference("4097:0:0:0:0:0:0:0:0:0:" + entry)
)
+ s
ref = ServiceReference("4097:0:0:0:0:0:0:0:0:0:" + entry
)
elif entry.startswith("http"):
elif entry.startswith("http"):
- s
elf.addService(ServiceReference("4097:0:0:0:0:0:0:0:0:0:" + entry.replace(':',"%3a")
))
+ s
ref = ServiceReference("4097:0:0:0:0:0:0:0:0:0:" + entry.replace(':',"%3a"
))
else:
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
file.close()
return self.list