Merge lp:~vikoadi/audience/fix-playlist into lp:~audience-members/audience/trunk

[Viko Adi Rahmawan]

Fix restoring the playlist from dconf. Now it will only add to the playlist when you have multiple arguments in the starting call and every future call with only one argument will create a new playlist.

-dont restore from dconf if open file from pantheon-files
-safe current video so can restore playlist and play previous video.

[Raphael Isemann (teemperor)]

Works as intended in all aspects.

Give me some time to check the code itself.

review: Approve (functionality)

[Raphael Isemann (teemperor)]

There is a small codestyle error here:
> playlist.add_item (File.new_for_path(filename));
should be
> playlist.add_item (File.new_for_path (filename));

with a space before the bracket. Could you add that?

Otherwise good job.

review: Needs Fixing (code and code-style)

[lp:~vikoadi/audience/fix-playlist]

357. By Viko Adi Rahmawan on 2014-08-05

fix codestyle

[Viko Adi Rahmawan (vikoadi)]

Done

[Raphael Isemann (teemperor)]

Ok, i'll approve. If someone finds an obvious error in his code, blame me for now knowing the audience codebase well enough, but it looks fine for me ;)

review: Approve (code and code-style)

[Raphael Isemann (teemperor)]

I hope tarmac-bot can merge this evne though there is still a pending review i can't cancel for some reason.

[Raphael Isemann (teemperor)]

Oh, forgot: Thanks and good work!

[Cody Garver (codygarver)]

* It automatically starts playing the last played video, it's supposed to offer to resume in the welcome screen
* Does not restore playback position in resumed videos

review: Needs Fixing

=== modified file 'data/org.pantheon.audience.gschema.xml'
--- data/org.pantheon.audience.gschema.xml	2014-05-02 22:16:10 +0000
+++ data/org.pantheon.audience.gschema.xml	2014-08-05 13:38:15 +0000
@@ -20,6 +20,11 @@
             <summary>List of last played videos</summary>
             <description>A list of the last played</description>
         </key>
+        <key name="current-video" type="s">
+            <default>""</default>
+            <summary>last played video</summary>
+            <description></description>
+        </key>
         <key name="last-stopped" type="d">
             <default>0</default>
             <summary>Last stopped time of last played video</summary>

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2014-07-24 10:21:16 +0000
+++ src/Audience.vala	2014-08-05 13:38:15 +0000
@@ -303,18 +303,6 @@
             });
 
             stage.notify["allocation"].connect (() => {allocate_bottombar ();});
-
-            if (settings.resume_videos == true && settings.last_played_videos.length > 0) {
-                welcome.hide ();
-                clutter.show_all ();
-                foreach (var filename in settings.last_played_videos) {
-                    open_file (filename);
-                }
-
-                video_player.playing = false;
-                video_player.progress = settings.last_stopped;
-                video_player.playing = true;
-            }
         }
 
         private void allocate_bottombar () {
@@ -690,13 +678,25 @@
         //the application started
         public override void activate () {
             build ();
+            if (settings.resume_videos == true && settings.last_played_videos.length > 0) {
+                welcome.hide ();
+                clutter.show_all ();
+                foreach (var filename in settings.last_played_videos) {
+                    playlist.add_item (File.new_for_path (filename));
+                }
+                open_file (settings.current_video);
+
+                video_player.playing = false;
+                video_player.progress = settings.last_stopped;
+                video_player.playing = true;
+            }
         }
 
         //the application was requested to open some files
         public override void open (File[] files, string hint) {
             if (mainwindow == null)
-                activate ();
-
+                build ();
+                
             welcome.hide ();
             clutter.show_all ();
             foreach (var file in files) {

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2014-06-30 14:54:30 +0000
+++ src/Settings.vala	2014-08-05 13:38:15 +0000
@@ -23,6 +23,7 @@
     public bool keep_aspect {get; set;}
     public bool resume_videos {get; set;}
     public string[] last_played_videos {get; set;}
+    public string current_video {get; set;}
     public double last_stopped {get; set;}
     public string last_folder {get; set;}
     public bool playback_wait {get; set;}

=== modified file 'src/Widgets/Playlist.vala'
--- src/Widgets/Playlist.vala	2014-07-06 11:16:48 +0000
+++ src/Widgets/Playlist.vala	2014-08-05 13:38:15 +0000
@@ -99,8 +99,23 @@
         }
 
         public void add_item (File path) {
+            if (!path.query_exists ())
+                return;
+            var file_name = path.get_path ();
+            bool exist = false;
             Gtk.TreeIter iter;
 
+            playlist.foreach ((model, path, iter) => {
+                Value filename;
+                playlist.get_value (iter, Columns.FILENAME, out filename);
+                string name = filename.get_string ();
+                if (name == file_name)
+                    exist = true;
+                return false;
+            });
+            if (exist)
+                return;
+
             Icon? playing = null;
             Gtk.TreeIter dummy;
             if (!playlist.get_iter_first (out dummy)){
@@ -116,7 +131,16 @@
         }
 
         public void remove_item (File path) {
-            /*not needed up to now*/
+            var file_name = path.get_path ();
+            
+            playlist.foreach ((model, path, iter) => {
+                Value filename;
+                playlist.get_value (iter, Columns.FILENAME, out filename);
+                string name = filename.get_string ();
+                if (name == file_name)
+                    playlist.remove (iter);
+                return false;
+            });
         }
 
         public File? get_first_item () {
@@ -159,6 +183,7 @@
             }
 
             settings.last_played_videos = videos;
+            settings.current_video = videos[current];
         }
 
     }