"Correct filenames": utf8 support

CUETools.FlaCudaExe/CUETools.FlaCuda.csproj

@@ -72,11 +72,6 @@
       <Name>CUETools.Codecs</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\CUETools.Codecs.FlaCuda\CUETools.Codecs.FlaCuda.csproj">
-      <Project>{DFE50673-906C-4B8F-993B-A24CAD1CA17D}</Project>
-      <Name>CUETools.Codecs.FlaCuda</Name>
-      <Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />

CUETools.Processor/CUESheet.cs

@@ -2197,17 +2197,12 @@ namespace CUETools.Processor
             }
         }
 
-        public static void WriteText(string path, string text, Encoding encoding)
-        {
-            StreamWriter sw1 = new StreamWriter(path, false, encoding);
-            sw1.Write(text);
-            sw1.Close();
-        }
-
         public static void WriteText(string path, string text)
         {
             bool utf8Required = CUESheet.Encoding.GetString(CUESheet.Encoding.GetBytes(text)) != text;
-            WriteText(path, text, utf8Required ? Encoding.UTF8 : CUESheet.Encoding);
+            var encoding = utf8Required ? Encoding.UTF8 : CUESheet.Encoding;
+            using (StreamWriter sw1 = new StreamWriter(path, false, encoding))
+                sw1.Write(text);
         }
 
         public bool PrintErrors(StringWriter logWriter, uint tr_start, uint len)

CUETools/CUETools.sln

@@ -114,10 +114,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Flake", "..\CUEToo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.ALACEnc", "..\CUETools.ALACEnc\CUETools.ALACEnc.csproj", "{8E6E1763-39AE-491D-A10F-44C8844ABA5B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs.FlaCuda", "..\CUETools.Codecs.FlaCuda\CUETools.Codecs.FlaCuda.csproj", "{DFE50673-906C-4B8F-993B-A24CAD1CA17D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.FlaCuda", "..\CUETools.FlaCudaExe\CUETools.FlaCuda.csproj", "{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs.CLAC", "..\CUETools.Codecs.CLAC\CUETools.Codecs.CLAC.csproj", "{DDE1EA77-637C-4D5F-96F3-1328BC45CE80}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.CLACEncoder", "..\CUETools.CLACEncoder\CUETools.CLACEncoder.csproj", "{FC4BCF9B-F4C7-41AD-8A16-2A90A082954A}"
@@ -656,36 +652,6 @@ Global
 		{8E6E1763-39AE-491D-A10F-44C8844ABA5B}.Release|Win32.ActiveCfg = Release|Any CPU
 		{8E6E1763-39AE-491D-A10F-44C8844ABA5B}.Release|x64.ActiveCfg = Release|Any CPU
 		{8E6E1763-39AE-491D-A10F-44C8844ABA5B}.Release|x86.ActiveCfg = Release|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Debug|x64.Build.0 = Debug|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Release|Win32.ActiveCfg = Release|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Release|x64.ActiveCfg = Release|Any CPU
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D}.Release|x86.ActiveCfg = Release|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Debug|x64.Build.0 = Debug|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Release|Win32.ActiveCfg = Release|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Release|x64.ActiveCfg = Release|Any CPU
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E}.Release|x86.ActiveCfg = Release|Any CPU
 		{DDE1EA77-637C-4D5F-96F3-1328BC45CE80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DDE1EA77-637C-4D5F-96F3-1328BC45CE80}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DDE1EA77-637C-4D5F-96F3-1328BC45CE80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1123,7 +1089,6 @@ Global
 		{115CC5B0-0385-41CD-8A23-6A7EA4C51926} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D}
 		{2379BAAF-A406-4477-BF53-2D6A326C24C8} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D}
 		{8E6E1763-39AE-491D-A10F-44C8844ABA5B} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D}
-		{1FCA8834-34E6-47CF-B53F-D8DF49F0819E} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D}
 		{FC4BCF9B-F4C7-41AD-8A16-2A90A082954A} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D}
 		{1FCA8834-34E6-47CF-B53F-D8DF35345363} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D}
 		{F8C29953-A697-4462-82DC-DA7146654A64} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D}
@@ -1138,7 +1103,6 @@ Global
 		{B3DF599C-1C8F-451D-91E4-DD766210DA1F} = {8B179853-B7D6-479C-B8B2-6CBCE835D040}
 		{F2EC7193-D5E5-4252-9803-5CEB407E910F} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D}
 		{082D6B9E-326E-4D15-9798-EDAE9EDE70A6} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D}
-		{DFE50673-906C-4B8F-993B-A24CAD1CA17D} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D}
 		{DDE1EA77-637C-4D5F-96F3-1328BC45CE80} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D}
 		{1AF02E2C-2CB2-44B5-B417-37653071FEC6} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D}
 		{DFE55765-564C-4B8F-993B-A94C4D1C212E} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D}

CUETools/frmCUETools.cs

@@ -823,19 +823,17 @@ namespace JDP
                         {
                             if (toolStripButtonCorrectorOverwrite.Checked)
                             {
-                                using (StreamWriter sw = new StreamWriter(pathIn, false, CUESheet.Encoding))
+                                CUESheet.WriteText(pathIn, fixedCue);
-                                    sw.Write(fixedCue);
                                 BatchLog("corrected ({0}).", pathIn, extension);
                             }
                             else
                             {
-                                string pathFixed = Path.ChangeExtension(pathIn, extension + ".cue");
+                                string fixedPath = Path.ChangeExtension(pathIn, extension + ".cue");
-                                if (File.Exists(pathFixed))
+                                if (File.Exists(fixedPath))
                                     BatchLog("corrected cue already exists.", pathIn);
                                 else
                                 {
-                                    using (StreamWriter sw = new StreamWriter(pathFixed, false, CUESheet.Encoding))
+                                    CUESheet.WriteText(fixedPath, fixedCue);
-                                        sw.Write(fixedCue);
                                     BatchLog("corrected ({0}).", pathIn, extension);
                                 }
                             }