Merge lp:~vikoadi/audience/restore-progress into lp:~audience-members/audience/trunk

[Viko Adi Rahmawan]

* Fix restoring video progress if open audience.
* Restore playlist and progress from welcome screen on Resume
* Use current-video key instead of last-played-videos
* Don't restore video if they don't exist anymore
* Update playlist play icon properly

-fix restoring video progress if open audience.
-restore playlist and progress from welcome screen
-use current-video key instead of last-played-videos
-dont restore video if they are moved
-update playlist play icon properly

[lp:~vikoadi/audience/restore-progress]

367. By Viko Adi Rahmawan on 2014-08-10

dont play queued video

368. By Viko Adi Rahmawan on 2014-08-10

dont play when adding file from FileChooserDialog

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2014-08-05 13:37:45 +0000
+++ src/Audience.vala	2014-08-10 16:22:47 +0000
@@ -318,10 +318,10 @@
             welcome.append ("document-open", _("Open file"), _("Open a saved file."));
 
             //welcome.append ("internet-web-browser", _("Open a location"), _("Watch something from the infinity of the internet"));
-            var filename = settings.last_played_videos.length > 0 ? settings.last_played_videos[0] : "";
-            var last_file = File.new_for_path (filename);
+            var filename = settings.current_video;
+            var last_file = File.new_for_uri (filename);
             welcome.append ("media-playback-start", _("Resume last video"), get_title (last_file.get_basename ()));
-            bool show_last_file = settings.last_played_videos.length > 0;
+            bool show_last_file = settings.current_video != "";
             if (last_file.query_exists () == false) {
                 show_last_file = false;
             }
@@ -355,9 +355,10 @@
                     case 1:
                         welcome.hide ();
                         clutter.show_all ();
+                        restore_playlist ();
                         open_file (filename);
                         video_player.playing = false;
-                        video_player.progress = settings.last_stopped;
+                        Idle.add (() => {video_player.progress = settings.last_stopped; return false;});
                         video_player.playing = true;
                         break;
                     case 2:
@@ -486,9 +487,9 @@
             Gtk.drag_dest_set (mainwindow, Gtk.DestDefaults.ALL, {uris}, Gdk.DragAction.MOVE);
             mainwindow.drag_data_received.connect ( (ctx, x, y, sel, info, time) => {
                 foreach (var uri in sel.get_uris ()) {
-                    playlist.add_item (File.new_for_uri (uri));
+                    open_file (uri);
                 }
-                open_file (sel.get_uris ()[0]);
+                
                 welcome.hide ();
                 clutter.show_all ();
             });
@@ -536,12 +537,18 @@
         private inline void save_last_played_videos () {
             playlist.save_playlist_config ();
 
-            if (settings.last_played_videos.length > 0)
+            if (settings.current_video != "")
                 settings.last_stopped = video_player.progress;
             else
                 settings.last_stopped = 0;
         }
 
+        private void restore_playlist () {
+            foreach (var filename in settings.last_played_videos) {
+                playlist.add_item (File.new_for_uri (filename));
+            }
+        }
+
         public void run_open_file () {
             var file = new Gtk.FileChooserDialog (_("Open"), mainwindow, Gtk.FileChooserAction.OPEN,
                 _("_Cancel"), Gtk.ResponseType.CANCEL, _("_Open"), Gtk.ResponseType.ACCEPT);
@@ -562,7 +569,11 @@
             if (file.run () == Gtk.ResponseType.ACCEPT) {
                 welcome.hide ();
                 clutter.show_all ();
-                open_file (file.get_uri ());
+
+                playlist.add_item (file.get_file ());
+                if (video_player.uri == null)
+                    open_file (file.get_uri ());
+
                 settings.last_folder = file.get_current_folder ();
             }
 
@@ -614,10 +625,9 @@
                 });
 
                 file = playlist.get_first_item ();
