Skip to content

Commit ba92e36

Browse files
AddictedCSAddictedCS
committed
We don't need these fields anymore.
1 parent 9181078 commit ba92e36

File tree

8 files changed

+28
-42
lines changed

8 files changed

+28
-42
lines changed

‎src/SoundFingerprinting.Tests/Unit/DAO/Data/TrackDataTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ public class TrackDataTest
1111
[Test]
1212
public void ShouldIdentifyAsEqual()
1313
{
14-
var dto0 = new TrackData(string.Empty, string.Empty, string.Empty, string.Empty, 1990, 0d, new ModelReference<int>(0));
15-
var dto1 = new TrackData(string.Empty, string.Empty, string.Empty, string.Empty, 1990, 0d, new ModelReference<int>(0));
14+
var dto0 = new TrackData(string.Empty, string.Empty, string.Empty, 0d, new ModelReference<int>(0));
15+
var dto1 = new TrackData(string.Empty, string.Empty, string.Empty, 0d, new ModelReference<int>(0));
1616

1717
Assert.AreEqual(dto0, dto1);
1818
}
1919

2020
[Test]
2121
public void ShouldNotBeEqualToNull()
2222
{
23-
var dto = new TrackData(string.Empty, string.Empty, string.Empty, string.Empty, 1990, 0d, new ModelReference<int>(0));
23+
var dto = new TrackData(string.Empty, string.Empty, string.Empty, 0d, new ModelReference<int>(0));
2424

2525
Assert.IsFalse(dto.Equals(null));
2626
}

