Merge lp:~ahayzen/cappella/cappella10_play_stream_2 into lp:cappella

[Andrew Hayzen]

* Added basic support for .asx and .m3u formats

[Andrew Hayzen (ahayzen)]

review: Approve

=== modified file 'cappella/data/default/format.js'
--- cappella/data/default/format.js	2013-04-28 18:40:19 +0000
+++ cappella/data/default/format.js	2013-04-29 03:13:27 +0000
@@ -1,8 +1,10 @@
 {
 	"aac": {"audio": true, "video": false},
+	"asx": {"audio": true, "video": false},
 	"avi": {"audio": false, "video": true},
 	"flac": {"audio": true, "video": false},
 	"flv": {"audio": false, "video": true},
+	"m3u": {"audio": true, "video": false},
 	"m4a": {"audio": true, "video": false},
 	"mp3": {"audio": true, "video": false},
 	"mp4": {"audio": false, "video": true},
 
=== modified file 'cappella/data/glade/open_file_dialogs.ui'
--- cappella/data/glade/open_file_dialogs.ui	2013-04-28 19:00:58 +0000
+++ cappella/data/glade/open_file_dialogs.ui	2013-04-29 03:13:27 +0000
@@ -188,7 +188,7 @@
     <property name="skip_taskbar_hint">True</property>
     <property name="buttons">ok-cancel</property>
     <property name="text" translatable="yes">Please enter the address of the stream</property>
-    <property name="secondary_text" translatable="yes">This should either be a .pls file or a direct stream</property>
+    <property name="secondary_text" translatable="yes">This should either be a .asx, .m3u, .pls or a direct stream</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
 
=== modified file 'cappella/gui/widget/play_queue.py'
--- cappella/gui/widget/play_queue.py	2013-04-28 18:40:19 +0000
+++ cappella/gui/widget/play_queue.py	2013-04-29 03:13:27 +0000
@@ -22,7 +22,7 @@
 from ...config.cappella import settings
 from ...signalhandler import signal
 from ...tool import skipx, thread_safe
-from ...tool.media import process_pls
+from ...tool.media import is_playlist, process_playlist
 
 
 class PlayQueue():
@@ -129,8 +129,8 @@
 
     @thread_safe
     def on_playqueue_add_int(self, uri, library, view):
-        if uri.endswith(".pls"):
-            uri = process_pls(uri)
+        if is_playlist(uri):
+            uri = process_playlist(uri)
 
             if type(uri) is list:
                 # Add uris to play queue
 
=== modified file 'cappella/library/podcast_web.py'
--- cappella/library/podcast_web.py	2013-04-02 22:48:35 +0000
+++ cappella/library/podcast_web.py	2013-04-29 03:13:27 +0000
@@ -20,7 +20,6 @@
 
 from gi.repository import GdkPixbuf
 from html.parser import HTMLParser
-from xml.dom import minidom
 from xml.etree import ElementTree
 from urllib.request import urlopen
 
@@ -28,21 +27,10 @@
 from ..management.library import (LibraryType, LibraryPurpose, LibraryMode,
                                   LibraryFileType)
 from ..tool.metatag import MetaParser
+from ..tool.parser import FeedToXml
 
 
 #-------------------------------------- Helper classes for RSS->Dict Conversion
-class FeedToXml():
-    """ Read XML and parse from URL """
-    def __init__(self, url):
-        self.stream = urlopen(url)
-
-        self.obj = minidom.parse(self.stream)
-
-        *proc, dom = self.obj.childNodes
-
-        self.xml = dom.toprettyxml()
-
-
 class XmlToInfo():
     def __init__(self, xml_stream, uri):
         self.root = ElementTree.fromstring(xml_stream)
 
=== modified file 'cappella/library/stream.py'
--- cappella/library/stream.py	2013-04-28 18:49:59 +0000
+++ cappella/library/stream.py	2013-04-29 03:13:27 +0000
@@ -20,7 +20,10 @@
 
 from ..management.library import LibraryType, LibraryPurpose, LibraryMode
 from ..signalhandler import signal
+from ..tool.media import is_playlist
+from ..tool.parser import FeedToXml
 from urllib.request import urlopen
+from xml.etree import ElementTree
 
 
 class StreamLibrary():
@@ -53,9 +56,10 @@
     def copy(self, uri):
         """ Get a stream for the uri in the library (name) specified """
 
-        if (not uri.startswith("http://") and
-            (not uri.startswith("file://") and not ".pls" not in uri)):
-            raise ValueError("URI should start with http:// or ends with .pls")
+        if (not uri.startswith("http://") and not uri.startswith("mms://") and
+            (not uri.startswith("file://") and is_playlist(uri))):
+            raise ValueError("URI should start with http:// or contains .pls, "
+                             ".asx, .m3u")
 
         f = urlopen(uri)
 
@@ -86,9 +90,10 @@
     def get(self, uri):
         """ Get the info about a uri in the library (name) specified """
 
-        if (not uri.startswith("http://") and
-            (not uri.startswith("file://") and ".pls" not in uri)):
-            raise ValueError("URI should start with http:// or ends with .pls")
+        if (not uri.startswith("http://") and not uri.startswith("mms://") and
+            (not uri.startswith("file://") and is_playlist(uri))):
+            raise ValueError("URI should start with http:// or contains .pls, "
+                             ".asx, .m3u")
 
         files = {}
 
@@ -134,6 +139,85 @@
                 return {"title": uri, "uri": uri}
             else:
                 return output
+        elif ".asx" in uri:
+            # Read .asx file
+            if uri.startswith("http://"):
+                stream = urlopen(uri)
+            else:
+                stream = open(uri[7:])
+
+            xml_stream = FeedToXml(data=stream).xml
+
+            root = ElementTree.fromstring(xml_stream)
+
+            try:
+                title = root.find("TITLE").text
+            except AttributeError:
+                title = None
+
+            try:
+                artist = root.find("AUTHOR").text
+            except AttributeError:
+                artist = None
+
+            output = []
+
+            for item in root.findall("Entry"):
+                info = {"title": title, "artist": artist}
+
+                try:
+                    ref = item.find("ref")
+
+                    try:
+                        info["uri"] = ref.attrib["href"]
+                    except KeyError:
+                        continue
+                except AttributeError:
+                    continue
+
+                output.append(info)
+
+                self.cache[info["uri"]] = {"raw_uri": uri, "title": title,
+                                           "artist": artist}
+
+            if len(output) > 0:
+                return output
+        elif ".m3u" in uri:
+            # Read .pls file
+            if uri.startswith("http://"):
+                data = urlopen(uri).read().decode("utf")
+            else:
+                data = open(uri[7:]).read()
+
+            # Read data from the .pls file
+            title, artist = None, None
+            output = []
+
+            for line in data.split("\n"):
+                if line.startswith("#EXTINF"):
+                    value = line.split(",")[1].split("-")
+
+                    if len(value) == 2:
+                        artist, title = value
+                    else:
+                        title = value[0]
+                elif line.startswith("#"):
+                    continue
+                elif line.strip() == "":
+                    continue
+                else:
+                    info = {"title": title or uri, "artist": artist,
+                            "uri": line}
+
+                    output.append(info)
+                    self.cache[line] = {"title": title or uri,
+                                        "artist": artist,
+                                        "raw_uri": uri}
+
+                    title, artist = None, None
+
+            if len(output) > 0:
+                return output
 
         if uri in self.cache:
             info = self.cache[uri]
 
=== modified file 'cappella/management/media.py'
--- cappella/management/media.py	2013-04-28 18:56:14 +0000
+++ cappella/management/media.py	2013-04-29 03:13:27 +0000
@@ -21,7 +21,7 @@
 from ..config.cappella import settings
 from ..signalhandler import signal
 from ..tool import skipx
-from ..tool.media import process_pls
+from ..tool.media import is_playlist, process_playlist
 
 
 class Management():
@@ -273,8 +273,8 @@
         signal.emit("_musicengine_stop_")  # Stop playing items
 
         # Check is playable file (eg get uri from pls)
-        if ".pls" in uri:
-            uri = process_pls(uri)
+        if is_playlist(uri):
+            uri = process_playlist(uri)
             library = "stream_library"
 
             if type(uri) is list:
 
=== modified file 'cappella/tool/media.py'
--- cappella/tool/media.py	2013-04-28 18:49:59 +0000
+++ cappella/tool/media.py	2013-04-29 03:13:27 +0000
@@ -73,6 +73,12 @@
     return False
 
 
+def is_playlist(uri):
+    """ Check if the uri is a playlist """
+
+    return ".pls" in uri or ".asx" in uri or ".m3u" in uri
+
+
 def is_video(uri):
     """ Return True is uri is video """
 
@@ -92,12 +98,12 @@
     return False
 
 
-def process_pls(uri):
+def process_playlist(uri):
     # Get files from .pls
     library = "stream_library"
     info = signal.get_object("library").get(library, uri)
 
-    if type(info) is list:  # Some pls are playlists
+    if type(info) is list:  # Some multisong
         return info
     else:
         uri = info["uri"]
 
=== added file 'cappella/tool/parser.py'
--- cappella/tool/parser.py	1970-01-01 00:00:00 +0000
+++ cappella/tool/parser.py	2013-04-29 03:13:27 +0000
@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+'''
+ Copyright (C) 2011-2013 Andrew Hayzen and Simon Bull.
+
+ Cappella is a simple media player based on PyGObject for Ubuntu.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ this file.  If not, see <http://www.gnu.org/licenses/>.
+'''
+
+from urllib.request import urlopen
+from xml.dom import minidom
+
+
+class FeedToXml():
+    """ Read XML and parse from URL """
+    def __init__(self, url=None, data=None):
+        if url is not None:
+            self.stream = urlopen(url)
+        else:
+            self.stream = data
+
+        self.obj = minidom.parse(self.stream)
+
+        *proc, dom = self.obj.childNodes
+
+        self.xml = dom.toprettyxml()
 \ No newline at end of file