← Back to branch summary

~ubuntu-branches/ubuntu/quantal/banshee/quantal

« back to all changes in this revision

Viewing changes to src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin
  • Date: 2011-12-12 01:40:00 UTC
  • mfrom: (6.3.20 experimental)
  • Revision ID: package-import@ubuntu.com-20111212014000-0q4jsvif0oecyth8
Tags: 2.3.2-1ubuntu1
* Merge from Debian Experimental, remaining changes:
  + Enable and recommend SoundMenu and Disable NotificationArea by default
  + Disable boo and karma extensions
  + Enable and suggest u1ms
  + Move desktop file for Meego UI to /usr/share/une/applications
  + Change the url for the Amazon store redirector
  + [08dea2c] Revert "Fix invalid cast causing ftbfs with libgpod"

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
353
353
            PlayCountField.ShortLabel   = Catalog.GetString ("Plays");
354
354
 
355
355
            default_sort = String.Format (default_sort_template, "");
356
 
            default_sort_by_year = String.Format (default_sort_template, "CoreTracks.Year ASC, ");
 
356
            default_sort_by_year = String.Format (default_sort_template, YearField.Column + " ASC, ");
357
357
 
358
358
            RandomOrder = CreateRandomQueryOrder ();
359
359
 
403
403
            }
404
404
 
405
405
            bool sort_by_year = Banshee.Configuration.Schema.LibrarySchema.SortByAlbumYear.Get ();
406
 
            string sort_by_year_part = sort_by_year ? "CoreTracks.Year ASC," : "";
 
406
            string sort_by_year_part = sort_by_year ? YearField.Column + " ASC," : "";
407
407
            string sort = sort_by_year ? default_sort_by_year : default_sort;
408
408
 
409
409
            string ascDesc = asc ? "ASC" : "DESC";
415
415
                    CoreAlbums.ArtistNameSortKey ASC,
416
416
                    {0}
417
417
                    CoreAlbums.TitleSortKey ASC,
418
 
                    CoreTracks.Disc ASC,
419
 
                    {1} {2}",
420
 
                    sort_by_year_part, TrackNumberField.Column, ascDesc);
 
418
                    {1} ASC,
 
419
                    {2} {3}",
 
420
                    sort_by_year_part, DiscNumberField.Column, TrackNumberField.Column, ascDesc);
421
421
            }
422
422
 
423
423
            else if (field.Equals (AlbumArtistField)) {
426
426
                    CoreAlbums.ArtistNameSortKey {0},
427
427
                    {1}
428
428
                    CoreAlbums.TitleSortKey ASC,
429
 
                    CoreTracks.Disc ASC,
430
 
                    CoreTracks.TrackNumber ASC", ascDesc, sort_by_year_part);
 
429
                    {2} ASC,
 
430
                    {3} ASC",
 
431
                    ascDesc, sort_by_year_part, DiscNumberField.Column, TrackNumberField.Column);
431
432
            }
432
433
 
433
434
            else if (field.Equals (ArtistField)) {
436
437
                    CoreArtists.NameSortKey {0},
437
438
                    {1}
438
439
                    CoreAlbums.TitleSortKey ASC,
439
 
                    CoreTracks.Disc ASC,
440
 
                    CoreTracks.TrackNumber ASC", ascDesc, sort_by_year_part);
 
440
                    {2} ASC,
 
441
                    {3} ASC",
 
442
                    ascDesc, sort_by_year_part, DiscNumberField.Column, TrackNumberField.Column);
441
443
            }
442
444
 
443
445
            else if (field.Equals (AlbumField)) {
444
446
                sort_query = String.Format (@"
445
447
                    CoreAlbums.TitleSortKey {0},
446
448
                    {1}
447
 
                    CoreTracks.Disc ASC,
448
 
                    CoreTracks.TrackNumber ASC", ascDesc, sort_by_year_part);
 
449
                    {2} ASC,
 
450
                    {3} ASC",
 
451
                    ascDesc, sort_by_year_part, DiscNumberField.Column, TrackNumberField.Column);
449
452
            }
450
453
 
451
454
            else if (field.Equals (TitleField)) {
459
462
            else if (field.Equals (DiscNumberField)) {
460
463
                sort_query = String.Format (@"
461
464
                    CoreAlbums.ArtistNameSortKey ASC,
462
 
                    {1}
 
465
                    {0}
463
466
                    CoreAlbums.TitleSortKey ASC,
464
 
                    CoreTracks.Disc {0},
465
 
                    CoreTracks.TrackNumber ASC", ascDesc, sort_by_year_part);
 
467
                    {1} {2},
 
468
                    {3} ASC",
 
469
                    sort_by_year_part, DiscNumberField.Column, ascDesc, TrackNumberField.Column);
466
470
            }
467
471
 
468
472
            else if (field.Equals (ScoreField)) {