Winify – Diff between revs 15 and 28
?pathlinks?
Rev 15 | Rev 28 | |||
---|---|---|---|---|
Line 12... | Line 12... | |||
12 | public static class ServersSerialization |
12 | public static class ServersSerialization |
|
13 | { |
13 | { |
|
14 | #region Public Methods |
14 | #region Public Methods |
|
Line 15... | Line 15... | |||
15 | |
15 | |
|
16 | public static async Task<SerializationState> Deserialize<T>(string file, string targetNamespace, |
16 | public static async Task<SerializationState> Deserialize<T>(string file, string targetNamespace, |
|
17 | string schemeUri) |
17 | string schemeUri) |
|
18 | { |
18 | { |
|
Line 19... | Line 19... | |||
19 | var xmlSerializer = new XmlSerializer(typeof(T)); |
19 | var xmlSerializer = new XmlSerializer(typeof(T)); |
|
Line 45... | Line 45... | |||
45 | settings.ValidationEventHandler += XmlReaderSettingsValidationEventHandler; |
45 | settings.ValidationEventHandler += XmlReaderSettingsValidationEventHandler; |
|
Line 46... | Line 46... | |||
46 | |
46 | |
|
Line 47... | Line 47... | |||
47 | settings.Schemas.Add(targetNamespace, schemeUri); |
47 | settings.Schemas.Add(targetNamespace, schemeUri); |
|
48 | |
48 | |
|
49 | using (var fileStream = |
49 | using (var fileStream = |
|
50 | new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) |
50 | new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) |
|
51 | { |
51 | { |
|
52 | using (var xmlReader = XmlReader.Create(fileStream, |
52 | using (var xmlReader = XmlReader.Create(fileStream, |
|
53 | settings)) |
53 | settings)) |
|
Line 54... | Line 54... | |||
54 | { |
54 | { |
|
55 | var stringBuilder = new StringBuilder(); |
55 | var stringBuilder = new StringBuilder(); |
|
56 | |
56 | |
|
57 | using (var stringWriter = new StringWriter(stringBuilder)) |
- | ||
58 | { |
57 | using (var stringWriter = new StringWriter(stringBuilder)) |
|
59 | while (await xmlReader.ReadAsync()) |
- | ||
60 | { |
58 | { |
|
Line 61... | Line 59... | |||
61 | await stringWriter.WriteAsync(await xmlReader.ReadOuterXmlAsync()); |
59 | while (await xmlReader.ReadAsync()) |
|
62 | } |
60 | await stringWriter.WriteAsync(await xmlReader.ReadOuterXmlAsync()); |
|
63 | } |
61 | } |
|
64 | |
62 | |
|
65 | using (var stringReader = new StringReader(stringBuilder.ToString())) |
63 | using (var stringReader = new StringReader(stringBuilder.ToString())) |
|
66 | { |
64 | { |
|
67 | servers = |
65 | servers = |
|
68 | (T) xmlSerializer |
66 | (T)xmlSerializer |
|
69 | .Deserialize(stringReader); |
67 | .Deserialize(stringReader); |
|
Line 91... | Line 89... | |||
91 | try |
89 | try |
|
92 | { |
90 | { |
|
93 | using (var memoryStream = new MemoryStream()) |
91 | using (var memoryStream = new MemoryStream()) |
|
94 | { |
92 | { |
|
95 | using (var xmlWriter = |
93 | using (var xmlWriter = |
|
96 | XmlWriter.Create(memoryStream, |
94 | XmlWriter.Create(memoryStream, |
|
97 | new XmlWriterSettings |
95 | new XmlWriterSettings |
|
98 | { |
96 | { |
|
99 | Async = true, |
97 | Async = true, |
|
100 | Indent = true, |
98 | Indent = true, |
|
101 | IndentChars = " ", |
99 | IndentChars = " ", |
|
102 | OmitXmlDeclaration = false |
100 | OmitXmlDeclaration = false |
|
103 | })) |
101 | })) |
|
104 | { |
102 | { |
|
105 | await xmlWriter.WriteDocTypeAsync(name, |
103 | await xmlWriter.WriteDocTypeAsync(name, |
|
106 | null, |
104 | null, |
|
107 | null, |
105 | null, |
|
108 | subset); |
106 | subset); |
|
Line 109... | Line 107... | |||
109 | |
107 | |
|
Line 110... | Line 108... | |||
110 | xmlSerializer.Serialize(xmlWriter, servers); |
108 | xmlSerializer.Serialize(xmlWriter, servers); |
|
111 | |
109 | |
|
112 | using (var fileStream = |
110 | using (var fileStream = |
|
113 | new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.ReadWrite)) |
111 | new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.ReadWrite)) |
|
Line 114... | Line 112... | |||
114 | { |
112 | { |
|
115 | memoryStream.Position = 0L; |
113 | memoryStream.Position = 0L; |