claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Beautify to helper

Browse Source
This commit is contained in:
Matt Nadareski
2016-04-06 00:43:02 -07:00
parent 81cfbb0640
commit f212603619
3 changed files with 28 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
DatSplit/DatSplit.cs
View File

@@ -154,37 +154,16 @@ namespace DatSplit
// Append the built nodes to the documents // Append the built nodes to the documents
outDocA.AppendChild(outDocA.ImportNode(outA, true)); outDocA.AppendChild(outDocA.ImportNode(outA, true));
string outPathA = Path.GetFileNameWithoutExtension(filename) + extA + Path.GetExtension(filename); string outPathA = Path.GetFileNameWithoutExtension(filename) + extA + Path.GetExtension(filename);
File.WriteAllText(outPathA, Beautify(outDocA), Encoding.UTF8); File.WriteAllText(outPathA, Style.Beautify(outDocA), Encoding.UTF8);
outDocB.AppendChild(outDocB.ImportNode(outB, true)); outDocB.AppendChild(outDocB.ImportNode(outB, true));
string outPathB = Path.GetFileNameWithoutExtension(filename) + extB + Path.GetExtension(filename); string outPathB = Path.GetFileNameWithoutExtension(filename) + extB + Path.GetExtension(filename);
File.WriteAllText(outPathB, Beautify(outDocB), Encoding.UTF8); File.WriteAllText(outPathB, Style.Beautify(outDocB), Encoding.UTF8);
} }
public static void Help() public static void Help()
{ {
Console.WriteLine("DatSplit.exe <filename> <ext> <ext>"); Console.WriteLine("DatSplit.exe <filename> <ext> <ext>");
} }
// http://stackoverflow.com/questions/203528/what-is-the-simplest-way-to-get-indented-xml-with-line-breaks-from-xmldocument
// http://www.timvw.be/2007/01/08/generating-utf-8-with-systemxmlxmlwriter/
static public string Beautify(XmlDocument doc)
{
MemoryStream ms = new MemoryStream();
XmlWriterSettings settings = new XmlWriterSettings
{
Encoding = new UTF8Encoding(false),
Indent = true,
IndentChars = "\t",
NewLineChars = "\r\n",
NewLineHandling = NewLineHandling.Replace
};
using (XmlWriter writer = XmlWriter.Create(ms, settings))
{
doc.Save(writer);
}
return Encoding.UTF8.GetString(ms.ToArray());
}
} }
} }

26
SabreHelper/Style.cs
View File

@@ -1,4 +1,7 @@
using System.Text.RegularExpressions; using System.IO;
using System.Text;
using System.Text.RegularExpressions;
using System.Xml;
namespace SabreTools.Helper namespace SabreTools.Helper
{ {
@@ -135,5 +138,26 @@ namespace SabreTools.Helper
return input; return input;
} }
// http://stackoverflow.com/questions/203528/what-is-the-simplest-way-to-get-indented-xml-with-line-breaks-from-xmldocument
// http://www.timvw.be/2007/01/08/generating-utf-8-with-systemxmlxmlwriter/
public static string Beautify(XmlDocument doc)
{
MemoryStream ms = new MemoryStream();
XmlWriterSettings settings = new XmlWriterSettings
{
Encoding = new UTF8Encoding(false),
Indent = true,
IndentChars = "\t",
NewLineChars = "\r\n",
NewLineHandling = NewLineHandling.Replace
};
using (XmlWriter writer = XmlWriter.Create(ms, settings))
{
doc.Save(writer);
}
return Encoding.UTF8.GetString(ms.ToArray());
}
} }
} }

23
SingleGame/SingleGame.cs
View File

@@ -115,33 +115,12 @@ namespace SabreTools
tempDoc.AppendChild(tempDoc.CreateDocumentType("datafile", "-//Logiqx//DTD ROM Management Datafile//EN", "http://www.logiqx.com/Dats/datafile.dtd", null)); tempDoc.AppendChild(tempDoc.CreateDocumentType("datafile", "-//Logiqx//DTD ROM Management Datafile//EN", "http://www.logiqx.com/Dats/datafile.dtd", null));
tempDoc.AppendChild(outNode); tempDoc.AppendChild(outNode);
string outPath = Path.GetFileNameWithoutExtension(filename) + ".new" + Path.GetExtension(filename); string outPath = Path.GetFileNameWithoutExtension(filename) + ".new" + Path.GetExtension(filename);
File.WriteAllText(outPath, Beautify(tempDoc)); File.WriteAllText(outPath, Style.Beautify(tempDoc));
} }
private static void Help() private static void Help()
{ {
} }
// http://stackoverflow.com/questions/203528/what-is-the-simplest-way-to-get-indented-xml-with-line-breaks-from-xmldocument
// http://www.timvw.be/2007/01/08/generating-utf-8-with-systemxmlxmlwriter/
static public string Beautify(XmlDocument doc)
{
MemoryStream ms = new MemoryStream();
XmlWriterSettings settings = new XmlWriterSettings
{
Encoding = new UTF8Encoding(false),
Indent = true,
IndentChars = "\t",
NewLineChars = "\r\n",
NewLineHandling = NewLineHandling.Replace
};
using (XmlWriter writer = XmlWriter.Create(ms, settings))
{
doc.Save(writer);
}
return Encoding.UTF8.GetString(ms.ToArray());
}
} }
} }