[Xfce4-commits] <parole:master> Make remove-duplicates work again

[Sean Davis]

Updating branch refs/heads/master
         to b93745033f6e6a89c5e7a0245f3a60143c7ed5fb (commit)
       from 2af855073ebf480f6781950b498783307767fcfe (commit)

commit b93745033f6e6a89c5e7a0245f3a60143c7ed5fb
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sat Oct 26 11:38:29 2013 -0400

    Make remove-duplicates work again

 src/parole-medialist.c |   45 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index ad87c34..7cd1653 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -274,13 +274,49 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile *file, gboolean disc, g
     GtkTreeIter iter;
     gint nch;
     
+    /* Objects used for the remove-duplicates functionality. */
+    gchar *filename;
+    ParoleFile *row_file;
+    gboolean remove_duplicates;
+    g_object_get (G_OBJECT (list->priv->conf),
+                  "remove-duplicated", &remove_duplicates,
+                  NULL);
+    
+    /* Set the list_store variable based on with store we're viewing. */
     if (disc)
         list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (list->priv->disc_view)));
     else
         list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (list->priv->view)));
+        
+    /* Remove duplicates functionality. If the file being added is already in the
+     * playlist, remove it from its current position in the playlist before
+     * adding it again. */
+    if (!disc && remove_duplicates && gtk_tree_model_iter_n_children (GTK_TREE_MODEL(list_store), NULL) != 0)
+    {
+        filename = g_strdup(parole_file_get_file_name(file));
+                
+        /* Check the first row */
+        gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), &iter);
+        gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, DATA_COL, &row_file, -1);
+        if (g_strcmp0(filename, parole_file_get_file_name(row_file)) == 0)
+        {
+            gtk_list_store_remove (GTK_LIST_STORE(list_store), &iter);
+        }
+        
+        /* Check subsequent rows */
+        while (gtk_tree_model_iter_next(GTK_TREE_MODEL(list_store), &iter)) {
+            gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, DATA_COL, &row_file, -1);
+            if (g_strcmp0(filename, parole_file_get_file_name(row_file)) == 0)
+            {
+                gtk_list_store_remove (GTK_LIST_STORE(list_store), &iter);
+            }
+        }
+        
+        g_object_unref(row_file);
+    }
     
+    /* Add the file to the playlist */
     gtk_list_store_append (list_store, &iter);
-    
     gtk_list_store_set (list_store, 
                         &iter, 
                         NAME_COL, parole_file_get_display_name (file),
@@ -307,11 +343,8 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile *file, gboolean disc, g
      */
     g_object_unref (file);
     
-    if (disc)
-        nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list->priv->disc_store), NULL); 
-    else
-        nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list->priv->store), NULL); 
-    
+    /* Update the playlist count. */
+    nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list_store), NULL); 
     parole_media_list_set_playlist_count(list, nch);
 }