From 789ac98fa258692a25eaf5f380088479caa389ac Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 26 Apr 2016 23:25:42 +0100 Subject: Add runtime classes so that PathRelativeFileReader works on .NET --- couscous.json | 1 - dotnet/Mammoth.Tests/DocumentConverterTests.cs | 7 ++++ dotnet/Mammoth/Couscous/java/net/URI.cs | 42 ++++++++++++++++++++++ .../Couscous/java/net/URISyntaxException.cs | 6 ++++ dotnet/Mammoth/Couscous/java/net/URL.cs | 26 ++++++++++++++ dotnet/Mammoth/Couscous/java/nio/file/Path.cs | 6 +++- .../internal/docx/PathRelativeFileReader.cs | 17 --------- dotnet/Mammoth/Mammoth.csproj | 4 ++- 8 files changed, 89 insertions(+), 20 deletions(-) create mode 100644 dotnet/Mammoth/Couscous/java/net/URI.cs create mode 100644 dotnet/Mammoth/Couscous/java/net/URISyntaxException.cs create mode 100644 dotnet/Mammoth/Couscous/java/net/URL.cs delete mode 100644 dotnet/Mammoth/Couscous/mammoth/internal/docx/PathRelativeFileReader.cs diff --git a/couscous.json b/couscous.json index 7c78642..f62504a 100644 --- a/couscous.json +++ b/couscous.json @@ -8,7 +8,6 @@ "!src/main/java/org/zwobble/mammoth/DocumentConverter.java", "!src/main/java/org/zwobble/mammoth/internal/docx/ZippedDocxFile.java", "!src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java", - "!src/main/java/org/zwobble/mammoth/internal/docx/PathRelativeFileReader.java", "!src/main/java/org/zwobble/mammoth/internal/styles/parsing", "!src/main/java/org/zwobble/mammoth/internal/util", "src/main/java/org/zwobble/mammoth/internal/util/InputStreamSupplier.java", diff --git a/dotnet/Mammoth.Tests/DocumentConverterTests.cs b/dotnet/Mammoth.Tests/DocumentConverterTests.cs index 30b7646..1e07f99 100644 --- a/dotnet/Mammoth.Tests/DocumentConverterTests.cs +++ b/dotnet/Mammoth.Tests/DocumentConverterTests.cs @@ -54,6 +54,13 @@ namespace Mammoth.Tests { "

"); } + [Fact] + public void ImagesStoredOutsideOfDocumentAreIncludedInOutput() { + assertSuccessfulConversion( + ConvertToHtml("external-picture.docx"), + "

"); + } + private void assertSuccessfulConversion(IResult result, string expectedValue) { if (result.Warnings.Count > 0) { throw new XunitException("Unexpected warnings: " + string.Join(", ", result.Warnings)); diff --git a/dotnet/Mammoth/Couscous/java/net/URI.cs b/dotnet/Mammoth/Couscous/java/net/URI.cs new file mode 100644 index 0000000..818d694 --- /dev/null +++ b/dotnet/Mammoth/Couscous/java/net/URI.cs @@ -0,0 +1,42 @@ +using System; + +namespace Mammoth.Couscous.java.net { + internal class URI { + private readonly Uri _uri; + + internal URI(string uri) { + try { + _uri = new Uri(uri, UriKind.RelativeOrAbsolute); + } catch (UriFormatException exception) { + throw new URISyntaxException(exception.Message); + } + } + + internal URI(Uri uri) { + _uri = uri; + } + + internal bool isAbsolute() { + return _uri.IsAbsoluteUri; + } + + internal URL toURL() { + return new URL(_uri.ToString()); + } + + internal URI resolve(string relativeUri) { + if (new URI(relativeUri).isAbsolute()) { + return new URI(relativeUri); + } else if (_uri.IsAbsoluteUri) { + return new URI(new Uri(_uri, relativeUri)); + } else { + var path = _uri.ToString(); + var lastSlashIndex = path.LastIndexOf("/"); + var basePath = lastSlashIndex == -1 + ? "." + : path.Substring(0, lastSlashIndex + 1); + return new URI(basePath + relativeUri); + } + } + } +} diff --git a/dotnet/Mammoth/Couscous/java/net/URISyntaxException.cs b/dotnet/Mammoth/Couscous/java/net/URISyntaxException.cs new file mode 100644 index 0000000..7380ff6 --- /dev/null +++ b/dotnet/Mammoth/Couscous/java/net/URISyntaxException.cs @@ -0,0 +1,6 @@ +namespace Mammoth.Couscous.java.net { + internal class URISyntaxException : System.Exception { + internal URISyntaxException(string message) : base(message) { + } + } +} diff --git a/dotnet/Mammoth/Couscous/java/net/URL.cs b/dotnet/Mammoth/Couscous/java/net/URL.cs new file mode 100644 index 0000000..af6e021 --- /dev/null +++ b/dotnet/Mammoth/Couscous/java/net/URL.cs @@ -0,0 +1,26 @@ +using System.Net; +using Mammoth.Couscous.java.io; + +namespace Mammoth.Couscous.java.net { + internal class URL { + private readonly string _url; + + internal URL(string url) { + _url = url; + } + + internal InputStream openStream() { + try { + var response = WebRequest.Create(_url).GetResponse(); + try { + return ToJava.StreamToInputStream(response.GetResponseStream()); + } catch { + response.Close(); + throw; + } + } catch (System.UriFormatException) { + return ToJava.StreamToInputStream(System.IO.File.OpenRead(_url)); + } + } + } +} diff --git a/dotnet/Mammoth/Couscous/java/nio/file/Path.cs b/dotnet/Mammoth/Couscous/java/nio/file/Path.cs index 032b4bb..030f757 100644 --- a/dotnet/Mammoth/Couscous/java/nio/file/Path.cs +++ b/dotnet/Mammoth/Couscous/java/nio/file/Path.cs @@ -1,4 +1,4 @@ -using System; +using Mammoth.Couscous.java.net; namespace Mammoth.Couscous.java.nio.file { internal class Path { @@ -7,6 +7,10 @@ namespace Mammoth.Couscous.java.nio.file { internal Path(string path) { _path = path; } + + internal URI toUri() { + return new URI(_path); + } } } diff --git a/dotnet/Mammoth/Couscous/mammoth/internal/docx/PathRelativeFileReader.cs b/dotnet/Mammoth/Couscous/mammoth/internal/docx/PathRelativeFileReader.cs deleted file mode 100644 index b581e9d..0000000 --- a/dotnet/Mammoth/Couscous/mammoth/internal/docx/PathRelativeFileReader.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Mammoth.Couscous.java.util; -using Mammoth.Couscous.java.io; -using Mammoth.Couscous.java.nio.file; - -namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class PathRelativeFileReader : FileReader { - private readonly Optional _path; - - internal PathRelativeFileReader(Optional path) { - _path = path; - } - - public InputStream getInputStream(string uri) { - throw new System.NotImplementedException(); - } - } -} diff --git a/dotnet/Mammoth/Mammoth.csproj b/dotnet/Mammoth/Mammoth.csproj index a49035c..68e7d70 100644 --- a/dotnet/Mammoth/Mammoth.csproj +++ b/dotnet/Mammoth/Mammoth.csproj @@ -54,6 +54,9 @@ + + + @@ -73,7 +76,6 @@ - -- cgit v1.2.3