Movie list store & view: store prepared title + year markup and rating text

[cinaest] / src / movie-list-store.vala

diff --git a/src/movie-list-store.vala b/src/movie-list-store.vala
index d04b9f7..852690f 100644 (file)
--- a/src/movie-list-store.vala
+++ b/src/movie-list-store.vala
@@ -25,25 +25,41 @@ public class MovieListStore : ListStore, TreeModel {
                RATING,
                POSTER,
                MOVIE,
+               MARKUP,
                N_COLUMNS
        }
        private GLib.Type[] types = {
                typeof (string),
                typeof (int),
-               typeof (int),
+               typeof (string),
                typeof (Gdk.Pixbuf),
-               typeof (Movie)
+               typeof (Movie),
+               typeof (string)
        };
        private GLib.Type[] base_type = {
-               typeof (Movie)
+               typeof (Movie),
+               typeof (string), // Markup: "Title (Year)"
+               typeof (string)  // Rating
        };
        private Gdk.Pixbuf no_poster;
        private MoviePoster.Factory poster_factory;
-       public MovieSource source;
        private MovieFilter filter;
        public bool update_running { get; set; }
+       public string year_markup = "<span size=\"small\">[%d]</span>";
        private Cancellable cancellable;
 
+       public signal void search_finished (int movies);
+
+       private MovieSource _source;
+       public MovieSource source {
+               get {
+                       return _source;
+               }
+               set {
+                       _source = value;
+               }
+       }
+
        construct {
                set_column_types (base_type);
                no_poster = null;
@@ -55,15 +71,40 @@ public class MovieListStore : ListStore, TreeModel {
 
        public void add (Movie movie, out TreeIter iter) {
                TreeIter iter1;
+               var markup = new StringBuilder ();
+               markup.append (Markup.escape_text (movie.title));
+               if (movie.year > 0) {
+                       markup.append (" ");
+                       markup.append_printf (year_markup, movie.year);
+               }
 
                append (out iter1);
-               base.set (iter1, 0, movie);
+               base.set (iter1, 0, movie,
+                                1, markup.str,
+                                2, (movie.rating >= 0) ? "%d.%d".printf (movie.rating / 10, movie.rating % 10) : null);
 
                movie.notify.connect (this.on_movie_changed);
 
                iter = iter1;
        }
 
+       public new bool remove (Movie movie) {
+               TreeIter iter;
+
+               if (get_iter_from_movie (out iter, movie)) {
+                       movie.notify.disconnect (this.on_movie_changed);
+                       base.remove (iter);
+
+                       if (SourceFlags.EDITABLE in source.get_flags ()) {
+                               source.delete_movie (movie);
+                       }
+
+                       return true;
+               }
+
+               return false;
+       }
+
        private void on_movie_changed (GLib.Object source, GLib.ParamSpec spec) {
                var movie = (Movie) source;
 
@@ -74,6 +115,10 @@ public class MovieListStore : ListStore, TreeModel {
                }
        }
 
+       public bool get_editable () {
+               return (SourceFlags.EDITABLE in source.get_flags ());
+       }
+
        public bool get_iter_from_movie (out TreeIter iter, Movie movie_a) {
                if (get_iter_first (out iter)) {
                        do {
@@ -90,7 +135,7 @@ public class MovieListStore : ListStore, TreeModel {
                if (update_running) {
                        stdout.printf ("aborting search ...\n");
                        cancellable.cancel ();
-               //      poster_factory.clear_queue ();
+                       poster_factory.clear_queue ();
                        return false;
                }
                if (cancellable == null || cancellable.is_cancelled ())
@@ -109,9 +154,11 @@ public class MovieListStore : ListStore, TreeModel {
 
                clear ();
 
-               if (source != null)
+               if (source != null) {
                        // FIXME - arbitrary limit
-                       yield source.get_movies (filter, receive_movie, 100, cancellable);
+                       int n = yield source.get_movies (filter, receive_movie, 100, cancellable);
+                       search_finished (n);
+               }
 
                update_running = false;
                if (cancellable.is_cancelled ()) {
@@ -126,17 +173,19 @@ public class MovieListStore : ListStore, TreeModel {
                }
        }
 
-       private void receive_movie (Movie movie) {
+       private void receive_movie (SList<Movie> movies) {
                TreeIter iter;
 
                if (cancellable.is_cancelled ())
                        return;
 
-               add (movie, out iter);
-               try {
-                       poster_factory.queue_thumbnail (movie, 64, 64, false, receive_poster_thumbnail);
-               } catch (Error e) {
-                       warning ("Failed to queue poster request: %s\n", e.message);
+               foreach (Movie movie in movies) {
+                       add (movie, out iter);
+                       try {
+                               poster_factory.queue_thumbnail (movie, 64, 64, false, receive_poster_thumbnail);
+                       } catch (Error e) {
+                               warning ("Failed to queue poster request: %s\n", e.message);
+                       }
                }
        }
 
@@ -194,11 +243,7 @@ public class MovieListStore : ListStore, TreeModel {
                        break;
 
                case Columns.RATING:
-                       if (movie != null) {
-                               value.set_int (movie.rating);
-                       } else {
-                               value.set_int (-1);
-                       }
+                       base.get_value (iter, 2, out value);
                        break;
 
                case Columns.POSTER:
@@ -212,6 +257,10 @@ public class MovieListStore : ListStore, TreeModel {
                        value.set_object (movie);
                        break;
 
+               case Columns.MARKUP:
+                       base.get_value (iter, 1, out value);
+                       break;
+
                default:
                        assert_not_reached ();
                }