Merge lp:~artem-anufrij/audience/library-view into lp:~audience-members/audience/trunk

[Danielle Foré]

Create a library view

[Danielle Foré (danrabbit)]

* I don't think the words "Back to" are necessary. On other back buttons we just put the thing you're going back to. So "Library" and "Welcome Screen" are probably fine.

* The window title doesn't seem to update when you change screens. It should show "Videos" on the Library and Welcome pages

* I think these pages should be added to a Gtk.Stack so we can have a nice swipe animation when moving back like you see in Switchboard

* There should probably be some kind of placeholder for when Videos is unable to fetch a poster image

* The shortcut "alt + left" should activate the back button

[Danielle Foré (danrabbit)]

* Instead of the magnifying glass icon, use "folder-videos"

* re: question in slack about if library >0, I think that should be the eventual behavior, but I think that would require moving the "resume last video" (and maybe "open file") items into the library so that they remain accessible even if you have a library.

[Artem Anufrij (artem-anufrij)]

DONE: I don't think the words "Back to" are necessary. On other back buttons we just put the thing you're going back to. So "Library" and "Welcome Screen" are probably fine.

[Artem Anufrij (artem-anufrij)]

DONE: The window title doesn't seem to update when you change screens. It should show "Videos" on the Library and Welcome pages

[Danielle Foré (danrabbit)]

If I select "Resume last video" and then use the back button to return to the Welcome, the video will continue to play in the background (I can hear it). This doesn't happen when choosing a video from the library

[Adam Bieńkowski (donadigo)]

I commented on some things in the code, mostly code style issues, but also some different ones about using native functions.

[Artem Anufrij (artem-anufrij)]

@Daniel: Done

@Adam: Done

thanks for your feedback....

[Danielle Foré (danrabbit)]

Please don't add any more features until we debug the existing ones ;)

* Keyboard navigation doesn't seem to work

* I now have a "TV Shows" heading even though I don't have any TV shows

review: Needs Fixing

[Danielle Foré (danrabbit)]

* Please remove the h4 from video titles. This style class is usually used for category or section headers
* Add 12px row spacing to the library item grid
* You shouldn't have more than one h1 on a single screen, so for section titles, h2 is probably more appropriate

[Danielle Foré (danrabbit)]

I really don't like this "tv-shows-indicator". This seems like a super hacky and unreliable way to figure out if something is a TV Show

[Danielle Foré (danrabbit)]

* Can we add the "card" class to cover images? this gives them a nice little box shadow
* It looks like your flowbox has valign set to fill. This causes a funny looking selection when you have a small library. this should probably be set to either CENTER or START

[Danielle Foré (danrabbit)]

* Should probably also add row and column spacing of 12 to the flowbox to make sure item labels don't crash into each other.

[Danielle Foré (danrabbit)]

Re-posted outstanding issues since Launchpad doesn't have cool checkboxes like GitHub:

* No arrow key navigation in the library
* Alt + left arrow should activate the back button

[Danielle Foré (danrabbit)]

Rico wants us to be using GObject-style construction, I think we should make an effort to do this for new code https://chebizarro.gitbooks.io/the-vala-tutorial/content/gobject-style-construction.html

[Danielle Foré (danrabbit)]

If I rename a file in Files, Audience won't update until I close it. Since it can't find the file, clicking the item can't play it. We should probably just autoremove missing files

[Danielle Foré (danrabbit)]

It looks like the keyboard navigation not working is a problem with other views and isn't just in this branch. Tracking it separately here: https://bugs.launchpad.net/audience/+bug/1624940

That shouldn't be a blocker on this branch

[Danielle Foré (danrabbit)]

Let's change "Open Library" to "Browse Library" for clarity so we're not implying that a new window will appear :)

[Danielle Foré (danrabbit)]

Getting this error:

[FATAL 14:59:35.076098] Video.vala:124: Failed to open '/home/daniel/.cache/audience/30436b5461215ef466cac2b7d320089c.jpg' for writing: No such file or directory

I don't have ~/.cache/audience. If the folder doesn't exist, we should create it

[Danielle Foré (danrabbit)]

Hm it seems that the item is only removed when clicked. Can we use GLib.FileMonitor or something instead so that it updates live?

[Danielle Foré (danrabbit)]

If I delete a file, it doesn't seem to clear the associated cover image from .cache

[Danielle Foré (danrabbit)]

Made some diff comments

[Danielle Foré (danrabbit)]

We should add margin_bottom = 12 to the label in a library item. That way the selection from flowbox will look nicer

[Felipe Escoto (philip.scott)]

Made some comments on the diff about code style, but also:

- The library shouldn't be loaded into memory unless the user requests it. This is currently causing a long startup time when you just click on a file to open ;)

Non-blockers, but would be nice on this MR:
- Load the library async: Even if we are not loading the library on startup, clicking on it would still take a bit of time where it would look like its' frozen. Loading it async should also fix that
- HD Thumbnails. Because high res is best res

