Fixes #1090: Add support for m3u8 playlists

digimezzo · Jan 12, 2020 · 02c5f43 · 02c5f43
1 parent bb2d29a
commit 02c5f43
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 13 deletions.
diff --git a/Dopamine.Core/Base/FileFormats.cs b/Dopamine.Core/Base/FileFormats.cs
@@ -20,6 +20,7 @@ public static class FileFormats
 
         // Playlist extensions
         public static string M3U = ".m3u";
+        public static string M3U8 = ".m3u8";
         public static string WPL = ".wpl";
         public static string ZPL = ".zpl";
 
@@ -49,6 +50,7 @@ public static class FileFormats
 
         public static string[] SupportedStaticPlaylistExtensions = {
             FileFormats.M3U,
+             FileFormats.M3U8,
             FileFormats.ZPL,
             FileFormats.WPL
         };

diff --git a/Dopamine.Core/IO/PlaylistDecoder.cs b/Dopamine.Core/IO/PlaylistDecoder.cs
@@ -46,7 +46,7 @@ public DecodePlaylistResult DecodePlaylist(string fileName)
             string playlistName = string.Empty;
             IList<PlaylistEntry> playlistEntries = new List<PlaylistEntry>();
 
-            if (System.IO.Path.GetExtension(fileName.ToLower()) == FileFormats.M3U)
+            if (System.IO.Path.GetExtension(fileName.ToLower()) == FileFormats.M3U | System.IO.Path.GetExtension(fileName.ToLower()) == FileFormats.M3U8)
             {
                 decodeResult = this.DecodeM3uPlaylist(fileName, ref playlistName, ref playlistEntries);
             }

