From 99593fd357217a393b8abe2aa510b8b9ab13c466 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 6 Jan 2013 22:02:26 +0100
Subject: [PATCH 1/2] models: Add Track.disc_no (#286)

---
 docs/changes.rst     | 2 ++
 mopidy/models.py     | 7 ++++++-
 tests/models_test.py | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/changes.rst b/docs/changes.rst
index 5e412754..dc4a10fe 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -81,6 +81,8 @@ Current limitations:
 - Add :attr:`mopidy.models.Album.images` field for including album art URIs.
   (Partly fixes :issue:`263`)
 
+- Add :attr:`mopidy.models.Track.disc_no` field. (Partly fixes: :issue:`286`)
+
 
 v0.11.1 (2012-12-24)
 ====================
diff --git a/mopidy/models.py b/mopidy/models.py
index 1a165222..1e9ad2c1 100644
--- a/mopidy/models.py
+++ b/mopidy/models.py
@@ -212,6 +212,8 @@ class Track(ImmutableObject):
     :type album: :class:`Album`
     :param track_no: track number in album
     :type track_no: integer
+    :param disc_no: disc number in album
+    :type disc_no: integer or :class:`None` if unknown
     :param date: track release date (YYYY or YYYY-MM-DD)
     :type date: string
     :param length: track length in milliseconds
@@ -234,9 +236,12 @@ class Track(ImmutableObject):
     #: The track :class:`Album`. Read-only.
     album = None
 
-    #: The track number in album. Read-only.
+    #: The track number in the album. Read-only.
     track_no = 0
 
+    #: The disc number in the album. Read-only.
+    disc_no = None
+
     #: The track release date. Read-only.
     date = None
 
diff --git a/tests/models_test.py b/tests/models_test.py
index ef3fd68c..fdac575b 100644
--- a/tests/models_test.py
+++ b/tests/models_test.py
@@ -396,6 +396,12 @@ class TrackTest(unittest.TestCase):
         self.assertEqual(track.track_no, track_no)
         self.assertRaises(AttributeError, setattr, track, 'track_no', None)
 
+    def test_disc_no(self):
+        disc_no = 2
+        track = Track(disc_no=disc_no)
+        self.assertEqual(track.disc_no, disc_no)
+        self.assertRaises(AttributeError, setattr, track, 'disc_no', None)
+
     def test_date(self):
         date = '1977-01-01'
         track = Track(date=date)

From 1a0842117f3cebc670be44ddf0ac086498a2dd11 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 6 Jan 2013 22:04:56 +0100
Subject: [PATCH 2/2] models: Add Album.num_discs (#286)

---
 docs/changes.rst     | 2 ++
 mopidy/models.py     | 5 +++++
 tests/models_test.py | 8 +++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/changes.rst b/docs/changes.rst
index dc4a10fe..51ae094d 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -83,6 +83,8 @@ Current limitations:
 
 - Add :attr:`mopidy.models.Track.disc_no` field. (Partly fixes: :issue:`286`)
 
+- Add :attr:`mopidy.models.Album.num_discs` field. (Partly fixes: :issue:`286`)
+
 
 v0.11.1 (2012-12-24)
 ====================
diff --git a/mopidy/models.py b/mopidy/models.py
index 1e9ad2c1..39d29fd3 100644
--- a/mopidy/models.py
+++ b/mopidy/models.py
@@ -163,6 +163,8 @@ class Album(ImmutableObject):
     :type artists: list of :class:`Artist`
     :param num_tracks: number of tracks in album
     :type num_tracks: integer
+    :param num_discs: number of discs in album
+    :type num_discs: integer or :class:`None` if unknown
     :param date: album release date (YYYY or YYYY-MM-DD)
     :type date: string
     :param musicbrainz_id: MusicBrainz ID
@@ -183,6 +185,9 @@ class Album(ImmutableObject):
     #: The number of tracks in the album. Read-only.
     num_tracks = 0
 
+    #: The number of discs in the album. Read-only.
+    num_discs = None
+
     #: The album release date. Read-only.
     date = None
 
diff --git a/tests/models_test.py b/tests/models_test.py
index fdac575b..08a8c6f0 100644
--- a/tests/models_test.py
+++ b/tests/models_test.py
@@ -199,10 +199,16 @@ class AlbumTest(unittest.TestCase):
 
     def test_num_tracks(self):
         num_tracks = 11
-        album = Album(num_tracks=11)
+        album = Album(num_tracks=num_tracks)
         self.assertEqual(album.num_tracks, num_tracks)
         self.assertRaises(AttributeError, setattr, album, 'num_tracks', None)
 
+    def test_num_discs(self):
+        num_discs = 2
+        album = Album(num_discs=num_discs)
+        self.assertEqual(album.num_discs, num_discs)
+        self.assertRaises(AttributeError, setattr, album, 'num_discs', None)
+
     def test_date(self):
         date = '1977-01-01'
         album = Album(date=date)