review: Needs Fixing

[Artem Anufrij (artem-anufrij)]

Thank you guys for your feedback.

@ Felipe:
* how can I hide the library button (on welcome screen) if I don't check the files?

* library loads already async
public void begin_scan () {
   detect_video_files.begin (Audience.settings.library_folder);
}

poster check is async, too:
public async void initialize_poster ()

[Djax (parnold-x)]

async still blocks if there is no yield.
Maybe just do the checking for viedo files at startup and finish the initalization with poster and stuff on entering the library.

[Artem Anufrij (artem-anufrij)]

@Djax: Thats a good idea. I will do that.

[Danielle Foré (danrabbit)]

Re-posting outstanding issues again:

* We should add margin_bottom = 12 to the library item. That way the selection from flowbox will look nicer and match the top

* If I delete a file, it doesn't seem to clear the associated cover image from .cache

* It seems that a missing item is only removed when clicked. Can we use GLib.FileMonitor or something instead so that it updates live?

[Danielle Foré (danrabbit)]

The spinner should probably be packed into a grid (or another stylable widget) and have the card class and set size request on that widget so the spinner itself can be a sane size like 32px

[Danielle Foré (danrabbit)]

I'm gonna give a UX approve. I can't really find anything else to complain about right now ;) Looks good. Thank you for your hard work!

I do have some diff comments for code style :)

review: Approve (ux)

[Danielle Foré (danrabbit)]

Oops found an issue:
1. Have an empty videos folder
2. Open Audience
3. see that browse library is not available
4. Add a movie to videos folder

Expectation: The Browse Library button appears

Reality: Nothing happens

[Cody Garver (codygarver)]

I found 2 issues:

* If you start playing a video from the library, then return to the library by clicking "Back", then hit the Play key on the keyboard, it plays the audio from the video you exited. Maybe it's not actually closing the video?

* If you start playing a video, then return to the library by clicking "Back", then play the same video, it momentarily remembers where you were at in the video but then it starts playing it from the beginning. It should always remember the playback progress.

review: Needs Fixing

[Danielle Foré (danrabbit)]

review: Needs Fixing

[Danielle Foré (danrabbit)]

1. Start with something in your videos folder
2. Open Videos; See that the "Browse Library" option is available
3. Remove all items from your videos folder

Expectation: The "Browse Library" option goes away
Reality: It stays and clicking it shoes an empty library

[lp:~artem-anufrij/audience/library-view]

704. By Artem Anufrij on 2016-09-21

hide welcome button if all video files were deleted

[Danielle Foré (danrabbit)]

Alright, that seems pretty damn robust. Really having trouble finding new and exciting ways to break things. Looks good :)

review: Approve (ux)

[Felipe Escoto (philip.scott)]

Thank you for doing my requested fixes :) Now i just have one blocker before merging:

If you clear your cache on ~/.cache/thumbnails/large (As if it was on a first try), the app takes 100% CPU, as if it was trying to make all thumbnails at once... The thumbnails are created fine, and next time you load it they will all be there, but on that first run it just stays stuck trying to load them all.

review: Needs Fixing

[Felipe Escoto (philip.scott)]

Also made some comments regarding code style, but overall it looks very nice! Great job :)

[lp:~artem-anufrij/audience/library-view]

705. By Artem Anufrij on 2016-09-22

code style

706. By Artem Anufrij on 2016-09-22

improve multithreading

707. By Artem Anufrij on 2016-09-22

removed unused code

708. By Artem Anufrij on 2016-09-22

build_path -> build_filename

709. By Artem Anufrij on 2016-09-22

fixed: Replay button shows last played video

710. By Artem Anufrij on 2016-09-22

fixed last played video button

[Felipe Escoto (philip.scott)]

Thank you for dealing with our requests! :) You rock man

review: Approve

=== modified file 'data/org.pantheon.audience.gschema.xml'
--- data/org.pantheon.audience.gschema.xml	2016-03-14 13:10:18 +0000
+++ data/org.pantheon.audience.gschema.xml	2016-09-22 18:15:35 +0000
@@ -49,5 +49,15 @@
             <summary>Cause the audience window to stay on top by default when it's playing</summary>
             <description>Set the option to keep the audience window above all other windows by default when audience is currently playing</description>
         </key>
+        <key name="library-folder" type="s">
+            <default>""</default>
+            <summary>Library folder</summary>
+            <description></description>
+        </key>
+        <key name="poster-names" type="as">
+            <default>['poster.jpg','Poster.jpg','cover.jpg','Cover.jpg']</default>
+            <summary>Poster file names</summary>
+            <description></description>
+        </key>
     </schema>
 </schemalist>

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2016-08-28 04:19:38 +0000
+++ src/Audience.vala	2016-09-22 18:15:35 +0000
@@ -65,7 +65,8 @@
             translate_url = "https://translations.launchpad.net/audience";
 
             about_authors = { "Cody Garver <[e-mail]>",
-                              "Tom Beckmann <[e-mail]>" };
+                              "Tom Beckmann <[e-mail]>",
+                              "Artem Anufrij <[e-mail]>" };
             about_translators = _("translator-credits");
             about_license_type = Gtk.License.GPL_3_0;
         }
