Merge lp:~dgelling/noise/artist-sort-secondary-year into lp:~elementary-apps/noise/trunk

[DGelling]

When sorting on Artist, secondarily sort on year before sorting on album.

Fixed reading year from tag, added year field to Album, changed sorting functions
for artist sort to secondarily sort on year. If still a tie, sorts on album name,
and track number if in list view, so that individual tracks of an album are ordered
properly and albums without a year are ordered sensibly.

Albums without year are sorted in front of albums with year (as default for year = 0),
perhaps better to sort them after albums with year?

Fixes bug #1021909.

[Corentin Noël (tintou)]

It is working fine!

review: Approve

[Corentin Noël (tintou)]

"Albums without year are sorted in front of albums with year"
Hmm, I don't know, before or after is the same in my opinion because if you have the year column activated you'll see the difference.

=== modified file 'core/Album.vala'
--- core/Album.vala	2013-03-29 15:33:42 +0000
+++ core/Album.vala	2014-04-10 14:14:54 +0000
@@ -51,6 +51,9 @@
 
     //public uint rating { get; set; default = 0; }
     //public Date release_date { get; set; }
+    
+    // store release year, date is overkill and not stored in most tags.
+    public uint year { get; set; default = 0; }
 
     private Gee.HashSet<Media> media = new Gee.HashSet<Media> ();
 
@@ -63,6 +66,7 @@
     public Album.from_media (Media m) {
         name = m.album;
         artist = m.album_artist;
+        year = m.year;
 
         if (String.is_empty (artist, true))
             artist = m.artist;

=== modified file 'core/Utils/CompareFunctionHolder.vala'
--- core/Utils/CompareFunctionHolder.vala	2013-06-25 18:24:42 +0000
+++ core/Utils/CompareFunctionHolder.vala	2014-04-10 14:14:54 +0000
@@ -52,6 +52,9 @@
 
     public inline int artists (Media a, Media b) {
         int order = String.compare (a.get_display_artist (), b.get_display_artist ());
+        // secondarily compare by year
+        if (order == 0)
+            order = Numeric.compare(a.year, b.year);
         if (order == 0)
             order = albums (a, b);
         return order;
@@ -76,4 +79,6 @@
     public inline int track_numbers (Media a, Media b) {
         return Numeric.compare (a.track, b.track);
     }
+
+
 }

=== modified file 'src/GStreamer/GStreamerTagger.vala'
--- src/GStreamer/GStreamerTagger.vala	2013-11-15 15:54:19 +0000
+++ src/GStreamer/GStreamerTagger.vala	2014-04-10 14:14:54 +0000
@@ -148,6 +148,7 @@
             unowned Gst.TagList? tags = info.get_tags ();
 
             if (tags != null) {
+
                 string title;
                 if (tags.get_string (Gst.Tags.TITLE, out title))
                     m.title = title;
@@ -208,13 +209,25 @@
                 if (tags.get_uint (Gst.Tags.USER_RATING, out rating))
                     m.rating = rating; // Noise.Media will clamp the value
 
-                // Get the year
-                Date? date;
-                if (tags.get_date (Gst.Tags.DATE, out date)) {
-                    // Don't let the assumption that @date is non-null deceive you.
+                // Get the year, try datetime first, otherwise try date
+                // NOTE: date might be superfluous, it was the original method,
+                //       but doesn't seem to be used.
+                Gst.DateTime? datetime;
+                if (tags.get_date_time (Gst.Tags.DATE_TIME, out datetime)) {
+                    // Don't let the assumption that @datetime is non-null deceive you.
                     // This is sometimes null even though get_date() returned true!
-                    if (date != null)
-                        m.year = date.get_year ();
+                    if (datetime != null) {
+                        m.year = datetime.get_year ();
+                    } else {
+                        Date? date;
+                        if (tags.get_date (Gst.Tags.DATE, out date)) {
+                            // Don't let the assumption that @date is non-null deceive you.
+                            // This is sometimes null even though get_date() returned true!
+                            if (date != null) {
+                                m.year = date.get_year ();
+                            }
+                        }
+                    }
                 }
 
                 double bpm;

=== modified file 'src/Views/GridView/GridView.vala'
--- src/Views/GridView/GridView.vala	2013-08-17 04:38:12 +0000
+++ src/Views/GridView/GridView.vala	2014-04-10 14:14:54 +0000
@@ -350,10 +350,13 @@
 
         if (album_b == null)
             return 1;
-
+        
         int order = String.compare (album_a.get_display_artist (), album_b.get_display_artist ());
 
         if (order == 0)
+            order = Numeric.compare (album_a.year, album_b.year);
+
+        if (order == 0)
             order = String.compare (album_a.get_display_name (), album_b.get_display_name ());
 
         return order;