Merge lp:~artem-anufrij/audience/upnp-client into lp:~audience-members/audience/trunk

[Artem Anufrij]

UPnP-client support

[Zisu Andrei (matzipan)]

AFAICT looks good. Some review inline.

review: Needs Fixing

[lp:~artem-anufrij/audience/upnp-client]

699. By Artem Anufrij on 2016-11-10

support Rygel connection

700. By Artem Anufrij on 2016-11-12

show welcomescreen button when UPnP items detected

[Danielle Foré (danrabbit)]

Audience has migrated to GitHub. Please resubmit as a PR here: https://github.com/elementary/videos

Unmerged revisions

700. By Artem Anufrij on 2016-11-12

show welcomescreen button when UPnP items detected

699. By Artem Anufrij on 2016-11-10

support Rygel connection

698. By Artem Anufrij on 2016-11-09

fixed poster size for plex items

697. By Artem Anufrij on 2016-11-09

plex support can be tested

696. By Artem Anufrij on 2016-11-09

switch from SEARCH to BROWSE --> Plex doesn't support SEARCH action

695. By Artem Anufrij on 2016-11-08

remove items from library if device is no more available

694. By Artem Anufrij on 2016-11-06

added files

693. By Artem Anufrij on 2016-11-06

video-x-generic-symbolic for upnp items without poster

692. By Artem Anufrij on 2016-11-06

development

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-11-02 23:59:41 +0000
+++ src/CMakeLists.txt	2016-11-12 11:33:11 +0000
@@ -19,6 +19,10 @@
     gstreamer-video-1.0
     gstreamer-tag-1.0
     clutter-gst-3.0
+    gupnp-1.0
+    gupnp-av-1.0
+    gssdp-1.0
+    libxml-2.0
 )
 
 set (VALA_DEPS
@@ -30,6 +34,10 @@
     gstreamer-video-1.0
     gstreamer-tag-1.0
     clutter-gst-3.0
+    gupnp-1.0
+    gupnp-av-1.0
+    gssdp-1.0
+    libxml-2.0
 )
 
 pkg_check_modules (DEPS REQUIRED ${PKG_DEPS})
@@ -69,6 +77,7 @@
     Services/Inhibitor.vala
     Services/DirictoryMonitoring.vala
     Services/LibraryManager.vala
+    Services/UPnPManager.vala
     Services/Thubnailer.vala
 
     Objects/Video.vala