+                play_file (file.get_uri ());
             } else if (is_subtitle (filename) && video_player.playing) {
                 video_player.set_subtitle_uri (filename);
-            } else if (video_player.playing == true) {
-                playlist.add_item (file);
             } else {
                 playlist.add_item (file);
                 play_file (file.get_uri ());
@@ -657,6 +667,7 @@
         public void play_file (string uri) {
             debug ("Opening %s", uri);
             video_player.uri = uri;
+            playlist.set_current (uri);
             bottom_bar.set_preview_uri (uri);
 
             string? sub_uri = get_subtitle_for_uri (uri);
@@ -678,16 +689,16 @@
         //the application started
         public override void activate () {
             build ();
-            if (settings.resume_videos == true && settings.last_played_videos.length > 0) {
+            if (settings.resume_videos == true 
+                && settings.last_played_videos.length > 0 
+                && settings.current_video != ""
+                && file_exists (settings.current_video)) {
                 welcome.hide ();
                 clutter.show_all ();
-                foreach (var filename in settings.last_played_videos) {
-                    playlist.add_item (File.new_for_path (filename));
-                }
+                restore_playlist ();
                 open_file (settings.current_video);
-
                 video_player.playing = false;
-                video_player.progress = settings.last_stopped;
+                Idle.add (() => {video_player.progress = settings.last_stopped; return false;});
                 video_player.playing = true;
             }
         }
@@ -700,8 +711,11 @@
             welcome.hide ();
             clutter.show_all ();
             foreach (var file in files) {
-                open_file (file.get_path ());
+                playlist.add_item (file);
             }
+
+            if (video_player.uri == null)
+                open_file(files[0].get_uri ());
         }
     }
 }

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2014-06-30 14:54:30 +0000
+++ src/Utils.vala	2014-08-10 16:22:47 +0000
@@ -106,4 +106,9 @@
         var disk_manager = DiskManager.get_default ();
         return disk_manager.get_volumes ().length () > 0;
     }
+
+    public static bool file_exists (string uri) {
+        var file = File.new_for_uri (uri);
+        return file.query_exists ();
+    }
 }
\ No newline at end of file

=== modified file 'src/Widgets/Playlist.vala'
--- src/Widgets/Playlist.vala	2014-08-05 13:37:45 +0000
+++ src/Widgets/Playlist.vala	2014-08-10 16:22:47 +0000
@@ -54,8 +54,6 @@
                 string filename;
                 playlist.get (iter, Columns.FILENAME, out filename);
                 play (File.new_for_commandline_arg (filename));
-                change_current_symbol (iter);
-                this.current = int.parse (path.to_string ());
             });
 
             this.reorderable = true;
@@ -69,19 +67,11 @@
             });
         }
 
-        private inline void change_current_symbol (Gtk.TreeIter new_item) {
-            Gtk.TreeIter old_item;
-            playlist.get_iter_from_string (out old_item, this.current.to_string ());
-            playlist.set (old_item, Columns.PLAYING, null);
-            playlist.set (new_item, Columns.PLAYING, new ThemedIcon ("media-playback-start-symbolic"));
-        }
-
         public void next () {
             Gtk.TreeIter iter;
             if (playlist.get_iter_from_string (out iter, (this.current + 1).to_string ())){
                 string filename;
                 playlist.get (iter, Columns.FILENAME, out filename);
-                change_current_symbol (iter);
                 current++;
                 play (File.new_for_commandline_arg (filename));
             }
@@ -92,7 +82,6 @@
             if (playlist.get_iter_from_string (out iter, (this.current - 1).to_string ())){
                 string filename;
                 playlist.get (iter, Columns.FILENAME, out filename);
-                change_current_symbol (iter);
                 current--;
                 play (File.new_for_commandline_arg (filename));
             }
@@ -101,7 +90,7 @@
         public void add_item (File path) {
             if (!path.query_exists ())
                 return;
-            var file_name = path.get_path ();
+            var file_name = path.get_uri ();
             bool exist = false;
             Gtk.TreeIter iter;
 
@@ -127,11 +116,11 @@
             playlist.append (out iter);
             playlist.set (iter, Columns.PLAYING, playing,
                                 Columns.TITLE, Audience.get_title (path.get_basename ()),
-                                Columns.FILENAME, path.get_path ());
+                                Columns.FILENAME, path.get_uri ());
         }
 
         public void remove_item (File path) {
-            var file_name = path.get_path ();
+            var file_name = path.get_uri ();
             
             playlist.foreach ((model, path, iter) => {
                 Value filename;
@@ -153,6 +142,32 @@
             return null;
         }
 
+        public int get_current () {
+            return current;
+        }
+
+        public void set_current (string current_file) {
+            int count = 0;
+            int current_played = 0;
+            playlist.foreach ((model, path, iter) => {
+                playlist.set (iter, Columns.PLAYING, null);
+                Value filename;
+                playlist.get_value (iter, Columns.FILENAME, out filename);
+                string name = filename.get_string ();
+                if (name == current_file)
+                    current_played = count;
+                count++;
+                return false;
+            });
+
+            Gtk.TreeIter new_iter;
+            playlist.get_iter_from_string (out new_iter, current_played.to_string ());
+            playlist.set (new_iter, Columns.PLAYING, new ThemedIcon ("media-playback-start-symbolic"));
+
+            this.current = current_played;
+            
+        }
+
         public List<string> get_all_items () {
             var list = new List<string> ();
             playlist.foreach ((model, path, iter) => {