‎src/SoundFingerprinting.Tests/Unit/LCS/QueryCoverageCalculatorTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void ShouldNotFailWithEmptyEntries()
1717
{
1818
var qrc = new QueryResultCoverageCalculator(new LongestIncreasingTrackSequence());
1919

20-
var track = new TrackData("1234", "artist", "title", "album", 1986, 120d, new ModelReference<int>(1));
20+
var track = new TrackData("1234", "artist", "title", 120d, new ModelReference<int>(1));
2121

2222
var coverages = qrc.GetCoverages(track, new GroupedQueryResults(10d, DateTime.Now), new DefaultQueryConfiguration());
2323

‎src/SoundFingerprinting.Tests/Unit/Query/PendingResultEntryTest.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class PendingResultEntryTest
1212
[Test]
1313
public void ShouldCollapse()
1414
{
15-
var track = new TrackData("1", "artist", "title", string.Empty, 0, 120, new ModelReference<uint>(1));
15+
var track = new TrackData("1", "artist", "title", 120, new ModelReference<uint>(1));
1616

1717
var entry1 = new PendingResultEntry(new ResultEntry(track, 0d, 100, DateTime.Now, 1.48d, 0d, 1.48d, 1.48d, 10d, -10));
1818
var entry2 = new PendingResultEntry(new ResultEntry(track, 0d, 100, DateTime.Now, 1.48d, 0d, 1.48d, 1.48d, 10d + 1.48d, -10 + 1.48));
@@ -29,8 +29,8 @@ public void ShouldCollapse()
2929
[Test]
3030
public void ShouldNotCollapseAsTracksAreDifferent()
3131
{
32-
var track1 = new TrackData("1", "artist", "title", string.Empty, 0, 120, new ModelReference<uint>(1));
33-
var track2 = new TrackData("1", "artist", "title", string.Empty, 0, 120, new ModelReference<uint>(2));
32+
var track1 = new TrackData("1", "artist", "title", 120, new ModelReference<uint>(1));
33+
var track2 = new TrackData("1", "artist", "title", 120, new ModelReference<uint>(2));
3434

3535
var entry1 = new PendingResultEntry(new ResultEntry(track1, 0d, 100, DateTime.Now, 1.48d, 0d, 1.48d, 1.48d, 10d, -10));
3636
var entry2 = new PendingResultEntry(new ResultEntry(track2, 0d, 100, DateTime.Now, 1.48d, 0d, 1.48d, 1.48d, 10d + 1.48d, -10 + 1.48));
@@ -41,7 +41,7 @@ public void ShouldNotCollapseAsTracksAreDifferent()
4141
[Test]
4242
public void ShouldNotCollapseAsTheStretchBetweenMatchesIsTooLong()
4343
{
44-
var track = new TrackData("1", "artist", "title", string.Empty, 0, 120, new ModelReference<uint>(1));
44+
var track = new TrackData("1", "artist", "title", 120, new ModelReference<uint>(1));
4545

4646
var entry1 = new PendingResultEntry(new ResultEntry(track, 0d, 100, DateTime.Now, 1.48d, 0d, 1.48d, 1.48d, 10d, -10));
4747
var entry2 = new PendingResultEntry(new ResultEntry(track, 0d, 100, DateTime.Now, 1.48d, 0d, 1.48d, 1.48d, 30d, -10 + 1.48));
@@ -52,7 +52,7 @@ public void ShouldNotCollapseAsTheStretchBetweenMatchesIsTooLong()
5252
[Test]
5353
public void IsCompletedAsTheMatchIsLongerThanTheThreshold()
5454
{
55-
var track = new TrackData("1", "artist", "title", string.Empty, 0, 120, new ModelReference<uint>(1));
55+
var track = new TrackData("1", "artist", "title", 120, new ModelReference<uint>(1));
5656

5757
var entry1 = new PendingResultEntry(new ResultEntry(track, 0d, 100, DateTime.Now, 3d, 0d, 3d, 3d, 10d, -10));
5858
var entry2 = new PendingResultEntry(new ResultEntry(track, 0d, 100, DateTime.Now, 3d, 0d, 3d, 3d, 12d, -10 + 2));
@@ -65,7 +65,7 @@ public void IsCompletedAsTheMatchIsLongerThanTheThreshold()
6565
[Test]
6666
public void IsCompletedAsTheMatchIsLongerThanTheThreshold2()
6767
{
68-
var track = new TrackData("1", "artist", "title", string.Empty, 0, 120, new ModelReference<uint>(1));
68+
var track = new TrackData("1", "artist", "title", 120, new ModelReference<uint>(1));
6969

7070
var entry1 = new PendingResultEntry(new ResultEntry(track, 0d, 100, DateTime.Now, 3d, 0d, 3d, 3d, 10d, -10));
7171
var entry2 = new PendingResultEntry(new ResultEntry(track, 0d, 100, DateTime.Now, 3d, 0d, 3d, 3d, 14d, -10 + 2));
@@ -78,7 +78,7 @@ public void IsCompletedAsTheMatchIsLongerThanTheThreshold2()
7878
[Test]
7979
public void ShouldSwallowEntryWithinEntry()
8080
{
81-
var track = new TrackData("1", "artist", "title", string.Empty, 0, 120, new ModelReference<uint>(1));
81+
var track = new TrackData("1", "artist", "title", 120, new ModelReference<uint>(1));
8282

8383
var entry1 = new PendingResultEntry(new ResultEntry(track, 0d, 100, DateTime.Now, 3d, 0d, 3d, 3d, 10d, -10));
8484
var entry2 = new PendingResultEntry(new ResultEntry(track, 0d, 100, DateTime.Now, 2.5d, 0d, 2.5d, 2.5d, 10.5d, -10 + 2.5));

‎src/SoundFingerprinting.Tests/Unit/Query/ResultEntryExtensionsTest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ public class ResultEntryExtensionsTest
1212
[Test]
1313
public void ShouldNotMergeAsTracksDoNotMatch()
1414
{
15-
var a = new ResultEntry(new TrackData("123", "artist", "title", "album", 0, 120d, new ModelReference<int>(1)), 0.9d, 120, DateTime.Now, 10d, 0d, 10, 10, 5d, -5d);
15+
var a = new ResultEntry(new TrackData("123", "artist", "title", 120d, new ModelReference<int>(1)), 0.9d, 120, DateTime.Now, 10d, 0d, 10, 10, 5d, -5d);
1616

17-
var b = new ResultEntry(new TrackData("123", "artist", "title", "album", 0, 120d, new ModelReference<int>(2)), 0.9d, 120, DateTime.Now, 10d, 0d, 10, 10, 5d, -5d);
17+
var b = new ResultEntry(new TrackData("123", "artist", "title", 120d, new ModelReference<int>(2)), 0.9d, 120, DateTime.Now, 10d, 0d, 10, 10, 5d, -5d);
1818

1919
Assert.Throws<ArgumentException>(() => a.MergeWith(b));
2020
}
@@ -27,7 +27,7 @@ public void ShouldMergeCorrectly1()
2727
* a ------
2828
* b ------
2929
*/
30-
var data = new TrackData("123", "artist", "title", "album", 0, 120d, new ModelReference<int>(1));
30+
var data = new TrackData("123", "artist", "title", 120d, new ModelReference<int>(1));
3131
var a = new ResultEntry(data, 0.9d, 120, DateTime.Now, 10d, 0d, 10, 10, 5d, -5d);
3232
var b = new ResultEntry(data, 0.9d, 120, DateTime.Now, 10d, 0d, 7, 7, 13d, -13d);
3333

@@ -48,7 +48,7 @@ public void ShouldMergeCorrectly2()
4848
* a ------
4949
* b ------
5050
*/
51-
var data = new TrackData("123", "artist", "title", "album", 0, 120d, new ModelReference<int>(1));
51+
var data = new TrackData("123", "artist", "title", 120d, new ModelReference<int>(1));
5252
var a = new ResultEntry(data, 0.9d, 120, DateTime.Now, 15d, 0d, 10, 10, 5d, -5d);
5353
var b = new ResultEntry(data, 0.9d, 120, DateTime.Now, 15d, 0d, 10, 10, 30d, -30d);
5454

@@ -69,7 +69,7 @@ public void ShouldMergeCorrectly3()
6969
* a ----------
7070
* b ------
7171
*/
72-
var data = new TrackData("123", "artist", "title", "album", 0, 120d, new ModelReference<int>(1));
72+
var data = new TrackData("123", "artist", "title", 120d, new ModelReference<int>(1));
7373
var a = new ResultEntry(data, 0.9d, 120, DateTime.Now, 15d, 0d, 10, 15, 15d, -15d);
7474
var b = new ResultEntry(data, 0.9d, 120, DateTime.Now, 10d, 0d, 10, 5, 20d, -20d);
7575

‎src/SoundFingerprinting.Tests/Unit/Query/StatefulRealtimeResultEntryAggregatorTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private static void AddAll(IEnumerable<ResultEntry> aggregated, ICollection<Resu
9595

9696
private static TrackData GetTrack()
9797
{
98-
return new TrackData("1234", "Queen", "Bohemian Rhapsody", string.Empty, 0, 120d, new ModelReference<int>(1));
98+
return new TrackData("1234", "Queen", "Bohemian Rhapsody", 120d, new ModelReference<int>(1));
9999
}
100100
}
101101
}

‎src/SoundFingerprinting.Tests/Unit/QueryFingerprintServiceTest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ public void MaximumNumberOfReturnedTracksIsLessThanAnalyzedCandidatesResultsTest
6363
modelService.Setup(service => service.ReadTracksByReferences(new[] { firstTrackReference, secondTrackReference }))
6464
.Returns(new List<TrackData>
6565
{
66-
new TrackData("isrc", string.Empty, string.Empty, string.Empty, 0, 0d, firstTrackReference),
67-
new TrackData("isrc_1", string.Empty, string.Empty, string.Empty, 0, 0d, secondTrackReference)
66+
new TrackData("id", string.Empty, string.Empty, 0d, firstTrackReference),
67+
new TrackData("id_1", string.Empty, string.Empty, 0d, secondTrackReference)
6868
});
6969

7070
var hashes = new Hashes(new List<HashedFingerprint> { queryHash }, 1.48f, DateTime.Now, Enumerable.Empty<string>());
7171
var queryResult = queryFingerprintService.Query(hashes, customQueryConfiguration, modelService.Object);
7272

7373
Assert.IsTrue(queryResult.ContainsMatches);
74-
Assert.AreEqual("isrc", queryResult.BestMatch.Track.Id);
74+
Assert.AreEqual("id", queryResult.BestMatch.Track.Id);
7575
Assert.AreEqual(firstTrackReference, queryResult.BestMatch.Track.TrackReference);
7676
Assert.AreEqual(100, queryResult.BestMatch.Score);
7777
Assert.AreEqual(2, queryResult.ResultEntries.Count());
@@ -113,14 +113,14 @@ public void HammingSimilarityIsSummedUpAcrossAllSubFingerprintsTest()
113113
modelService.Setup(service => service.ReadTracksByReferences(new[] { firstTrackReference })).Returns(
114114
new List<TrackData>
115115
{
116-
new TrackData("isrc", string.Empty, string.Empty, string.Empty, 0, 0d, firstTrackReference)
116+
new TrackData("id", string.Empty, string.Empty, 0d, firstTrackReference)
117117
});
118118

119119
var hashes = new Hashes(new List<HashedFingerprint> { queryHash }, 1.48f, DateTime.Now, Enumerable.Empty<string>());
120120
var queryResult = queryFingerprintService.Query(hashes, defaultQueryConfiguration, modelService.Object);
121121

122122
Assert.IsTrue(queryResult.ContainsMatches);
123-
Assert.AreEqual("isrc", queryResult.BestMatch.Track.Id);
123+
Assert.AreEqual("id", queryResult.BestMatch.Track.Id);
124124
Assert.AreEqual(firstTrackReference, queryResult.BestMatch.Track.TrackReference);
125125
Assert.AreEqual(200, queryResult.BestMatch.Score);
126126
Assert.AreEqual(1, queryResult.ResultEntries.Count());

‎src/SoundFingerprinting/DAO/Data/TrackData.cs‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,18 @@
1111
[ProtoContract]
1212
public class TrackData
1313
{
14-
public TrackData(string isrc, string artist, string title, string album, int releaseYear, double length, IModelReference trackReference, IDictionary<string, string> metaFields, MediaType mediaType)
14+
public TrackData(string id, string artist, string title, double length, IModelReference trackReference, IDictionary<string, string> metaFields, MediaType mediaType)
1515
{
16-
ISRC = isrc;
16+
Id = id;
1717
Artist = artist;
1818
Title = title;
19-
Album = album;
20-
ReleaseYear = releaseYear;
2119
Length = length;
2220
TrackReference = trackReference;
2321
MetaFields = metaFields;
2422
MediaType = mediaType;
2523
}
2624

27-
public TrackData(string isrc, string artist, string title, string album, int releaseYear, double length, IModelReference trackReference) :
28-
this(isrc, artist, title, album, releaseYear, length, trackReference, new Dictionary<string, string>(), MediaType.Audio)
25+
public TrackData(string id, string artist, string title, double length, IModelReference trackReference) : this(id, artist, title, length, trackReference, new Dictionary<string, string>(), MediaType.Audio)
2926
{
3027
}
3128

@@ -36,26 +33,15 @@ public TrackData()
3633
MediaType = MediaType.Audio;
3734
}
3835

39-
public string Id => ISRC;
36+
[ProtoMember(3)]
37+
public string Id { get; }
4038

4139
[ProtoMember(1)]
4240
public string Artist { get; }
4341

4442
[ProtoMember(2)]
4543
public string Title { get; }
4644

47-
[ProtoMember(3)]
48-
[Obsolete("Will be renamed to `Id` in upcoming versions.")]
49-
private string ISRC { get; }
50-
51-
[Obsolete("Will be removed in upcoming versions. Use MetaFields instead.")]
52-
[ProtoMember(4)]
53-
private string Album { get; }
54-
55-
[Obsolete("Will be removed in upcoming versions. Use MetaFields instead.")]
56-
[ProtoMember(5)]
57-
private int ReleaseYear { get; }
58-
5945
[ProtoMember(6)]
6046
public double Length { get; }
6147

‎src/SoundFingerprinting/InMemory/RAMStorage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void AddSubFingerprint(SubFingerprintData subFingerprintData)
111111
public TrackData AddTrack(TrackInfo track, double durationInSeconds)
112112
{
113113
var trackReference = trackReferenceProvider.Next();
114-
var trackData = new TrackData(track.Id, track.Artist, track.Title, string.Empty, 0, durationInSeconds, trackReference, track.MetaFields, track.MediaType);
114+
var trackData = new TrackData(track.Id, track.Artist, track.Title, durationInSeconds, trackReference, track.MetaFields, track.MediaType);
115115
return AddTrack(trackData);
116116
}
117117

0 commit comments

Comments
 (0)