diff --git a/Dopamine.Services/Playlist/PlaylistService.cs b/Dopamine.Services/Playlist/PlaylistService.cs
@@ -70,7 +70,7 @@ public PlaylistService(ITrackRepository trackRepository,
 
         public string PlaylistFolder { get; }
 
-        public string DialogFileFilter => $"(*{FileFormats.M3U};*{FileFormats.WPL};*{FileFormats.ZPL};*{FileFormats.DSPL})|*{FileFormats.M3U};*{FileFormats.WPL};*{FileFormats.ZPL};*{FileFormats.DSPL};*{FileFormats.DSPL}";
+        public string DialogFileFilter => $"(*{FileFormats.M3U};*{FileFormats.M3U8};*{FileFormats.WPL};*{FileFormats.ZPL};*{FileFormats.DSPL})|*{FileFormats.M3U};*{FileFormats.M3U8};*{FileFormats.WPL};*{FileFormats.ZPL};*{FileFormats.DSPL};*{FileFormats.DSPL}";
 
         public event EventHandler PlaylistFolderChanged = delegate { };
         public event TracksAddedHandler TracksAdded = delegate { };

diff --git a/Dopamine.Tests/Dopamine.Tests.csproj b/Dopamine.Tests/Dopamine.Tests.csproj
@@ -132,6 +132,9 @@
     <Content Include="Files\LyricsParser\SynchronizedLyricsWithDuplicateTimestamps.lrc">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Files\PlaylistDecoder\Test.m3u8">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />

diff --git a/Dopamine.Tests/Files/PlaylistDecoder/Test.m3u8 b/Dopamine.Tests/Files/PlaylistDecoder/Test.m3u8
@@ -0,0 +1,3 @@
+C:\Music\File1.mp3
+C:\Music\File2.mp3
+C:\Music\File3.mp3
diff --git a/Dopamine.Tests/PlaylistDecoderTest.cs b/Dopamine.Tests/PlaylistDecoderTest.cs
@@ -11,14 +11,38 @@ public void DecodeM3uPlaylist()
         {
             // Arrange
             string playlistPath = System.IO.Path.GetFullPath(@"Files\PlaylistDecoder\Test.m3u");
-            string playlistDirectory = System.IO.Path.GetDirectoryName(playlistPath);
+
+            // Act
+            var decoder = new PlaylistDecoder();
+            DecodePlaylistResult result = decoder.DecodePlaylist(playlistPath);
+
+            // Assert
+            if (result.DecodeResult.Result && !string.IsNullOrWhiteSpace(result.PlaylistName))
+            {
+                Assert.IsTrue(result.Paths.Count == 3);
+                Assert.AreEqual(result.Paths[0], @"C:\Music\File1.mp3");
+                Assert.AreEqual(result.Paths[1], @"C:\Music\File2.mp3");
+                Assert.AreEqual(result.Paths[2], @"C:\Music\File3.mp3");
+                Assert.AreEqual(result.PlaylistName, "Test");
+            }
+            else
+            {
+                Assert.Fail();
+            }
+        }
+
+        [TestMethod(), TestCategory(TestCategories.PlaylistDecoder)]
+        public void DecodeM3u8Playlist()
+        {
+            // Arrange
+            string playlistPath = System.IO.Path.GetFullPath(@"Files\PlaylistDecoder\Test.m3u8");
 
             // Act
-            var decoder = new Core.IO.PlaylistDecoder();
+            var decoder = new PlaylistDecoder();
             DecodePlaylistResult result = decoder.DecodePlaylist(playlistPath);
 
             // Assert
-            if (result.DecodeResult.Result && result.Paths.Count == 3 && !string.IsNullOrWhiteSpace(result.PlaylistName))
+            if (result.DecodeResult.Result && !string.IsNullOrWhiteSpace(result.PlaylistName))
             {
                 Assert.IsTrue(result.Paths.Count == 3);
                 Assert.AreEqual(result.Paths[0], @"C:\Music\File1.mp3");
@@ -37,14 +61,13 @@ public void DecodeZplPlaylist()
         {
             // Arrange
             string playlistPath = System.IO.Path.GetFullPath(@"Files\PlaylistDecoder\Test.zpl");
-            string playlistDirectory = System.IO.Path.GetDirectoryName(playlistPath);
-
+
             // Act
-            var decoder = new Core.IO.PlaylistDecoder();
+            var decoder = new PlaylistDecoder();
             DecodePlaylistResult result = decoder.DecodePlaylist(playlistPath);
 
             // Assert
-            if (result.DecodeResult.Result && result.Paths.Count == 3 && !string.IsNullOrWhiteSpace(result.PlaylistName))
+            if (result.DecodeResult.Result && !string.IsNullOrWhiteSpace(result.PlaylistName))
             {
                 Assert.IsTrue(result.Paths.Count == 3);
                 Assert.AreEqual(result.Paths[0], @"C:\Music\File1.mp3");
@@ -63,14 +86,13 @@ public void DecodeWplPlaylist()
         {
             // Arrange
             string playlistPath = System.IO.Path.GetFullPath(@"Files\PlaylistDecoder\Test.wpl");
-            string playlistDirectory = System.IO.Path.GetDirectoryName(playlistPath);
-
+
             // Act
-            var decoder = new Core.IO.PlaylistDecoder();
+            var decoder = new PlaylistDecoder();
             DecodePlaylistResult result = decoder.DecodePlaylist(playlistPath);
 
             // Assert
-            if (result.DecodeResult.Result && result.Paths.Count == 3 && !string.IsNullOrWhiteSpace(result.PlaylistName))
+            if (result.DecodeResult.Result && !string.IsNullOrWhiteSpace(result.PlaylistName))
             {
                 Assert.IsTrue(result.Paths.Count == 3);
                 Assert.AreEqual(result.Paths[0], @"C:\Music\File1.mp3");

diff --git a/Dopamine/Changelog.txt b/Dopamine/Changelog.txt
@@ -2,6 +2,7 @@
 --------------------------
 
 - [Changed] Reverted some changes to audio decoding. This hopefully removes lag when decoding high bitrate files.
+- [Added] Added support for m3u8 playlists
 
 
 2020-01-11: Dopamine 2.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     --------------------------
     - [Changed] Reverted some changes to audio decoding. This hopefully removes lag when decoding high bitrate files.
+    - [Added] Added support for m3u8 playlists
 -01-11: Dopamine 2.0
@@ Expand Down @@