From 3201160d6674276899abe121de231de090ccbaa4 Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Mon, 16 Dec 2013 22:08:23 +0100 Subject: [PATCH] move image extractor into NReadability --- PocketSharp.Reader/PocketReader.cs | 2 +- PortablePorts/NReadability/NReadabilityTranscoder.cs | 3 +++ PortablePorts/NReadability/TranscodingResult.cs | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/PocketSharp.Reader/PocketReader.cs b/PocketSharp.Reader/PocketReader.cs index b8bff56..038c7fa 100644 --- a/PocketSharp.Reader/PocketReader.cs +++ b/PocketSharp.Reader/PocketReader.cs @@ -111,7 +111,7 @@ namespace PocketSharp TranscodingResult transcodingResult = transcoder.Transcode(transcodingInput); // get images from article - List images = transcodingResult.RawDocument.GetElementsByTagName("img").Select(image => + List images = transcodingResult.Images.Select(image => { Uri imageUri; Uri.TryCreate(image.GetAttributeValue("src", null), UriKind.Absolute, out imageUri); diff --git a/PortablePorts/NReadability/NReadabilityTranscoder.cs b/PortablePorts/NReadability/NReadabilityTranscoder.cs index 19a6924..fa85d11 100644 --- a/PortablePorts/NReadability/NReadabilityTranscoder.cs +++ b/PortablePorts/NReadability/NReadabilityTranscoder.cs @@ -240,6 +240,8 @@ namespace PocketSharp.Ports.NReadability out extractedTitle, out nextPageUrl); + IEnumerable images = transcodedXmlDocument.GetElementsByTagName("img"); + string transcodedContent = _sgmlDomSerializer.SerializeDocument( transcodedXmlDocument, @@ -253,6 +255,7 @@ namespace PocketSharp.Ports.NReadability ExtractedContent = transcodedContent, ExtractedTitle = extractedTitle, NextPageUrl = nextPageUrl, + Images = images }; } diff --git a/PortablePorts/NReadability/TranscodingResult.cs b/PortablePorts/NReadability/TranscodingResult.cs index 0b98c4d..8418e1c 100644 --- a/PortablePorts/NReadability/TranscodingResult.cs +++ b/PortablePorts/NReadability/TranscodingResult.cs @@ -1,4 +1,4 @@ -using System; +using System.Collections.Generic; using System.Xml.Linq; namespace PocketSharp.Ports.NReadability @@ -22,5 +22,7 @@ namespace PocketSharp.Ports.NReadability public string NextPageUrl { get; set; } public XDocument RawDocument { get; set; } + + public IEnumerable Images { get; set; } } }