=== modified file 'src/Objects/Video.vala'
--- src/Objects/Video.vala	2016-09-27 20:26:37 +0000
+++ src/Objects/Video.vala	2016-11-12 11:33:11 +0000
@@ -1,4 +1,4 @@
-/*-
+ /*-
  * Copyright (c) 2016-2016 elementary LLC.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,6 +19,9 @@
  */
 
 namespace Audience.Objects {
+
+    public enum LibraryVideoType { LOCAL, UPNP }
+
     public class Video : Object {
         Audience.Services.LibraryManager manager;
 
@@ -27,18 +30,12 @@
         public signal void thumbnail_changed ();
         public signal void trashed ();
 
-        public File video_file { get; private set; }
-        public string directory { get; construct set; }
-        public string file { get; construct set; }
-
-        public string title { get; private set; }
+        public string title { get; construct set; }
         public int year { get; private set; default = -1;}
 
         public Gdk.Pixbuf? poster { get; private set; default = null; }
-        public Gdk.Pixbuf? thumbnail { get; private set; default = null; }
 
         public string mime_type { get; construct set; }
-        public string poster_cache_file { get; private set; }
 
         public string hash_file_poster { get; construct set; }
         public string hash_episode_poster { get; construct set; }
@@ -47,17 +44,33 @@
 
         public string container { get; construct set; default = ""; }
 
-        public Video (string directory, string file, string mime_type) {
-            Object (directory: directory, file: file, mime_type: mime_type);
-        }
-
-        construct {
-            manager = Audience.Services.LibraryManager.get_instance ();
-            manager.thumbler.finished.connect (dbus_finished);
-
-            title = Audience.get_title (file);
-
-            extract_metadata ();
+        // Local
+        public File video_file { get; private set; }
+        public string directory { get; construct set; }
+        public string file { get; construct set; }
+        public Gdk.Pixbuf? thumbnail { get; private set; default = null; }
+        public string poster_cache_file { get; private set; }
+
+        // UPnP
+        public string video_uri { get; construct set; default = "";}
+        public string poster_uri { get; construct set; }
+
+
+        public LibraryVideoType library_video_type { get; private set; }
+
+        public Video.local_media (string directory, string file, string mime_type) {
+            Object (title: Audience.get_title (file), directory: directory, file: file, mime_type: mime_type);
+            init_local ();
+        }
+
+        public Video.upnp_media (string container, string title, string video_uri, string poster_uri, string mime_type) {
+            Object (container: container, title: title, video_uri: video_uri, poster_uri: poster_uri, mime_type: mime_type);
+            init_upnp ();
+        }
+
+        private void init_local () {
+            library_video_type = LibraryVideoType.LOCAL;
+
             video_file = File.new_for_path (this.get_path ());
 
             if (directory != Audience.settings.library_folder) {
@@ -70,6 +83,20 @@
             thumbnail_large_path = Path.build_filename (GLib.Environment.get_user_cache_dir (),"thumbnails", "large", hash_file_poster + ".png");
             thumbnail_normal_path = Path.build_filename (GLib.Environment.get_user_cache_dir (),"thumbnails", "normal", hash_file_poster + ".png");
             poster_cache_file = Path.build_filename (App.get_instance ().get_cache_directory (), hash_file_poster + ".jpg");
+        }
+
+        private void init_upnp () {
+            library_video_type = LibraryVideoType.UPNP;
+            video_file = File.new_for_uri (video_uri);
+
+            hash_file_poster = GLib.Checksum.compute_for_string (ChecksumType.MD5, video_file.get_uri (), video_file.get_uri ().length);
+            thumbnail_large_path = Path.build_filename (GLib.Environment.get_user_cache_dir (),"thumbnails", "large", hash_file_poster + ".png");
+            thumbnail_normal_path = Path.build_filename (GLib.Environment.get_user_cache_dir (),"thumbnails", "normal", hash_file_poster + ".png");
+        }
+
+        construct {
+            manager = Audience.Services.LibraryManager.get_instance ();
+            manager.thumbler.finished.connect (dbus_finished);
 
             notify["poster"].connect (() => {
                 poster_changed (this);
@@ -80,6 +107,8 @@
             notify["thumbnail"].connect (() => {
                 thumbnail_changed ();
             });
+
+            extract_metadata ();
         }
 
         private void extract_metadata () {
@@ -87,8 +116,9 @@
             MatchInfo info;
             if (manager.regex_year.match (this.title, 0, out info)) {
                 year = int.parse (info.fetch (0).substring (1, 4));
-                title = this.title.replace (info.fetch (0) + ")", "").strip ();
+                title = title.replace (info.fetch (0) + ")", "").replace ("_", " ").strip ();
             }
+            title = title.replace ("_", " ").strip ();
         }
 
         public async void initialize_poster () {
@@ -103,47 +133,73 @@
             Gdk.Pixbuf? pixbuf = null;
 
             ThreadFunc<void*> run = () => {
-                if (!FileUtils.test (thumbnail_large_path, FileTest.EXISTS) || !FileUtils.test (thumbnail_normal_path, FileTest.EXISTS)) {
-                    // Call DBUS for create a new THUMBNAIL
-                    Gee.ArrayList<string> uris = new Gee.ArrayList<string> ();
-                    Gee.ArrayList<string> mimes = new Gee.ArrayList<string> ();
-
-                    uris.add (video_file.get_uri ());
-                    mimes.add (mime_type);
-
-                    manager.thumbler.Instand (uris, mimes, "large");
-                    manager.thumbler.Instand (uris, mimes, "normal");
-                }
-
-                string? poster_path = poster_cache_file;
-                pixbuf = manager.get_poster_from_file (poster_path);
-
-                // POSTER in Cache exists
-                if (pixbuf != null) {
-                    Idle.add ((owned) callback);
-                    return null;
-                }
-
-                poster_path = get_native_poster_path ();
-                if (poster_path != null) {
-                    pixbuf = manager.get_poster_from_file (poster_path);
-                }
-
-                // POSTER found
-                if (pixbuf != null) {
+                if (library_video_type == LibraryVideoType.LOCAL) {
+                    if (!FileUtils.test (thumbnail_large_path, FileTest.EXISTS) || !FileUtils.test (thumbnail_normal_path, FileTest.EXISTS)) {
+                        // Call DBUS for create a new THUMBNAIL
+                        Gee.ArrayList<string> uris = new Gee.ArrayList<string> ();
+                        Gee.ArrayList<string> mimes = new Gee.ArrayList<string> ();
+                        uris.add (video_file.get_uri ());
+                        mimes.add (mime_type);
+
+                        manager.thumbler.Instand (uris, mimes, "large");
+                        manager.thumbler.Instand (uris, mimes, "normal");
+                    }
+
+                    string? poster_path = poster_cache_file;
+                    pixbuf = manager.get_poster_from_file (poster_path);
+
+                    // POSTER in Cache exists
+                    if (pixbuf != null) {
+                        Idle.add ((owned) callback);
+                        return null;
+                    }
+
+                    poster_path = get_native_poster_path ();
+                    if (poster_path != null) {
+                        pixbuf = manager.get_poster_from_file (poster_path);
+                    }
+
+                    // POSTER found
+                    if (pixbuf != null) {
+                        try {
+                            pixbuf.save (poster_cache_file, "jpeg");
+                        } catch (Error e) {
+                            warning (e.message);
+                        }
+                        Idle.add ((owned) callback);
+                        return null;
+                    }
+
+                    if (FileUtils.test (thumbnail_large_path, FileTest.EXISTS)) {
+                        pixbuf = manager.get_poster_from_file (thumbnail_large_path);
+                        Idle.add ((owned) callback);
+                        return null;
+                    }
+                } else if (library_video_type == LibraryVideoType.UPNP) {
+                    string? poster_path = poster_uri;
+                    pixbuf = manager.get_poster_from_file (poster_path);
+
+                    // UPnP POSTER exists
+                    if (pixbuf != null) {
+                        Idle.add ((owned) callback);
+                        return null;
+                    }
+                    var p = new Gdk.Pixbuf (Gdk.Colorspace.RGB, true, 8, Audience.Services.POSTER_WIDTH, Audience.Services.POSTER_HEIGHT);
                     try {
-                        pixbuf.save (poster_cache_file, "jpeg");
+                        pixbuf = Gtk.IconTheme.get_default().load_icon ("video-x-generic-symbolic", 64, Gtk.IconLookupFlags.USE_BUILTIN);
                     } catch (Error e) {
                         warning (e.message);
                     }
-                    Idle.add ((owned) callback);
-                    return null;
-                }
-
-                if (FileUtils.test (thumbnail_large_path, FileTest.EXISTS)) {
-                    pixbuf = manager.get_poster_from_file (thumbnail_large_path);
-                    Idle.add ((owned) callback);
-                    return null;
+                    pixbuf.scale (p, 0, 0, Audience.Services.POSTER_WIDTH, Audience.Services.POSTER_HEIGHT,
+                        (Audience.Services.POSTER_WIDTH - 64) / 2,
+                        (Audience.Services.POSTER_HEIGHT - 64) / 2 - 1, 1, 1, Gdk.InterpType.HYPER);
+
+                    pixbuf = p;
+
+                    if (pixbuf != null) {
+                        Idle.add ((owned) callback);
+                        return null;
+                    }
                 }
 
                 Idle.add ((owned) callback);

=== modified file 'src/Services/LibraryManager.vala'
--- src/Services/LibraryManager.vala	2016-09-27 20:26:37 +0000
+++ src/Services/LibraryManager.vala	2016-11-12 11:33:11 +0000
@@ -129,7 +129,7 @@
             if (name == "") {
                 name = file_info.get_name ();
             }
-            var video = new Audience.Objects.Video (source, name, file_info.get_content_type ());
+            var video = new Audience.Objects.Video.local_media (source, name, file_info.get_content_type ());
             video_file_detected (video);
             poster_hash.add (video.hash_file_poster + ".jpg");
             poster_hash.add (video.hash_episode_poster + ".jpg");
@@ -194,22 +194,65 @@
 
         public Gdk.Pixbuf? get_poster_from_file (string poster_path) {
             Gdk.Pixbuf? pixbuf = null;
-            if (FileUtils.test (poster_path, FileTest.EXISTS)) {
-                try {
-                    pixbuf = new Gdk.Pixbuf.from_file_at_scale (poster_path, -1, Audience.Services.POSTER_HEIGHT, true);
-                } catch (Error e) {
-                    warning (e.message);
-                }
-                if (pixbuf == null) {
-                    return null;
-                }
-                // Cut THUMBNAIL images
+
+            if (poster_path.has_prefix ("http")) {
+                var http_file = File.new_for_uri (poster_path);
+                FileInputStream http_input;
+                try {
+                    http_input = http_file.read ();
+                } catch (Error e) {
+                    warning ("Unable to fetch '%s': %s", poster_path, e.message);
+                    return null;
+                }
+
+                var loader = new Gdk.PixbufLoader ();
+                var buf = new uint8[4096];
+                for (;;) {
+                    ssize_t bytes_read;
+                    try {
+                        bytes_read = http_input.read (buf);
+                        if (bytes_read == 0)
+                            break;
+                    } catch (IOError e) {
+                        warning ("Unable to read data from '%s': %s", poster_path, e.message);
+                        return null;
+                    }
+                    try {
+                        loader.write (buf[0:bytes_read]);
+                    } catch (Error e) {
+                        warning ("Unable to parse image from '%s': %s", poster_path, e.message);
+                        return null;
+                    }
+                }
+                try {
+                    loader.close ();
+                } catch (Error e) {
+                    warning ("Unable to parse image from '%s': %s", poster_path, e.message);
+                    return null;
+                }
+                pixbuf = loader.get_pixbuf ();
+            } else {
+                if (poster_path != "" && FileUtils.test (poster_path, FileTest.EXISTS)) {
+                    try {
+                        pixbuf = new Gdk.Pixbuf.from_file_at_scale (poster_path, -1, Audience.Services.POSTER_HEIGHT, true);
+                    } catch (Error e) {
+                        warning (e.message);
+                    }
+                    if (pixbuf == null) {
+                        return null;
+                    }
+                }
+            }
+
+            // Cut THUMBNAIL images
+            if (pixbuf != null) {
                 int width = pixbuf.width;
                 if (width > Audience.Services.POSTER_WIDTH) {
                     int x_offset = (width - Audience.Services.POSTER_WIDTH) / 2;
                     pixbuf = new Gdk.Pixbuf.subpixbuf (pixbuf, x_offset, 0, Audience.Services.POSTER_WIDTH, Audience.Services.POSTER_HEIGHT);
                 }
             }
+
             return pixbuf;
         }
     }

=== added file 'src/Services/UPnPManager.vala'
--- src/Services/UPnPManager.vala	1970-01-01 00:00:00 +0000
+++ src/Services/UPnPManager.vala	2016-11-12 11:33:11 +0000
@@ -0,0 +1,173 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2016-2016 elementary LLC.
+ *
+ * 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: Artem Anufrij <[e-mail]>
+ *
+ */
+
+namespace Audience.Services {
+    public class UPnPManager : Object {
+
+        public signal void video_item_detected (Audience.Objects.Video video);
+        public signal void sevice_unavailable (string device_uri);
+
+        GUPnP.Context context;
+        GUPnP.ControlPoint point;
+
+        public static UPnPManager instance = null;
+        public static UPnPManager get_instance () {
+            if (instance == null) {
+                instance = new UPnPManager ();
+            }
+
+            return instance;
+        }
+
+        private UPnPManager () {}
+
+        construct {
+            context = new GUPnP.Context(null, null, 0);
+
+            point = new GUPnP.ControlPoint(context, "urn:schemas-upnp-org:device:MediaServer:1");
+            point.device_proxy_unavailable.connect ((device_proxy) => {
+                debug ("DEVICE OFF: %s", device_proxy.get_friendly_name ());
+                string device_uri = device_proxy.get_presentation_url ();
+                sevice_unavailable (device_uri);
+            });
+            point.device_proxy_available.connect ((device_proxy) => {
+                debug ("DEVICE ON: %s", device_proxy.get_friendly_name ());
+                foreach (var si in device_proxy.list_services ()) {
+                    if (si.service_type.has_prefix("urn:schemas-upnp-org:service:ContentDirectory") && si is GUPnP.ServiceProxy) {
+                        var proxy = si as GUPnP.ServiceProxy;
+                        try {
+                            Gee.ArrayList<string> items = new Gee.ArrayList<string> ();
+                            expand_content (proxy, "0", items, "root");
+                        } catch (Error e) {
+                            warning (e.message);
+                        }
+                    }
+                }
+                debug ("DEVICE SCAN FINISHED: %s", device_proxy.get_friendly_name ());
+            });
+        }
+
+        private void expand_content (GUPnP.ServiceProxy proxy, string object_id, Gee.ArrayList<string> items, string parent) {
+            // SEARCH PARAMETER IN
+            List<string> in_names = new List<string> ();
+            List<unowned Value?> in_values = new List<unowned Value?> ();
+            in_names.append ("ObjectID");
+            in_names.append ("BrowseFlag");
+            in_names.append ("StartingIndex");
+            in_names.append ("RequestedCount");
+            in_names.append ("Filter");
+            in_names.append ("SortCriteria");
+            var val_object_id = Value (typeof (string));
+            val_object_id.set_string (object_id);
+            var val_browse_crit = Value (typeof (string));
+            val_browse_crit.set_string ("BrowseDirectChildren");
+            var val_start_index = Value (typeof (int));
+            val_start_index.set_int (0);
+            var val_req_count = Value (typeof (int));
+            val_req_count.set_int (0);
+            var val_filter = Value (typeof (string));
+            val_filter.set_string ("*");
+            var val_sort_crit = Value (typeof (string));
+            val_sort_crit.set_string ("");
+            in_values.append (val_object_id);
+            in_values.append (val_browse_crit);
+            in_values.append (val_start_index);
+            in_values.append (val_req_count);
+            in_values.append (val_filter);
+            in_values.append (val_sort_crit);
+
+            // SEARCH PARAMETER OUT
+            List<string> out_names = new List<string> ();
+            List<Type> out_types = new List<Type> ();
+            List<Value*> out_values = new List<Value*> ();
+            out_names.append ("Result");
+            out_types.append (typeof (string));
+
+            proxy.send_action_list ("Browse", in_names, in_values, out_names, out_types, out out_values);
+
+            var parser = new GUPnP.DIDLLiteParser ();
+            parser.container_available.connect ((container) => {
+                if (container.id != object_id && (container.parent_id == object_id || object_id == "0")) {
+                    expand_content (proxy, container.id, items, container.title);
+                }
+            });
+            parser.item_available.connect ((item) => {
+                crate_upnp_object (item, items, parent);
+            });
+
+            // PARSE ITEMS
+            foreach (Value* v in out_values) {
+                string output = v.get_string();
+                v.unset();
+                GLib.Slice.free (sizeof(Value), v);
+                try {
+                    GUPnP.MediaCollection media_collection = new GUPnP.MediaCollection.from_string (output);
+                    if (media_collection.get_items ().length () > 0) {
+                        foreach (var item in media_collection.get_items ()) {
+                            crate_upnp_object (item, items, parent);
+                        }
+                    } else {
+                        parser.parse_didl (output);
+                    }
+
+                } catch (Error e) {
+                    //PARSTER THROWS AN EXCEPTION IF VALUE IS EMPTY
+                    //IT CAN BE IGNORED
+                    debug (e.message);
+                }
+            }
+        }
+
+        private void crate_upnp_object (GUPnP.DIDLLiteObject item, Gee.ArrayList<string> items, string parent) {
+            if (item.upnp_class.has_prefix("object.item.videoItem")) {
+                string video_uri = "";
+                string poster_uri = "";
+                string mime_type = "";
+
+                foreach (var res in item.get_resources ()) {
+                    if (res.protocol_info.mime_type.has_prefix ("video")) {
+                        video_uri = res.uri;
+                        mime_type = res.protocol_info.mime_type;
+                    } else if (res.protocol_info.mime_type.has_prefix ("image")) {
+                        poster_uri = res.uri;
+                    }
+                }
+
+                if (poster_uri == "" && item.album_art != null) {
+                    poster_uri = item.album_art;
+                }
+
+                if (video_uri != "" && !items.contains (video_uri)) {
+                    items.add (video_uri);
+                    video_item_detected (new Audience.Objects.Video.upnp_media (parent, item.title, video_uri, poster_uri, mime_type));
+                }
+            }
+        }
+
+        public bool active {
+            get {
+                return point.active;
+            } set {
+                point.active = value;
+            }
+        }
+    }
+}

=== modified file 'src/Widgets/Library/EpisodesPage.vala'
--- src/Widgets/Library/EpisodesPage.vala	2016-11-02 23:59:41 +0000
+++ src/Widgets/Library/EpisodesPage.vala	2016-11-12 11:33:11 +0000
@@ -27,6 +27,7 @@
         Granite.Widgets.AlertView alert_view;
 
         public Audience.Services.LibraryManager manager;
+        public Audience.Services.UPnPManager upnp;
 
         string query;
 
@@ -65,6 +66,9 @@
             manager = Audience.Services.LibraryManager.get_instance ();
             manager.video_file_deleted.connect (remove_item_from_path);
             manager.video_file_detected.connect (add_item);
+
+            upnp = Audience.Services.UPnPManager.get_instance ();
+            upnp.sevice_unavailable.connect (remove_item_from_path);
         }
 
         public void set_episodes_items (Gee.ArrayList<Audience.Objects.Video> episodes) {
@@ -80,6 +84,7 @@
         private void play_video (Gtk.FlowBoxChild item) {
             var selected = (item as Audience.LibraryItem);
             var video = selected.episodes.first ();
+            debug (video.video_file.get_uri () + " - " + video.video_file.query_exists ().to_string ());
             if (video.video_file.query_exists ()) {
                 bool from_beginning = video.video_file.get_uri () != settings.current_video;
                 App.get_instance ().mainwindow.play_file (video.video_file.get_uri (), from_beginning);
@@ -102,10 +107,9 @@
             }
 
             string[] filter_elements = query.split (" ");
-            var video_title = (child as LibraryItem).get_title ();
 
             foreach (string filter_element in filter_elements) {
-                if (!video_title.down ().contains (filter_element.down ())) {
+                if (!(child as LibraryItem).title.down ().contains (filter_element.down ())) {
                     return false;
                 }
             }
@@ -116,7 +120,7 @@
             var item1 = (LibraryItem)child1;
             var item2 = (LibraryItem)child2;
             if (item1 != null && item2 != null) {
-                return item1.episodes.first ().file.collate (item2.episodes.first ().file);
+                return item1.episodes.first ().title.collate (item2.episodes.first ().title);
             }
             return 0;
         }
@@ -132,7 +136,9 @@
 
         private async void remove_item_from_path (string path ) {
             foreach (var child in view_episodes.get_children ()) {
-                if ((child as LibraryItem).episodes.size == 0 || (child as LibraryItem).episodes.first ().video_file.get_path ().has_prefix (path)) {
+                if ((child as LibraryItem).episodes.size == 0
+                    || (child as LibraryItem).episodes.first ().video_file.get_uri ().has_prefix (path)
+                    || (child as LibraryItem).episodes.first ().video_file.get_path ().has_prefix (path)) {
                     child.dispose ();
                 }
             }

=== modified file 'src/Widgets/Library/LibraryItem.vala'
--- src/Widgets/Library/LibraryItem.vala	2016-11-02 23:59:41 +0000
+++ src/Widgets/Library/LibraryItem.vala	2016-11-12 11:33:11 +0000
@@ -50,9 +50,13 @@
             video.title_changed.connect (video_title_changed);
             video.poster_changed.connect (video_poster_changed);
 
-            hash = GLib.Checksum.compute_for_string (ChecksumType.MD5, video.video_file.get_parent ().get_uri (), video.video_file.get_parent ().get_uri ().length);
-            episode_poster_path = Path.build_filename (video.video_file.get_parent ().get_path (), video.video_file.get_parent ().get_basename () + ".jpg");
-            poster_cache_file = Path.build_filename (App.get_instance ().get_cache_directory (), hash + ".jpg");
+            if (video.library_video_type == Audience.Objects.LibraryVideoType.LOCAL) {
+                hash = GLib.Checksum.compute_for_string (ChecksumType.MD5, video.video_file.get_parent ().get_uri (), video.video_file.get_parent ().get_uri ().length);
+                episode_poster_path = Path.build_filename (video.video_file.get_parent ().get_path (), video.video_file.get_parent ().get_basename () + ".jpg");
+                poster_cache_file = Path.build_filename (App.get_instance ().get_cache_directory (), hash + ".jpg");
+            } else if (video.library_video_type == Audience.Objects.LibraryVideoType.UPNP) {
+                poster_cache_file = video.poster_uri;
+            }
         }
 
         construct {
@@ -141,7 +145,9 @@
         }
 
         private bool show_context_menu (Gtk.Widget sender, Gdk.EventButton evt) {
-            if (evt.type == Gdk.EventType.BUTTON_PRESS && evt.button == 3) {
+            if (episodes.first ().library_video_type == Audience.Objects.LibraryVideoType.LOCAL
+                && evt.type == Gdk.EventType.BUTTON_PRESS
+                && evt.button == 3) {
                 context_menu.popup (null, null, null, evt.button, evt.time);
                 return true;
             }
@@ -156,9 +162,9 @@
 
         private void video_title_changed (Audience.Objects.Video video) {
              if (episodes.size == 1) {
-                 title_label.label = video.title;
+                 title = video.title;
              } else {
-                 title_label.label = video.container;
+                 title = video.container;
              }
              title_label.show ();
         }
@@ -220,15 +226,19 @@
             });
             episodes.add (episode);
             if (episodes.size == 1) {
-                title_label.label = episode.title;
+                title = episode.title;
             } else if (episodes.size == 2) {
-                title_label.label = episode.container;
+                title = episode.container;
                 create_episode_poster ();
             }
         }
 
-        public string get_title () {
-            return title_label.label;
+        public string title {
+            get {
+                return title_label.label;
+            } set {
+                title_label.label = value;
+            }
         }
 
         public void create_episode_poster () {

=== modified file 'src/Widgets/Library/LibraryPage.vala'
--- src/Widgets/Library/LibraryPage.vala	2016-11-02 23:59:41 +0000
+++ src/Widgets/Library/LibraryPage.vala	2016-11-12 11:33:11 +0000
@@ -27,6 +27,7 @@
 
         public Gtk.FlowBox view_movies;
         public Audience.Services.LibraryManager manager;
+        public Audience.Services.UPnPManager upnp;
         public Gtk.ScrolledWindow scrolled_window;
         bool poster_initialized = false;
         string query;
@@ -45,7 +46,7 @@
 
         construct {
             manager = Audience.Services.LibraryManager.get_instance ();
-
+            upnp = Audience.Services.UPnPManager.get_instance ();
             query = "";
 
             scrolled_window = new Gtk.ScrolledWindow (null, null);
@@ -62,7 +63,16 @@
 
             scrolled_window.add (view_movies);
 
-            manager = Audience.Services.LibraryManager.get_instance ();
+            upnp.sevice_unavailable.connect ((device_uri) => {
+                foreach (var child in view_movies.get_children ()) {
+                    foreach (var video in (child as LibraryItem).episodes) {
+                        if (video.video_uri != null && video.video_uri.has_prefix(device_uri)) {
+                            remove_item.begin (child as LibraryItem);
+                        }
+                    }
+                }
+            });
+
             manager.video_file_detected.connect (add_item);
             manager.video_file_deleted.connect (remove_item_from_path);
             manager.video_moved_to_trash.connect ((video) => {
@@ -71,6 +81,10 @@
 
             manager.begin_scan ();
 
+            upnp.video_item_detected.connect (add_item);
+            upnp.active = true;
+
+
             map.connect (() => {
                 if (!poster_initialized) {
                     poster_initialized = true;
@@ -89,7 +103,11 @@
 
             if (selected.episodes.size == 1) {
                 bool from_beginning = selected.episodes.first ().video_file.get_uri () != settings.current_video;
-                App.get_instance ().mainwindow.play_file (selected.episodes.first ().video_file.get_uri (), from_beginning);
+                if (selected.episodes.first ().library_video_type == Audience.Objects.LibraryVideoType.LOCAL) {
+                    App.get_instance ().mainwindow.play_file (selected.episodes.first ().video_file.get_uri (), from_beginning);
+                } else if (selected.episodes.first ().library_video_type == Audience.Objects.LibraryVideoType.UPNP) {
+                    App.get_instance ().mainwindow.play_file (selected.episodes.first ().video_uri, from_beginning);
+                }
             } else {
                 last_filter = query;
                 show_episodes (selected);
@@ -100,6 +118,9 @@
             foreach (var child in view_movies.get_children ()) {
                 if (video.container != null && (child as LibraryItem).episodes.first ().container == video.container) {
                     (child as LibraryItem).add_episode (video);
+                    if ((child as LibraryItem).episodes.size == 2) {
+                        view_movies.invalidate_sort ();
+                    }
                     return;
                 }
             }
@@ -113,7 +134,9 @@
 
         private async void remove_item (LibraryItem item) {
             foreach (var video in item.episodes) {
-                manager.clear_cache.begin (video.poster_cache_file);
+                if (video.poster_cache_file != null) {
+                    manager.clear_cache.begin (video.poster_cache_file);
+                }
             }
             item.dispose ();
         }
@@ -142,10 +165,9 @@
             }
 
             string[] filter_elements = query.split (" ");
-            var video_title = (child as LibraryItem).get_title ();
 
             foreach (string filter_element in filter_elements) {
-                if (!video_title.down ().contains (filter_element.down ())) {
+                if (!(child as LibraryItem).title.down ().contains (filter_element.down ())) {
                     return false;
                 }
             }
@@ -156,7 +178,7 @@
             var item1 = (LibraryItem)child1;
             var item2 = (LibraryItem)child2;
             if (item1 != null && item2 != null) {
-                return item1.get_title ().collate (item2.get_title ());
+                return item1.title.collate (item2.title);
             }
             return 0;
         }

=== modified file 'src/Widgets/WelcomePage.vala'
--- src/Widgets/WelcomePage.vala	2016-09-28 02:32:33 +0000
+++ src/Widgets/WelcomePage.vala	2016-11-12 11:33:11 +0000
@@ -2,6 +2,7 @@
     public class WelcomePage : Granite.Widgets.Welcome {
         private DiskManager disk_manager;
         private Services.LibraryManager library_manager;
+        private Services.UPnPManager upnp_manager;
         public WelcomePage () {
             base (_("No Videos Open"), _("Select a source to begin playing."));
         }
@@ -44,6 +45,12 @@
                 set_item_visible (3, LibraryPage.get_instance ().has_items);
             });
 
+            upnp_manager = Services.UPnPManager.get_instance ();
+            upnp_manager.video_item_detected.connect ((vid) => {
+                set_item_visible (3, true);
+                this.show_all ();
+            });
+
             append ("media-cdrom", _("Play from Disc"), _("Watch a DVD or open a file from disc"));
             set_item_visible (2, disk_manager.has_media_volumes ());
 

=== modified file 'src/Window.vala'
--- src/Window.vala	2016-09-27 19:58:34 +0000
+++ src/Window.vala	2016-11-12 11:33:11 +0000
@@ -106,7 +106,7 @@
             episodes_page.set_episodes_items (item.episodes);
             episodes_page.poster.pixbuf = item.poster.pixbuf;
             main_stack.set_visible_child (episodes_page);
-            this.title = item.get_title ();
+            this.title = item.title;
             search_entry.text = "";
         });