Only get Tags by ToC

LodewijkSioen · Apr 4, 2014 · 1d01a40 · 1d01a40
1 parent 6df11ed
commit 1d01a40
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/src/CdRipper.Tests/DummyData.cs b/src/CdRipper.Tests/DummyData.cs
@@ -15,6 +15,20 @@ public class DummyCd
 
  public static class DummyData
  {
+ public static DummyCd UnknownCd
+ {
+ get
+ {
+ return new DummyCd
+ {
+ TableOfContents = new TableOfContents(new[]{
+ new Track(1, 150, 2000),
+ new Track(1, 2150, 4000),
+ })
+ };
+ }
+ }
+
  /// <summary>
  /// Pregap track <see cref="http:https://wiki.musicbrainz.org/ReleasesWithPregapTracks"/> and some wierd stuff at the end
  /// </summary>

diff --git a/src/CdRipper.Tests/Tagging/TestTagRetrieval.cs b/src/CdRipper.Tests/Tagging/TestTagRetrieval.cs
@@ -13,7 +13,7 @@ public void TestGettingTheDiscTags()
  {
  var tagSource = new MusicBrainzTagSource(new MockMusicBrainzApi());
 
- var discTags = tagSource.GetTags(DummyData.SteekJeVingerInDeLucht.MusicBrainzDiscId).ToList();
+ var discTags = tagSource.GetTags(DummyData.SteekJeVingerInDeLucht.TableOfContents).ToList();
 
  Assert.That(discTags, Is.Not.Null);
  Assert.That(discTags.Count(), Is.EqualTo(1));
@@ -35,7 +35,7 @@ public void TestGettingTheDiscTagsForACdStub()
  {
  var tagSource = new MusicBrainzTagSource(new MockMusicBrainzApi());
 
- var discTags = tagSource.GetTags(DummyData.AppelsEten.MusicBrainzDiscId).ToList();
+ var discTags = tagSource.GetTags(DummyData.AppelsEten.TableOfContents).ToList();
 
  Assert.That(discTags, Is.Not.Null);
  Assert.That(discTags.Count(), Is.EqualTo(1));
@@ -61,7 +61,7 @@ public void TestGettingAnUnknownDiscId()
  {
  var tagSource = new MusicBrainzTagSource(new MockMusicBrainzApi());
 
- var discTags = tagSource.GetTags("NotFound").ToList();
+ var discTags = tagSource.GetTags(DummyData.UnknownCd.TableOfContents).ToList();
 
  Assert.That(discTags.Any(), Is.False);
  }
@@ -102,7 +102,7 @@ public MockMusicBrainzApi()
 
  public MusicBrainzResponse GetReleasesByDiscId(string discId)
  {
- return discId == "NotFound" ? new MusicBrainzResponse(false, null) : new MusicBrainzResponse(true, _releasesForDiscId[discId]);
+ return _releasesForDiscId.ContainsKey(discId) ? new MusicBrainzResponse(true, _releasesForDiscId[discId]) : new MusicBrainzResponse(false, null);
  }
 
  public MusicBrainzResponse GetRelease(string releaseId)

diff --git a/src/CdRipper/Tagging/MusicBrainzTagSource.cs b/src/CdRipper/Tagging/MusicBrainzTagSource.cs
@@ -18,11 +18,7 @@ public MusicBrainzTagSource(IIMusicBrainzApi musicBrainzApi)
  public IEnumerable<AlbumIdentification> GetTags(TableOfContents toc)
  {
  var discId = MusicBrainzDiscIdCalculator.CalculateDiscId(toc);
- return GetTags(discId);
- }
-
- public IEnumerable<AlbumIdentification> GetTags(string discId)
- {
+
  var response = _api.GetReleasesByDiscId(discId);
 
  if (!response.IsFound)