From 9bf5892dbdb3f7a7e6c536a8bddcf3b748078f78 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Sun, 1 Apr 2012 20:41:55 +0000
Subject: [PATCH] 	patch by: Christophe Fergeau <cfergeau@redhat.com) 
 * morituri/common/program.py: 	  When morituri finds multiple matches for a
 given release, it only 	  keeps the releases whose length are the
 closest to the CD being 	  ripped. 	  However, this currently
 interacts badly with the --release-id 	  parameter because this duration
 filtering is done before trying to 	  do the release-id matching. The
 release that the user has specified 	  may have been removed from the
 potential matches by the time the 	  release 	  id match is tried. 
   This commit removes the duration filtering when the user explicitly 	 
 specified a release id. I've observed this bug with the first disc 	  of
 The Wall (Experience Edition) by the Pink Floyd. 	  Fixes #91.

---
 ChangeLog                  | 20 ++++++++++++++++++++
 morituri/common/program.py | 12 ++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 82b2dc3..7be3d48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2012-04-01  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	patch by: Christophe Fergeau <cfergeau@redhat.com)
+
+	* morituri/common/program.py:
+	  When morituri finds multiple matches for a given release, it only
+	  keeps the releases whose length are the closest to the CD being
+	  ripped.
+
+	  However, this currently interacts badly with the --release-id
+	  parameter because this duration filtering is done before trying to
+	  do the release-id matching. The release that the user has specified
+	  may have been removed from the potential matches by the time the
+	  release
+	  id match is tried.
+	  This commit removes the duration filtering when the user explicitly
+	  specified a release id. I've observed this bug with the first disc
+	  of The Wall (Experience Edition) by the Pink Floyd.
+	  Fixes #91.
+
 2012-04-01  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	patch by: Christophe Fergeau <cfergeau@redhat.com)
diff --git a/morituri/common/program.py b/morituri/common/program.py
index f543b90..76e667a 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -267,12 +267,6 @@ class Program(log.Loggable):
                     deltas[delta] = []
                 deltas[delta].append(metadata)
 
-            # Select the release that most closely matches the duration.
-            lowest = min(deltas.keys())
-
-            # If we have multiple, make sure they match
-            metadatas = deltas[lowest]
-
             if release:
                 metadatas = [m for m in metadatas if m.url.endswith(release)]
                 self.debug('Asked for release %r, only kept %r',
@@ -285,6 +279,12 @@ class Program(log.Loggable):
                 elif not metadatas:
                     print 'Requested release id %s but none match' % release
                     return
+            else:
+                # Select the release that most closely matches the duration.
+                lowest = min(deltas.keys())
+
+                # If we have multiple, make sure they match
+                metadatas = deltas[lowest]
 
             if len(metadatas) > 1:
                 artist = metadatas[0].artist