@@ -89,6 +90,18 @@
                 if (settings.last_folder == "-1") {
                     settings.last_folder = Environment.get_user_special_dir (GLib.UserDirectory.VIDEOS);
                 }
+                if (settings.library_folder == "") {
+                    settings.library_folder = GLib.Environment.get_user_special_dir (GLib.UserDirectory.VIDEOS);
+                }
+
+                try {
+                    File cache = File.new_for_path (get_cache_directory ());
+                    if (!cache.query_exists ()) {
+                        cache.make_directory ();
+                    }
+                } catch (Error e) {
+                    error (e.message);
+                }
 
                 mainwindow = new Window ();
                 mainwindow.application = this;
@@ -96,6 +109,10 @@
             }
         }
 
+        public string get_cache_directory () {
+            return GLib.Path.build_filename(GLib.Environment.get_user_cache_dir (), exec_name);
+        }
+
         //the application was requested to open some files
         public override void open (File[] files, string hint) {
             activate ();

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-08-01 18:46:23 +0000
+++ src/CMakeLists.txt	2016-09-22 18:15:35 +0000
@@ -57,7 +57,13 @@
     Widgets/PlaylistPopover.vala
     Widgets/WelcomePage.vala
     Widgets/PlayerPage.vala
+    Widgets/LibraryPage.vala
+    Widgets/LibraryItem.vala
+    Widgets/NavigationButton.vala
     Services/Inhibitor.vala
+    Services/LibraryManager.vala
+    Services/Thubnailer.vala
+    Objects/Video.vala
   PACKAGES
     ${VALA_DEPS}
   OPTIONS

=== added directory 'src/Objects'
=== added file 'src/Objects/Video.vala'
--- src/Objects/Video.vala	1970-01-01 00:00:00 +0000
+++ src/Objects/Video.vala	2016-09-22 18:15:35 +0000
@@ -0,0 +1,196 @@
+/*-
+ * 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.Objects {
+    public class Video : Object {
+        Audience.Services.LibraryManager manager;
+
+        public signal void poster_changed ();
+        public signal void title_changed ();
+
+        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 int year { get; private set; }
+
+        public Gdk.Pixbuf? poster { get; private set; }
+
+        public string mime_type { get; construct set; }
+        public string poster_cache_file { get; private set; }
+
+        public string hash { get; construct set; }
+
+        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);
+
+            this.title = Audience.get_title (file);
+
+            this.extract_metadata ();
+            video_file = File.new_for_path (this.get_path ());
+
+            hash = GLib.Checksum.compute_for_string (ChecksumType.MD5, this.get_path (), this.get_path ().length);
+
+            poster_cache_file = Path.build_filename (App.get_instance ().get_cache_directory (), hash + ".jpg");
+
+            notify["poster"].connect (() => {
+                poster_changed ();
+            });
+            notify["title"].connect (() => {
+                title_changed ();
+            });
+        }
+
+        private void extract_metadata () {
+            // exclude YEAR from Title
+            MatchInfo info;
+            if (manager.regex_year.match (this.title, 0, out info)) {
+                this.year = int.parse (info.fetch (0).substring (1, 4));
+                this.title = this.title.replace (info.fetch (0) + ")", "");
+            }
+        }
+
+        public async void initialize_poster () {
+            initialize_poster_thread.begin ((obj, res) => {
+                this.poster = initialize_poster_thread.end (res);
+            });
+        }
+
+        public async Gdk.Pixbuf? initialize_poster_thread () {
+            SourceFunc callback = initialize_poster_thread.callback;
+            Gdk.Pixbuf? pixbuf = null;
+
+            ThreadFunc<void*> run = () => {
+
+                string poster_path = poster_cache_file;
+                pixbuf = get_poster_from_file (poster_path);
+
+                // POSTER in Cache exists
+                if (pixbuf != null) {
+                    Idle.add ((owned) callback);
+                    return null;
+                }
+
+                // Try to find a POSTER in same folder of video file
+                if (pixbuf == null) {
+                    poster_path = this.get_path () + ".jpg";
+                    pixbuf = get_poster_from_file (poster_path);
+                }
+
+                if (pixbuf == null) {
+                    poster_path = Path.build_filename (this.directory, Audience.get_title (file) + ".jpg");
+                    pixbuf = get_poster_from_file (poster_path);
+                }
+
+                foreach (string s in Audience.settings.poster_names) {
+                    if (pixbuf == null) {
+                        poster_path = Path.build_filename (this.directory, s);
+                        pixbuf = get_poster_from_file (poster_path);
+                    } else {
+                        break;
+                    }
+                }
+
+                // POSTER found
+                if (pixbuf != null) {
+                    try {
+                        pixbuf.save (poster_cache_file, "jpeg");
+                    } catch (Error e) {
+                        warning (e.message);
+                    }
+                    Idle.add ((owned) callback);
+                    return null;
+                }
+
+                // Check if THUMBNAIL exists
+                string? thumbnail_path = manager.get_thumbnail_path (video_file);
+                if (thumbnail_path != null) {
+                    pixbuf = get_poster_from_file (thumbnail_path);
+                    Idle.add ((owned) callback);
+                    return null;
+                }
+
+                // 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);
+
+                Idle.add ((owned) callback);
+                return null;
+            };
+
+            try {
+                new Thread<void*>.try (null, run);
+            } catch (Error e) {
+                error (e.message);
+            }
+
+            yield;
+
+            return pixbuf;
+        }
+
+        private void dbus_finished (uint heandle) {
+            if (poster == null) {
+                string? thumbnail_path = manager.get_thumbnail_path (video_file);
+                if (thumbnail_path != null) {
+                    poster = get_poster_from_file (thumbnail_path);
+                }
+            }
+        }
+
+        public string get_path () {
+            return Path.build_filename (directory, file);
+        }
+
+        public Gdk.Pixbuf? get_poster_from_file (string poster_path) {
+            Gdk.Pixbuf pixbuf = null;
+            if (File.new_for_path (poster_path).query_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
+                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/LibraryManager.vala'
--- src/Services/LibraryManager.vala	1970-01-01 00:00:00 +0000
+++ src/Services/LibraryManager.vala	2016-09-22 18:15:35 +0000
@@ -0,0 +1,183 @@
+// -*- 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 const int POSTER_WIDTH = 170;
+    public const int POSTER_HEIGHT = 240;
+
+    public class LibraryManager : Object {
+
+        public signal void video_file_detected (Audience.Objects.Video video);
+        public signal void video_file_deleted (string path);
+        public signal void finished ();
+
+        public Regex regex_year { get; construct set; }
+        public DbusThumbnailer thumbler { get; construct set; }
+
+        public bool has_items { get; private set; }
+
+        private Gee.ArrayList<string> poster_hash;
+        private Gee.ArrayList<FileMonitor> monitoring_directories;
+
+        public static LibraryManager instance = null;
+        public static LibraryManager get_instance () {
+            if (instance == null) {
+                instance = new LibraryManager ();
+            }
+
+            return instance;
+        }
+
+        private LibraryManager () {
+        }
+
+        construct {
+            poster_hash = new Gee.ArrayList<string> ();
+            monitoring_directories = new Gee.ArrayList<FileMonitor> ();
+            try {
+                regex_year = new Regex ("\\(\\d\\d\\d\\d(?=(\\)$))");
+            } catch (Error e) {
+                error (e.message);
+            }
+            thumbler = new DbusThumbnailer ();
+
+            finished.connect (() => { clear_unused_cache_files.begin (); });
+        }
+
+        public void begin_scan () {
+            detect_video_files.begin (Audience.settings.library_folder);
+        }
+
+        public async void detect_video_files (string source) throws GLib.Error {
+            File directory = File.new_for_path (source);
+
+            FileMonitor monitor = directory.monitor (FileMonitorFlags.NONE, null);
+            monitor.changed.connect ((src, dest, event) => {
+                if (event == GLib.FileMonitorEvent.DELETED) {
+                    video_file_deleted (src.get_path ());
+                }
+                else if (event == GLib.FileMonitorEvent.CHANGES_DONE_HINT) {
+                    FileInfo file_info;
+                    try {
+                        file_info = src.query_info (FileAttribute.STANDARD_CONTENT_TYPE + "," + FileAttribute.STANDARD_IS_HIDDEN + "," + FileAttribute.STANDARD_TYPE, 0);
+                    } catch (Error e) {
+                        warning (e.message);
+                        return;
+                    }
+                    if (file_info.get_file_type () == FileType.DIRECTORY) {
+                        detect_video_files.begin (src.get_path ());
+                    } else if (is_file_valid (file_info)) {
+                        string src_path = src.get_path ();
+                        crate_video_object (file_info, Path.get_dirname (src_path), Path.get_basename (src_path));
+                    }
+                }
+            });
+            monitoring_directories.add (monitor);
+
+            var children = directory.enumerate_children (FileAttribute.STANDARD_CONTENT_TYPE + "," + FileAttribute.STANDARD_IS_HIDDEN, 0);
+
+            if (children != null) {
+                FileInfo file_info;
+                while ((file_info = children.next_file ()) != null) {
+                    if (file_info.get_file_type () == FileType.DIRECTORY) {
+                        detect_video_files.begin (source + "/" + file_info.get_name ());
+                        continue;
+                    }
+
+                    if (is_file_valid (file_info)) {
+                        crate_video_object (file_info, source);
+                    }
+                }
+            }
+            if (directory.get_path () == Audience.settings.library_folder) {
+                finished ();
+            }
+        }
+
+        private bool is_file_valid (FileInfo file_info) {
+            string mime_type = file_info.get_content_type ();
+            return !file_info.get_is_hidden () && mime_type.contains ("video");
+        }
+
+        private void crate_video_object (FileInfo file_info, string source, string name = "") {
+            if (name == "") {
+                name = file_info.get_name ();
+            }
+            var video = new Audience.Objects.Video (source, name, file_info.get_content_type ());
+            video_file_detected (video);
+            poster_hash.add (video.hash + ".jpg");
+            has_items = true;
+        }
+
+        public string? get_thumbnail_path (File file) {
+            if (!file.is_native ()) {
+                return null;
+            }
+            string? path = null;
+            try {
+                var info = file.query_info (FileAttribute.THUMBNAIL_PATH + "," + FileAttribute.THUMBNAILING_FAILED, FileQueryInfoFlags.NONE);
+                path = info.get_attribute_as_string (FileAttribute.THUMBNAIL_PATH);
+                var failed = info.get_attribute_boolean (FileAttribute.THUMBNAILING_FAILED);
+
+                if (failed || path == null) {
+                    return null;
+                }
+
+                path = path.replace ("normal", "large");
+
+                File large_thumbnail = File.new_for_path (path);
+                if (!large_thumbnail.query_exists ()) {
+                    return null;
+                }
+            } catch (Error e) {
+                warning (e.message);
+                return null;
+            }
+
+            return path;
+        }
+
+        public void clear_cache (Audience.Objects.Video video) {
+            File file = File.new_for_path (video.poster_cache_file);
+            if (file.query_exists ()) {
+                file.delete_async.begin (Priority.DEFAULT, null);
+            }
+        }
+
+        public async void clear_unused_cache_files () {
+            File directory = File.new_for_path (App.get_instance ().get_cache_directory ());
+            try {
+                var children = directory.enumerate_children (FileAttribute.STANDARD_NAME, 0);
+
+                if (children != null) {
+                    FileInfo file_info;
+                    while ((file_info = children.next_file ()) != null) {
+                        if (!poster_hash.contains (file_info.get_name ())) {
+                            children.get_child (file_info).delete_async.begin ();
+                        }
+                    }
+                }
+            } catch (Error e) {
+                warning (e.message);
+            }
+        }
+    }
+}

=== added file 'src/Services/Thubnailer.vala'
--- src/Services/Thubnailer.vala	1970-01-01 00:00:00 +0000
+++ src/Services/Thubnailer.vala	2016-09-22 18:15:35 +0000
@@ -0,0 +1,52 @@
+// -*- 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 {
+    [DBus (name = "org.freedesktop.thumbnails.Thumbnailer1")]
+    private interface Tumbler : GLib.Object {
+        public abstract async uint Queue (string[] uris, string[] mime_types, string flavor, string sheduler, uint handle_to_dequeue) throws GLib.IOError, GLib.DBusError;
+        public signal void Finished (uint handle);
+    }
+
+    public class DbusThumbnailer : GLib.Object {
+        private Tumbler tumbler;
+        private const string THUMBNAILER_IFACE = "org.freedesktop.thumbnails.Thumbnailer1";
+        private const string THUMBNAILER_SERVICE = "/org/freedesktop/thumbnails/Thumbnailer1";
+
+        public signal void finished (uint handle);
+
+        public DbusThumbnailer () {
+        }
+
+        construct {
+            try {
+                tumbler = Bus.get_proxy_sync (BusType.SESSION, THUMBNAILER_IFACE, THUMBNAILER_SERVICE);
+                tumbler.Finished.connect ((handle) => { finished (handle); });
+            } catch (Error e) {
+                warning (e.message);
+            }
+        }
+
+        public void Instand (Gee.ArrayList<string> uris, Gee.ArrayList<string> mimes ){
+            tumbler.Queue.begin (uris.to_array (), mimes.to_array (), "large", "default", 0);
+        }
+    }
+}

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2016-03-14 13:10:18 +0000
+++ src/Settings.vala	2016-09-22 18:15:35 +0000
@@ -28,7 +28,9 @@
     public string last_folder {get; set;}
     public bool playback_wait {get; set;}
     public bool stay_on_top {get; set;}
-    public string subtitle_font {get; set; }
+    public string subtitle_font {get; set;}
+    public string library_folder {get; set;}
+    public string[] poster_names {get; set;}
 
     public Settings () {
         base ("org.pantheon.audience");

=== added file 'src/Widgets/LibraryItem.vala'
--- src/Widgets/LibraryItem.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/LibraryItem.vala	2016-09-22 18:15:35 +0000
@@ -0,0 +1,100 @@
+// -*- 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 {
+    public class LibraryItem : Gtk.FlowBoxChild  {
+
+        Gtk.Grid grid;
+        public Audience.Objects.Video video { get; construct set; }
+
+        Gtk.Image poster;
+        Gtk.Label title;
+        Gtk.Spinner spinner;
+        Gtk.Grid spinner_container;
+
+        public LibraryItem (Audience.Objects.Video video) {
+            Object (video: video);
+        }
+
+        construct {
+            margin_bottom = 12;
+
+            video.poster_changed.connect (() => {
+                if (video.poster != null) {
+                    spinner.active = false;
+                    spinner_container.hide ();
+                    if (poster == null) {
+                        poster = new Gtk.Image ();
+                        poster.margin_top = poster.margin_left = poster.margin_right = 12;
+                        poster.get_style_context ().add_class ("card");
+                        grid.attach (poster, 0, 0, 1, 1);
+                    }
+
+                    poster.pixbuf = video.poster;
+                    poster.show ();
+                } else {
+                    spinner.active = true;
+                    spinner_container.show ();
+                    if (poster != null) {
+                        poster.hide ();
+                    }
+                }
+            });
+
+            video.title_changed.connect (() => {
+                title.label = video.title;
+                title.show ();
+            });
+
+            spinner_container = new Gtk.Grid ();
+            spinner_container.height_request = Audience.Services.POSTER_HEIGHT;
+            spinner_container.width_request = Audience.Services.POSTER_WIDTH;
+            spinner_container.margin_top = spinner_container.margin_left = spinner_container.margin_right = 12;
+            spinner_container.get_style_context ().add_class ("card");
+            
+            spinner = new Gtk.Spinner ();
+            spinner.expand = true;
+            spinner.active = true;
+            spinner.valign = Gtk.Align.CENTER;
+            spinner.halign = Gtk.Align.CENTER;
+            spinner.height_request = 32;
+            spinner.width_request = 32;
+
+            spinner_container.add (spinner);
+
+            grid = new Gtk.Grid ();
+            grid.halign = Gtk.Align.CENTER;
+            grid.valign = Gtk.Align.START;
+            grid.row_spacing = 12;
+
+            title = new Gtk.Label (video.title);
+            title.justify = Gtk.Justification.CENTER;
+            title.set_line_wrap (true);
+            title.max_width_chars = 0;
+
+
+            grid.attach (spinner_container, 0, 0, 1, 1);
+            grid.attach (title, 0, 1, 1 ,1);
+
+            this.add (grid);
+        }
+    }
+}

=== added file 'src/Widgets/LibraryPage.vala'
--- src/Widgets/LibraryPage.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/LibraryPage.vala	2016-09-22 18:15:35 +0000
@@ -0,0 +1,120 @@
+// -*- 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 {
+    public class LibraryPage : Gtk.ScrolledWindow {
+
+        Gtk.FlowBox view_movies;
+
+        Audience.Services.LibraryManager manager;
+        bool poster_initialized = false;
+        int items_counter;
+        public bool has_items { get { return items_counter > 0; } }
+
+        public static LibraryPage instance = null;
+        public static LibraryPage get_instance () {
+            if (instance == null) {
+                instance = new LibraryPage ();
+            }
+
+            return instance;
+        }
+
+        private LibraryPage () {
+        }
+
+        construct {
+            items_counter = 0;
+            view_movies = new Gtk.FlowBox ();
+            view_movies.margin = 24;
+            view_movies.homogeneous = true;
+            view_movies.row_spacing = 12;
+            view_movies.column_spacing = 12;
+            view_movies.valign = Gtk.Align.START;
+            view_movies.selection_mode = Gtk.SelectionMode.NONE;
+            view_movies.child_activated.connect (play_video);
+
+            view_movies.set_sort_func ((child1, child2) => {
+                var item1 = child1 as LibraryItem;
+                var item2 = child2 as LibraryItem;
+                if (item1 != null && item2 != null) {
+                    return item1.video.file.collate (item2.video.file);
+                }
+                return 0;
+            });
+
+            manager = Audience.Services.LibraryManager.get_instance ();
+            manager.video_file_detected.connect (add_item);
+            manager.video_file_deleted.connect (remove_item_from_path);
+            manager.begin_scan ();
+
+            this.add (view_movies);
+
+            map.connect (() => {
+                if (!poster_initialized) {
+                    poster_initialized = true;
+                    poster_initialisation.begin ();
+                    show_all ();
+                }
+            });
+        }
+
+        private void add_item (Audience.Objects.Video video) {
+            Audience.LibraryItem new_item = new Audience.LibraryItem (video);
+            view_movies.add (new_item);
+            if (poster_initialized) {
+                new_item.show_all ();
+                new_item.video.initialize_poster.begin ();
+            }
+            items_counter++;
+        }
+        
+        private void play_video (Gtk.FlowBoxChild item) {
+            var selected = (item as Audience.LibraryItem);
+            if (selected.video.video_file.query_exists ()) {
+                bool from_beginning = selected.video.video_file.get_uri () != settings.current_video;
+                App.get_instance ().mainwindow.play_file (selected.video.video_file.get_uri (), from_beginning);
+            } else {
+                remove_item.begin (selected);
+            }
+        }
+
+        private async void remove_item (LibraryItem item) {
+            manager.clear_cache (item.video);
+            item.dispose ();
+            items_counter--;
+        }
+
+        private async void remove_item_from_path (string path ) {
+            foreach (var child in view_movies.get_children ()) {
+                if ((child as LibraryItem).video.video_file.get_path ().has_prefix (path)) {
+                    remove_item.begin (child as LibraryItem);
+                }
+            }
+        }
+
+        private async void poster_initialisation () {
+            foreach (var child in view_movies.get_children ()) {
+                (child as LibraryItem).video.initialize_poster.begin ();
+            }
+        }
+    }
+}

=== added file 'src/Widgets/NavigationButton.vala'
--- src/Widgets/NavigationButton.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/NavigationButton.vala	2016-09-22 18:15:35 +0000
@@ -0,0 +1,35 @@
+// -*- 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 {
+    public class NavigationButton : Gtk.Button {
+
+        public NavigationButton () {
+        }
+
+        construct {
+            can_focus = false;
+            valign = Gtk.Align.CENTER;
+            vexpand = false;
+            this.get_style_context ().add_class ("back-button");
+        }
+    }
+}

=== modified file 'src/Widgets/PlayerPage.vala'
--- src/Widgets/PlayerPage.vala	2016-08-19 16:27:45 +0000
+++ src/Widgets/PlayerPage.vala	2016-09-22 18:15:35 +0000
@@ -264,9 +264,17 @@
             settings.current_video = uri;
         }
 
+        public double get_progress () {
+            return playback.progress;
+        }
+
         public string get_played_uri () {
             return playback.uri;
         }
+        
+        public void reset_played_uri () {
+            playback.uri = null;
+        }
 
         public void next () {
             get_playlist_widget ().next ();

=== modified file 'src/Widgets/WelcomePage.vala'
--- src/Widgets/WelcomePage.vala	2016-08-19 16:27:45 +0000
+++ src/Widgets/WelcomePage.vala	2016-09-22 18:15:35 +0000
@@ -1,6 +1,7 @@
 namespace Audience {
     public class WelcomePage : Granite.Widgets.Welcome {
         private DiskManager disk_manager;
+        private Services.LibraryManager library_manager;
         public WelcomePage () {
             base (_("No Videos Open"), _("Select a source to begin playing."));
         }
@@ -33,9 +34,22 @@
                 set_item_visible (2, disk_manager.has_media_volumes ());
             });
 
+            library_manager = Services.LibraryManager.get_instance ();
+            library_manager.video_file_detected.connect ((vid) => {
+                set_item_visible (3, true);
+                this.show_all ();
+            });
+            
+            library_manager.video_file_deleted.connect ((vid) => {
+                set_item_visible (3, LibraryPage.get_instance ().has_items);
+            });
+
             append ("media-cdrom", _("Play from Disc"), _("Watch a DVD or open a file from disc"));
             set_item_visible (2, disk_manager.has_media_volumes ());
 
+            append ("folder-videos", _("Browse Library"), _("Watch a movie from your library"));
+            set_item_visible (3, library_manager.has_items);
+
             activated.connect ((index) => {
                 var window = App.get_instance ().mainwindow;
                 switch (index) {
@@ -49,6 +63,8 @@
                     case 2:
                         window.run_open_dvd ();
                         break;
+                    case 3:
+                        window.show_library ();
                 }
             });
         }
@@ -60,9 +76,16 @@
             var filename = settings.current_video;
             var last_file = File.new_for_uri (filename);
 
-            replay_button.title = _("Replay last video");
+            if (settings.last_stopped == 0.0) {
+                replay_button.title = _("Replay last video");
+                replay_button.icon.icon_name = ("media-playlist-repeat");
+            } else {
+                replay_button.title = _("Resume last video");
+                replay_button.icon.icon_name = ("media-playback-start");
+            }
+            
             replay_button.description = get_title (last_file.get_basename ());
-            replay_button.icon.icon_name = ("media-playlist-repeat");
+            
 
             bool show_last_file = settings.current_video != "";
             if (last_file.query_exists () == false) {

=== modified file 'src/Window.vala'
--- src/Window.vala	2016-08-24 01:21:07 +0000
+++ src/Window.vala	2016-09-22 18:15:35 +0000
@@ -26,12 +26,18 @@
     private Gtk.HeaderBar header;
     private PlayerPage player_page;
     private WelcomePage welcome_page;
+    private LibraryPage library_page;
+    private NavigationButton navigation_button;
     private ZeitgeistManager zeitgeist_manager;
 
+    // For better translation
+    const string navigation_button_welcomescreen = N_("Back");
+    const string navigation_button_library = N_("Library");
+
     public signal void media_volumes_changed ();
 
     public Window () {
-        
+
     }
 
     construct {
@@ -43,8 +49,33 @@
         header = new Gtk.HeaderBar ();
         header.set_show_close_button (true);
         header.get_style_context ().add_class ("compact");
+
+        navigation_button = new NavigationButton ();
+        navigation_button.clicked.connect (() => {
+            double progress = player_page.get_progress ();
+            if (progress > 0) {
+                settings.last_stopped = progress;
+            }
+            player_page.playing = false;
+            player_page.reset_played_uri ();
+            title = App.get_instance ().program_name;
+            get_window ().set_cursor (null);
+            
+            if (navigation_button.label == navigation_button_library) {
+                navigation_button.label = navigation_button_welcomescreen;
+                main_stack.set_visible_child_full ("library", Gtk.StackTransitionType.SLIDE_RIGHT);
+            } else {
+                navigation_button.hide ();
+                main_stack.set_visible_child (welcome_page);
+            }
+            
+            welcome_page.refresh ();
+        });
+
+        header.pack_start (navigation_button);
         set_titlebar (header);
 
+        library_page = LibraryPage.get_instance ();
         welcome_page = new WelcomePage ();
 
         player_page = new PlayerPage ();
@@ -58,12 +89,17 @@
         });
 
         main_stack = new Gtk.Stack ();
-        main_stack.add (welcome_page);
-        main_stack.add (player_page);
+        main_stack.expand = true;
+        main_stack.add_named (welcome_page, "welcome");
+        main_stack.add_named (player_page, "player");
+        main_stack.add_named (library_page, "library");
+        main_stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT;
 
         add (main_stack);
         show_all ();
-        main_stack.set_visible_child (welcome_page);
+
+        navigation_button.hide ();
+        main_stack.set_visible_child_full ("welcome", Gtk.StackTransitionType.NONE);
 
         Gtk.TargetEntry uris = {"text/uri-list", 0, 0};
         Gtk.drag_dest_set (this, Gtk.DestDefaults.ALL, {uris}, Gdk.DragAction.MOVE);
@@ -103,9 +139,9 @@
             /*/ FIXME: Remove comments once gala bug is fixed: https://bugs.launchpad.net/gala/+bug/1602722
             if (Gdk.WindowState.MAXIMIZED in e.changed_mask) {
                 bool currently_maximixed = Gdk.WindowState.MAXIMIZED in e.new_window_state;
-                
+
                 if (main_stack.get_visible_child () == player_page && currently_maximixed) {
-                   fullscreen (); 
+                   fullscreen ();
                 }
             }*/
 
@@ -130,6 +166,12 @@
 
     public override bool key_press_event (Gdk.EventKey e) {
         uint keycode = e.hardware_keycode;
+
+        if ((e.state & Gdk.ModifierType.MOD1_MASK) != 0 && e.keyval == Gdk.Key.Left) {
+            navigation_button.clicked ();
+            return true;
+        }
+
         if ((e.state & Gdk.ModifierType.CONTROL_MASK) != 0) {
             if (match_keycode (Gdk.Key.o, keycode)) {
                 run_open_file ();
@@ -139,7 +181,7 @@
                 return true;
             }
         }
-
+       
         if (main_stack.get_visible_child () == player_page) {
             if (match_keycode (Gdk.Key.p, keycode) || match_keycode (Gdk.Key.space, keycode)) {
                 player_page.playing = !player_page.playing;
@@ -225,7 +267,7 @@
         if (clear_playlist) {
             player_page.get_playlist_widget ().clear_items ();
         }
-        
+
         string[] videos = {};
         foreach (var file in files) {
             if (file.query_file_type (0) == FileType.DIRECTORY) {
@@ -242,7 +284,7 @@
         if (videos.length == 0) {
             return;
         }
-        
+
         if (force_play) {
             play_file (videos [0]);
         }
@@ -260,6 +302,13 @@
         read_first_disk.begin ();
     }
 
+    public void show_library () {
+        navigation_button.label = navigation_button_welcomescreen;
+        navigation_button.show ();
+        main_stack.set_visible_child (library_page);
+        library_page.grab_focus ();
+    }
+
     public void run_open_file (bool clear_playlist = false, bool force_play = true) {
         var file = new Gtk.FileChooserDialog (_("Open"), this, Gtk.FileChooserAction.OPEN,
             _("_Cancel"), Gtk.ResponseType.CANCEL, _("_Open"), Gtk.ResponseType.ACCEPT);
@@ -328,15 +377,24 @@
         unfullscreen ();
     }
 
-    private void play_file (string uri, bool from_beginning = true) {
-        main_stack.set_visible_child (player_page);
+    public void play_file (string uri, bool from_beginning = true) {
+        if (navigation_button.visible) {
+            navigation_button.label = navigation_button_library;
+        } else {
+            navigation_button.show ();
+            navigation_button.label = navigation_button_welcomescreen;
+        }
+
+        main_stack.set_visible_child_full ("player", Gtk.StackTransitionType.SLIDE_LEFT);
         player_page.play_file (uri, from_beginning);
         if (is_maximized) {
             fullscreen ();
         }
-        
+
         if (settings.stay_on_top && !settings.playback_wait) {
             set_keep_above (true);
         }
+        
+        welcome_page.refresh ();
     }
 }