Merge lp:~dreamdevel/eradio/asxdecoder into lp:eradio/luna

[Fotini Skoti]

Added asx type support

[lp:~dreamdevel/eradio/asxdecoder]

62. By George Sofianos on 2014-07-02

Fixed indentation in asx decoder filen

[George Sofianos (georgesofianosgr)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-06-30 16:17:26 +0000
+++ CMakeLists.txt	2014-07-02 06:32:57 +0000
@@ -35,6 +35,7 @@
     libnotify
     json-glib-1.0
     libsoup-2.4
+    libxml-2.0
 )
 
 pkg_check_modules(DEPS REQUIRED ${PROJECT_DEPS})
@@ -70,6 +71,7 @@
     src/m3u_decoder.vala
     src/progress_dialog.vala
     src/pls_decoder.vala
+    src/asx_decoder.vala
 PACKAGES
     ${PROJECT_DEPS}
 )

=== modified file 'debian/control'
--- debian/control	2014-07-01 07:05:22 +0000
+++ debian/control	2014-07-02 06:32:57 +0000
@@ -12,7 +12,8 @@
                libgee-dev,
                libnotify-dev,
                libjson-glib-dev,
-               libsoup2.4-dev
+               libsoup2.4-dev,
+               libxml2-dev
 Standards-Version: 3.9.3
 
 Package: eradio

=== added file 'src/asx_decoder.vala'
--- src/asx_decoder.vala	1970-01-01 00:00:00 +0000
+++ src/asx_decoder.vala	2014-07-02 06:32:57 +0000
@@ -0,0 +1,95 @@
+/*-
+ *  Copyright (c) 2014 Dream Dev Developers (https://launchpad.net/~dreamdev)
+ *
+ *  This program 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 program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Authored by: Fotini Skoti <[e-mail]>
+ *
+ */
+
+ public class ASXDecoder {
+
+    public static Gee.ArrayList<string>? parse (string url) {
+
+        //download file to string
+        string file = get_file (url);
+        if (file == null) {
+            stderr.printf ("Failed to download file");
+            return null;
+        }
+
+        //lower case string
+        file = file.down();
+
+        unowned Xml.Doc doc = Xml.Parser.parse_doc (file);
+        if (doc == null) {
+            stderr.printf ("Unable to open file\n");
+            return null;
+        }
+
+        unowned Xml.Node root = doc.get_root_element ();
+        if (root == null) {
+            stdout.printf ("Wanted root\n");
+            return null;
+        }
+
+        var hrefs_list = new Gee.ArrayList<string> ();
+
+        if (root.name == "asx") {
+            for (unowned Xml.Node iter = root.children; iter != null; iter = iter.next) {
+                if (iter.type == Xml.ElementType.ELEMENT_NODE && iter.name == "entry") {
+                        var parsed_hrefs = get_hrefs (iter);
+                        foreach (string href in parsed_hrefs)
+                            hrefs_list.add(href);
+                }
+            }
+        }
+
+        if (hrefs_list.size == 0)
+            return null;
+
+        return hrefs_list;
+    }
+
+    private static Gee.ArrayList<string>? get_hrefs (Xml.Node node) {
+
+        var hrefs = new Gee.ArrayList<string> ();
+
+        for (unowned Xml.Node iter = node.children; iter != null; iter = iter.next) {
+            if (iter.type == Xml.ElementType.ELEMENT_NODE && iter.name == "ref") {
+                    hrefs.add (iter.get_prop ("href"));
+            }
+        }
+
+        if (hrefs == null)
+            return null;
+
+        return hrefs;
+    }
+
+    private static string? get_file (string url) {
+
+        Soup.SessionSync session = new Soup.SessionSync ();
+        Soup.Message msg = new Soup.Message ("GET", url);
+
+        session.send_message (msg);
+
+        var data = (string) msg.response_body.data;
+
+        if (msg.status_code == 200)
+            return data;
+        else
+            return null;
+    }
+}
\ No newline at end of file

=== modified file 'src/stream_player.vala'
--- src/stream_player.vala	2014-06-30 14:32:25 +0000
+++ src/stream_player.vala	2014-07-02 06:32:57 +0000
@@ -66,7 +66,11 @@
     public void add (string uri) throws Radio.Error{
 
         string final_uri = uri;
-        var content_type = this.get_content_type (uri);
+        string content_type = "";
+
+        if (final_uri.index_of("http") == 0){
+            content_type = this.get_content_type (uri);
+        }
 
         // Check content type to decode
         if ( content_type == "audio/x-mpegurl" || content_type == "audio/mpegurl" ) {
@@ -86,6 +90,14 @@
                 throw new Radio.Error.GENERAL ("Could not decode pls file, wrong url or corrupted file");
                 
         }
+        else if ( content_type == "video/x-ms-wmv" || content_type == "video/x-ms-wvx" || content_type == "video/x-ms-asf" || content_type == "video/x-ms-asx" || content_type == "audio/x-ms-wax" || uri.last_index_of (".asx",uri.length - 4) != -1) {
+            var list = ASXDecoder.parse (uri);
+            // Temporary ignoring all links beside the first
+            if ( list != null )
+                final_uri = list[0];
+            else
+                throw new Radio.Error.GENERAL ("Could not decode asx file, wrong url or corrupted file");
+        }
 
         this.has_url = true;