diff options
| author | Kushal Das <kushal@fedoraproject.org> | 2008-10-04 20:45:02 (GMT) |
|---|---|---|
| committer | Kushal Das <kushal@fedoraproject.org> | 2008-10-04 20:45:02 (GMT) |
| commit | 53aa3a40d337ba7f28ba8d7343aeba0cbd8bc55e (patch) | |
| tree | 36d60abd6e2da7a8a26c1324042a84d2cfd9c6b8 | |
| parent | 944b5eadb51ecb0e8d25b54a1756887231c5f3af (diff) | |
.pls file (playlist) support added
| -rwxr-xr-x | activity/activity.info | 2 | ||||
| -rwxr-xr-x | jukeboxactivity.py | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/activity/activity.info b/activity/activity.info index 674ee34..962d74b 100755 --- a/activity/activity.info +++ b/activity/activity.info @@ -5,5 +5,5 @@ icon = activity-jukebox class = jukeboxactivity.JukeboxActivity show_launcher = yes activity_version = 2 -mime_types = video/x-theora;audio/x-vorbis;audio/x-flac;audio/x-speex;application/x-ogm-video;application/x-ogm-audio;video/x-mng;audio/x-aiff;audio/x-wav;audio/x-m4a;video/mpeg4;video/mpeg-stream;video/mpeg;application/ogg;video/mpegts;video/mpeg2;video/mpeg1;audio/mpeg;audio/x-ac3;video/x-cdxa;audio/x-au;audio/mpegurl;audio/x-mpegurl;audio/x-vorbis+ogg +mime_types = video/x-theora;audio/x-vorbis;audio/x-flac;audio/x-speex;application/x-ogm-video;application/x-ogm-audio;video/x-mng;audio/x-aiff;audio/x-wav;audio/x-m4a;video/mpeg4;video/mpeg-stream;video/mpeg;application/ogg;video/mpegts;video/mpeg2;video/mpeg1;audio/mpeg;audio/x-ac3;video/x-cdxa;audio/x-au;audio/mpegurl;audio/x-mpegurl;audio/x-vorbis+ogg;audio/x-scpls diff --git a/jukeboxactivity.py b/jukeboxactivity.py index 082bcdb..c60e996 100755 --- a/jukeboxactivity.py +++ b/jukeboxactivity.py @@ -43,6 +43,9 @@ import gtk import urllib from ControlToolbar import ControlToolbar +from ConfigParser import ConfigParser +cf = ConfigParser() + class JukeboxActivity(activity.Activity): UPDATE_INTERVAL = 500 @@ -236,6 +239,16 @@ class JukeboxActivity(activity.Activity): # FIXME: parse m3u files and extract actual URL if uri.endswith(".m3u"): self.playlist = self.getplaylist([line.strip() for line in open(uri).readlines()]) + elif uri.endswith('.pls'): + try: + cf.readfp(open(uri)) + x = 1 + while True: + self.playlist.append(cf.get("playlist",'File'+str(x))) + x += 1 + except: + #read complete + pass else: self.playlist.append('file://' + urllib.quote(uri)) if not self.player: |