From 8f9a1a8fc0a8cdf108216a3e51a76f42d691cf18 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Thu, 13 Aug 2015 10:46:12 +0200
Subject: [PATCH] media library: sort track numbers as integers, not strings

---
 NEWS                  | 1 +
 src/media_library.cpp | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 03efb96a..0332a5a1 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,7 @@ ncmpcpp-0.7 (????-??-??)
 * Sorting actions were rebound to Ctrl-S.
 * Support for range selection was added (bound to Ctrl-V by default). In addition, sorting, reversing and shuffling items in playlist now works on ranges.
 * Support for selecting found items was added (bound to Ctrl-_ by default).
+* Tracks in media library are now properly sorted for track numbers greater than 99.
 
 ncmpcpp-0.6.5 (2015-07-05)
 
diff --git a/src/media_library.cpp b/src/media_library.cpp
index ea630ad1..7e5fba12 100644
--- a/src/media_library.cpp
+++ b/src/media_library.cpp
@@ -106,7 +106,13 @@ public:
 			if (ret != 0)
 				return ret < 0;
 		}
-		return a.getTrack() < b.getTrack();
+		try {
+			int ret = boost::lexical_cast<int>(a.getTags(&MPD::Song::getTrackNumber))
+			        - boost::lexical_cast<int>(b.getTags(&MPD::Song::getTrackNumber));
+			return ret < 0;
+		} catch (boost::bad_lexical_cast &) {
+			return a.getTrackNumber() < b.getTrackNumber();
+		}
 	}
 };