# HG changeset patch # User IBBoard # Date 1250536124 0 # Node ID f5aec697b8eab65e5042f2aa2a6f6d5a7199646e # Parent 2f3cafb6979940e3f8fd69bb2b47af77ed04f929 Re #53: Make WarFoundry XML saver * Make XMLSaver implement Saver interface * Strip out old code * Start to code converting of objects to XML files * Add class to store strings in to Zip files diff -r 2f3cafb69799 -r f5aec697b8ea IBBoard.WarFoundry.API.csproj --- a/IBBoard.WarFoundry.API.csproj Sat Aug 15 10:36:50 2009 +0000 +++ b/IBBoard.WarFoundry.API.csproj Mon Aug 17 19:08:44 2009 +0000 @@ -132,6 +132,7 @@ + diff -r 2f3cafb69799 -r f5aec697b8ea api/Factories/Xml/WarFoundryXmlSaver.cs --- a/api/Factories/Xml/WarFoundryXmlSaver.cs Sat Aug 15 10:36:50 2009 +0000 +++ b/api/Factories/Xml/WarFoundryXmlSaver.cs Mon Aug 17 19:08:44 2009 +0000 @@ -5,92 +5,93 @@ using System; using System.Collections.Generic; using System.IO; +using System.Xml; +using System.Xml.Schema; using IBBoard.Lang; +using IBBoard.WarFoundry.API.Factories.Xml.Zip; using IBBoard.WarFoundry.API.Objects; +using IBBoard.WarFoundry.API.Savers; +using ICSharpCode.SharpZipLib.Zip; namespace IBBoard.WarFoundry.API.Factories.Xml { - public class WarFoundryXmlSaver + public class WarFoundryXmlSaver : IWarFoundryFileSaver { - //FIXME: Rework to saving files in Zips - private static WarFoundryXmlSaver saver; - private static List saveAsTypes; - private Dictionary savePaths = new Dictionary(); - - public static WarFoundryXmlSaver GetSaver() + public bool Save(Army toSave, string savePath) { - if (saver == null) + bool success = false; + ZipFile file = null; + + try { - saveAsTypes = new List(); - saveAsTypes.Add(typeof(Army)); - saver = new WarFoundryXmlSaver(); + file = ZipFile.Create(savePath); + file.BeginUpdate(); + file.Add(new StringZipEntrySource(CreateXmlString(toSave)), "data.army"); + file.CommitUpdate(); + success = true; } - - return saver; - } - - public bool SaveAs(WarFoundryObject toSave, string saveAsPath) - { - if (CanSaveType(toSave)) + finally { - FileStream fs = null; - bool success = false; - - try + if (file != null) { - fs = new FileStream(saveAsPath, FileMode.Create, FileAccess.Write); - byte[] bytes = StringManipulation.StringToBytes(CreateXmlString(toSave)); - fs.Write(bytes, 0, bytes.Length); - fs.Flush(); - savePaths.Add(toSave, saveAsPath); - success = true; + file.Close(); } - finally - { - if (fs!=null && fs.CanWrite) - { - fs.Close(); - } - } - - return success; } - else - { - throw new ArgumentException("Cannot directly save objects of type "+toSave.GetType()); - } + + return success; } - - public bool Save(WarFoundryObject toSave) - { - if (CanSave(toSave)) - { - return SaveAs(toSave, savePaths[toSave]); - } - else - { - throw new InvalidOperationException("Cannot save an object that has not previously been saved using SaveAs"); - } - } - + private string CreateXmlString(WarFoundryObject toSave) { - return ""; //TODO: Create XML string as appropriate - } - - public bool CanSaveAs(WarFoundryObject obj) - { - return CanSaveType(obj); + /* + + + + + + + + + + + + + + + + + + + + +*/ + string xmlString = ""; + + if (toSave is Army) + { + xmlString = CreateArmyXmlString((Army)toSave); + } + + return xmlString; } - - public bool CanSave(WarFoundryObject obj) + + private string CreateArmyXmlString(Army toSave) { - return savePaths.ContainsKey(obj); - } - - public bool CanSaveType(WarFoundryObject obj) - { - return saveAsTypes.Contains(obj.GetType()); + XmlDocument doc = new XmlDocument(); + XmlDeclaration declaration = doc.CreateXmlDeclaration("1.0", null, null); + doc.AppendChild(declaration); + XmlSchema schema = new XmlSchema(); + schema.Namespaces.Add("xmlns", "http://ibboard.co.uk/warfoundry/army"); + schema.Namespaces.Add("xmlns:core", "http://ibboard.co.uk/warfoundry/core"); + doc.Schemas.Add(schema); + XmlElement root = doc.CreateElement("army"); + doc.AppendChild(root); + root.SetAttribute("id", toSave.ID); + root.SetAttribute("name", toSave.Name); + root.SetAttribute("system", toSave.GameSystem.ID); + root.SetAttribute("race", toSave.Race.ID); + root.SetAttribute("maxPoints", toSave.MaxPoints.ToString()); + return doc.OuterXml; } } } diff -r 2f3cafb69799 -r f5aec697b8ea api/Factories/Xml/Zip/StringZipEntrySource.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/api/Factories/Xml/Zip/StringZipEntrySource.cs Mon Aug 17 19:08:44 2009 +0000 @@ -0,0 +1,30 @@ +// This file (StringZipEntrySource.cs) is a part of the IBBoard.WarFoundry.API project and is copyright 2009 IBBoard +// +// The file and the library/program it is in are licensed under the GNU LGPL license, either version 3 of the License or (at your option) any later version. Please see COPYING.LGPL for more information and the full license. +// + +using System; +using System.IO; +using IBBoard.Lang; +using ICSharpCode.SharpZipLib.Zip; + +namespace IBBoard.WarFoundry.API.Factories.Xml.Zip +{ + /// + /// A simple implementation of IStaticDataSource that lets us add a string directly to a Zip file + /// + public class StringZipEntrySource : IStaticDataSource + { + private byte[] entryContent; + + public StringZipEntrySource(String content) + { + entryContent = StringManipulation.StringToBytes(content); + } + + public Stream GetSource() + { + return new MemoryStream(entryContent); + } + } +}