Changed M3U formatter to terminate last line with newline character.

Bilge · Bilge · commit 43185802adaa · 2015-09-12T21:33:50.000+01:00
Removed Bitdeli tracking.
diff --git a/Playlist Generator Console/Playlist Generator Console.csproj b/Playlist Generator Console/Playlist Generator Console.csproj
@@ -24,12 +24,14 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>logo 1.2 grey.ico</ApplicationIcon>
diff --git a/Playlist Generator GUI/MainWindow.xaml b/Playlist Generator GUI/MainWindow.xaml
@@ -10,7 +10,7 @@
     <Grid>
         <Label Margin="10,7,0,0" Content="Directory" VerticalAlignment="Top" HorizontalAlignment="Left"/>
         <TextBox x:Name="directory" Height="23" VerticalAlignment="Top" Margin="73,10,86,0" Text="{Binding Directory, UpdateSourceTrigger=PropertyChanged}"/>
-        <Button x:Name="browse" Content="Browse" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,10,10,0" Height="23" Click="browse_Click" Width="71"/>
+        <Button x:Name="browse" Content="Browse..." HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,10,10,0" Height="23" Click="browse_Click" Width="71"/>
         <Label Content="File type" HorizontalAlignment="Left" Margin="10,38,0,0" VerticalAlignment="Top"/>
         <ComboBox VerticalAlignment="Top" Margin="69,42,10,0" SelectedValuePath="Key" SelectedValue="{Binding SelectedFileType}" IsEnabled="{Binding Files, TargetNullValue=false}">
             <ComboBox.Resources>
diff --git a/Playlist Generator GUI/MainWindowViewModel.cs b/Playlist Generator GUI/MainWindowViewModel.cs
@@ -8,7 +8,7 @@
 using FileDirectory = System.IO.Directory;
 
 namespace PlaylistGenerator {
-    class MainWindowViewModel : ViewModel {
+    sealed class MainWindowViewModel : ViewModel {
         //Working directory.
         private string directory;
 
diff --git a/Playlist Generator GUI/Playlist Generator GUI.csproj b/Playlist Generator GUI/Playlist Generator GUI.csproj
@@ -43,13 +43,15 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>
diff --git a/Playlist Generator GUI/Properties/AssemblyInfo.cs b/Playlist Generator GUI/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
diff --git a/Playlist Generator Test/M3UTest.cs b/Playlist Generator Test/M3UTest.cs
@@ -44,8 +44,11 @@ public void TestToString() {
             var m3u = new M3U();
             Assert.AreEqual(String.Empty, m3u.ToString());
 
-            m3u.Add("foo").Add("bar");
-            Assert.AreEqual("foo\nbar", m3u.ToString());
+            m3u.Add("foo");
+            Assert.AreEqual("foo\n", m3u.ToString());
+
+            m3u.Add("bar").Add("baz");
+            Assert.AreEqual("foo\nbar\nbaz\n", m3u.ToString());
         }
     }
 }
diff --git a/Playlist Generator.sln b/Playlist Generator.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playlist Generator GUI", "Playlist Generator GUI\Playlist Generator GUI.csproj", "{3294B331-287B-417B-A5EE-0AE67DAC34DB}"
 EndProject
@@ -11,6 +11,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playlist Generator", "Playl
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playlist Generator Console", "Playlist Generator Console\Playlist Generator Console.csproj", "{9DAA5A06-E8A7-4E25-8621-C0DA0C7EBCCE}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0C7C84D3-CA41-4210-8EF8-19A91E6D5D31}"
+	ProjectSection(SolutionItems) = preProject
+		README.md = README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/Playlist Generator/M3U.cs b/Playlist Generator/M3U.cs
@@ -17,7 +17,7 @@ public M3U() : base() {}
         public M3U(IEnumerable<string> paths) : base(paths) {}
 
         override public string ToString() {
-            return Paths.DefaultIfEmpty(String.Empty).Aggregate((a, b) => a += lineFeed + b);
+            return Paths.Aggregate(String.Empty, (a, b) => a + b + lineFeed);
         }
     }
 }
diff --git a/Playlist Generator/Playlist Generator.csproj b/Playlist Generator/Playlist Generator.csproj
@@ -22,12 +22,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/Playlist Generator/Properties/AssemblyInfo.cs b/Playlist Generator/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
 
 //Friend assemblies.
 [assembly: InternalsVisibleTo("PlaylistGeneratorTest")]
diff --git a/README.md b/README.md
@@ -35,5 +35,3 @@ The entire project has been designed with extensibility in mind so feel free to
   [1]: https://raw.github.com/wiki/ScriptFUSION/Playlist-Generator/images/logo%201.2%20grey%20x35.png
   [2]: http://stackoverflow.com/questions/14942374/nuget-package-files-not-being-copied-to-project-content-during-build
   [3]: http://docs.nuget.org/docs/reference/package-restore
-  
-![](https://d2weczhvl823v0.cloudfront.net/ScriptFUSION/playlist-generator/trend.png)

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,11 @@ public void TestToString() {`
`44`	`44`	`var m3u = new M3U();`
`45`	`45`	`Assert.AreEqual(String.Empty, m3u.ToString());`
`46`	`46`
`47`		`- m3u.Add("foo").Add("bar");`
`48`		`- Assert.AreEqual("foo\nbar", m3u.ToString());`
	`47`	`+ m3u.Add("foo");`
	`48`	`+ Assert.AreEqual("foo\n", m3u.ToString());`
	`49`	`+`
	`50`	`+ m3u.Add("bar").Add("baz");`
	`51`	`+ Assert.AreEqual("foo\nbar\nbaz\n", m3u.ToString());`
`49`	`52`	`}`
`50`	`53`	`}`
`51`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public M3U() : base() {}`
`17`	`17`	`public M3U(IEnumerable<string> paths) : base(paths) {}`
`18`	`18`
`19`	`19`	`override public string ToString() {`
`20`		`- return Paths.DefaultIfEmpty(String.Empty).Aggregate((a, b) => a += lineFeed + b);`
	`20`	`+ return Paths.Aggregate(String.Empty, (a, b) => a + b + lineFeed);`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`