Merge pull request #2 from idubnori/alpha2

Merged alpha2.

src/TrackInfoReader/Models/Item.cs

@@ -1,6 +1,6 @@
 namespace ShairportSync.Metadata.Models
 {
-    public class Item
+    internal class Item
     {
         public string Type { get; set; }
         public string Code { get; set; }

src/TrackInfoReader/Parsers/TrackInfoParser.cs

@@ -20,7 +20,7 @@ public static IObservable<TrackInfo> GetObservable(IObservable<Item> itemSource)
 
         private static IObservable<TrackInfo> Parse(this IObservable<Item> itemSource)
         {
-            var artworkMetadataSource = itemSource.Where(m => m.Code == "PICT");
+            var artworkItemSource = itemSource.Where(m => m.Code == "PICT");
 
             var bufferClosing = itemSource.Where(m => m.Code == "mden");
             var trackSource = itemSource
@@ -32,10 +32,10 @@ private static IObservable<TrackInfo> Parse(this IObservable<Item> itemSource)
                 .Where(t => t.Item1?.Mper != t.Item2.Mper && t.Item2.Mper != null)
                 .Select(t => t.Item2);
 
-            var artworkTrackSource = artworkMetadataSource
-                .WithLatestFrom(trackSource, (i, h) => new Artwork(h) { Artwork = i.Data });
+            var artworkTrackSource = artworkItemSource
+                .WithLatestFrom(trackSource, (i, t) => new Artwork(t) { Artwork = i.Data });
 
-            return mperChangesTrackSource.Merge(artworkTrackSource).ToWithArtwork();
+            return mperChangesTrackSource.ToWithArtwork(artworkTrackSource);
         }
 
         private static TrackInfo ToTrack(this IList<Item> items)
@@ -52,14 +52,12 @@ private static TrackInfo ToTrack(this IList<Item> items)
             return trackInfo;
         }
 
-        private static IObservable<TrackInfo> ToWithArtwork(this IObservable<TrackInfo> trackSource)
+        private static IObservable<TrackInfo> ToWithArtwork(this IObservable<TrackInfo> trackSource, IObservable<Artwork> artworkSource)
         {
-            var artworkSource = trackSource.Where(t => t is Artwork);
-
             var trackWithArtworkSource = trackSource
-                .WithLatestFrom(artworkSource.StartWith(default(Artwork)), (t, a) => t.UpdateArtwork((Artwork)a));
+                .WithLatestFrom(artworkSource.StartWith(default(Artwork)), (t, a) => t.UpdateArtwork(a));
 
-            return trackWithArtworkSource;
+            return trackWithArtworkSource.Merge(artworkSource);
         }
 
         private static TrackInfo UpdateArtwork(this TrackInfo trackInfo, Artwork artwork)

src/TrackInfoReader/TrackInfoReader.csproj

@@ -11,18 +11,19 @@
     <RootNamespace>ShairportSync.Metadata</RootNamespace>
     <Authors>idubnori</Authors>
     <Company />
-    <Version>0.1.0-alpha1</Version>
+    <Version>0.1.0-alpha2</Version>
     <Copyright>Copyright (c) 2018 idubnori.</Copyright>
     <PackageProjectUrl>https://github.com/idubnori/shairport-sync-trackinfo-reader/</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/idubnori/shairport-sync-trackinfo-reader/blob/master/LICENSE</PackageLicenseUrl>
     <PackageTags>shairport-sync, metadata, track, Raspberry Pi, System.Reactive</PackageTags>
-    <Description>ShairportSync.TrackInfoReader is a shairport-sync metadata parser which provides track information (artist, album, song title and artwork image) as  IObservable&lt;TrackInfo&gt; .
+    <Description>ShairportSync.TrackInfoReader is a shairport-sync metadata parser which provides track information (artist, album, song title, artwork image, etc.) as Rx ( IObservable&lt;TrackInfo&gt; ).
 
-This works on .NET Standard 2.0 compliant platforms like .NET Core 2 / Mono.
- (i.e. Raspberry Pi 2/3, Mac, etc.)</Description>
-    <PackageReleaseNotes>First release.</PackageReleaseNotes>
-    <AssemblyVersion>0.1.0.1</AssemblyVersion>
-    <FileVersion>0.1.0.1</FileVersion>
+This library works on .NET Standard 2.0 compliant platforms like .NET Core 2 / Mono.
+i.e. works on Raspberry Pi 2 / 3, Mac, Linux, etc.
+</Description>
+    <PackageReleaseNotes>https://github.com/idubnori/shairport-sync-trackinfo-reader/releases</PackageReleaseNotes>
+    <AssemblyVersion>0.1.0.2</AssemblyVersion>
+    <FileVersion>0.1.0.2</FileVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

tests/TrackInfoReader.Tests/HelperExtensions.cs

@@ -6,14 +6,18 @@
 using System.Threading.Tasks;
 using Microsoft.Reactive.Testing;
 using ShairportSync.Metadata.Models;
+using Xunit;
 
 namespace TrackInfoReader.Tests
 {
     internal static class HelperExtensions
     {
-        public static bool IsDefaultArtwork(this TrackInfo actual)
+        public static bool AssertDefaultArtwork(this TrackInfo actual)
         {
-            return actual.Artwork == "default.png"; // TODO 
+            var expected = "default.png"; // TODO 
+            Assert.Equal(expected, actual.Artwork);
+
+            return actual.Artwork == expected;
         }
 
         public static bool IsArtWork(this TrackInfo actual)

tests/TrackInfoReader.Tests/TrackInfoReader.Tests.csproj

@@ -26,6 +26,9 @@
     <ProjectReference Include="..\..\src\TrackInfoReader\TrackInfoReader.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <None Update="TestData\next-song-no-image-in-same-album">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="TestData\metadata-onetrack-oneartwork">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

tests/TrackInfoReader.Tests/TrackInfoReaderTest.cs

@@ -1,5 +1,6 @@
+using System.Linq;
+using System.Reactive;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
 using Microsoft.Reactive.Testing;
 using ShairportSync.Metadata.Models;
 using Xunit;
@@ -22,12 +23,21 @@ public async Task OneTrackWithArtwork_OneTrackAndOneArtwork()
             var actual = await SubscribeMetadataFileAsync(metadataTestFile);
 
             actual.Messages.AssertEqual(
-                OnNext<TrackInfo>(0, t => t.IsSameSong(expectedTrack) && t.IsDefaultArtwork()),
+                OnNext<TrackInfo>(0, t => t.IsSameSong(expectedTrack) && t.AssertDefaultArtwork()),
                 OnNext<TrackInfo>(0, t => t.IsSameSong(expectedTrack) && t.IsArtWork()),
                 OnCompleted<TrackInfo>(0)
             );
+        }
+
+        [Fact]
+        public async Task SecondSongWithNoArtwork_LastArtworkIsDefault()
+        {
+            var metadataTestFile = @"./TestData/next-song-no-image-in-same-album";
+
+            var actual = await SubscribeMetadataFileAsync(metadataTestFile);
 
-            Logger.LogDebug(actual.Messages.DebugInfo(t => t.DebugInfo()));
+            var actualLastArtwork = actual.Messages[3].Value.Value;
+            actualLastArtwork.AssertDefaultArtwork();
         }
     }
 }

tests/TrackInfoReader.Tests/TrackInfoReaderTestBase.cs

@@ -43,6 +43,8 @@ protected async Task<ITestableObserver<TrackInfo>> SubscribeMetadataFileAsync(st
             //pipeServer.WaitForPipeDrain();
             await pipeServer.WriteMetadataAsync(metadataFile);
 
+            Logger.LogDebug(mockObserver.Messages.DebugInfo(t => t.DebugInfo()));
+
             using (new CompositeDisposable {trackSubscriber, pipeClient, pipeServer})
             {
                 return mockObserver;