From 4119dec95d74bae568f7a6123f682e28d34a4ad5 Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Sat, 19 Oct 2013 16:30:01 +0200
Subject: [PATCH] move utilites; catch HttpRequestException; Read Article from
 URI

---
 PocketSharp/Models/PocketArticle.cs           |  2 +-
 PocketSharp/PocketClient.cs                   | 10 ++++-
 PocketSharp/PocketReader.cs                   | 37 ++++++++++++++++---
 PocketSharp/PocketSharp.csproj                |  6 +--
 PocketSharp/{ => Utilities}/JsonExtensions.cs |  0
 .../{ => Utilities}/PocketException.cs        |  0
 PocketSharp/{ => Utilities}/Utilities.cs      |  0
 7 files changed, 44 insertions(+), 11 deletions(-)
 rename PocketSharp/{ => Utilities}/JsonExtensions.cs (100%)
 rename PocketSharp/{ => Utilities}/PocketException.cs (100%)
 rename PocketSharp/{ => Utilities}/Utilities.cs (100%)

diff --git a/PocketSharp/Models/PocketArticle.cs b/PocketSharp/Models/PocketArticle.cs
index 89ce37a..4361156 100644
--- a/PocketSharp/Models/PocketArticle.cs
+++ b/PocketSharp/Models/PocketArticle.cs
@@ -40,6 +40,6 @@ namespace PocketSharp.Models
     /// <value>
     /// The next page URL.
     /// </value>
-    public string NextPageUrl { get; set; }
+    public Uri NextPage { get; set; }
   }
 }
diff --git a/PocketSharp/PocketClient.cs b/PocketSharp/PocketClient.cs
index bdded50..d4c34ff 100644
--- a/PocketSharp/PocketClient.cs
+++ b/PocketSharp/PocketClient.cs
@@ -112,6 +112,7 @@ namespace PocketSharp
 
       // every single Pocket API endpoint requires HTTP POST data
       HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, method);
+      HttpResponseMessage response = null;
 
       if (parameters == null)
       {
@@ -131,7 +132,14 @@ namespace PocketSharp
       request.Content = new FormUrlEncodedContent(parameters);
 
       // make async request
-      HttpResponseMessage response = await _restClient.SendAsync(request);
+      try
+      {
+        response = await _restClient.SendAsync(request);
+      }
+      catch (HttpRequestException exc)
+      {
+        throw new PocketException(exc.Message, exc);
+      }
 
       // validate HTTP response
       ValidateResponse(response);
diff --git a/PocketSharp/PocketReader.cs b/PocketSharp/PocketReader.cs
index 9001348..0071a61 100644
--- a/PocketSharp/PocketReader.cs
+++ b/PocketSharp/PocketReader.cs
@@ -42,6 +42,25 @@ namespace PocketSharp
 
 
 
+    /// <summary>
+    /// Reads article content from the given URI.
+    /// This method does not use the official Article View API, which is private.
+    /// The PocketReader is based on a custom PCL port of NReadability and SgmlReader.
+    /// </summary>
+    /// <param name="uri">An URI.</param>
+    /// <returns>A Pocket article with extracted content and title.</returns>
+    /// <exception cref="PocketRequestException"></exception>
+    public async Task<PocketArticle> Read(Uri uri)
+    {
+      return await Read(new PocketItem()
+      {
+        ID = 0,
+        Uri = uri
+      });
+    }
+
+
+
     /// <summary>
     /// Reads article content from the given PocketItem.
     /// This method does not use the official Article View API, which is private.
@@ -49,7 +68,7 @@ namespace PocketSharp
     /// </summary>
     /// <param name="item">The pocket item.</param>
     /// <returns>A Pocket article with extracted content and title.</returns>
-    /// <exception cref="PocketException"></exception>
+    /// <exception cref="PocketRequestException"></exception>
     public async Task<PocketArticle> Read(PocketItem item)
     {
       // initialize transcoder
@@ -87,7 +106,7 @@ namespace PocketSharp
       {
         Content = transcodingResult.ExtractedContent,
         Title = transcodingResult.ExtractedTitle,
-        NextPageUrl = transcodingResult.NextPageUrl,
+        NextPage = transcodingResult.NextPageUrl != null ? new Uri(transcodingResult.NextPageUrl, UriKind.Absolute) : null,
         PocketItemID = item.ID
       };
     }
@@ -102,9 +121,17 @@ namespace PocketSharp
     protected async Task<string> Request(Uri uri)
     {
       HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, uri);
+      HttpResponseMessage response = null;
 
       // make async request
-      HttpResponseMessage response = await _httpClient.SendAsync(request);
+      try
+      {
+        response = await _httpClient.SendAsync(request);
+      }
+      catch (HttpRequestException exc)
+      {
+        throw new PocketException(exc.Message, exc);
+      }
 
       // validate HTTP response
       if (response.StatusCode != HttpStatusCode.OK)
@@ -115,9 +142,7 @@ namespace PocketSharp
       }
 
       // read response
-      var responseString = await response.Content.ReadAsStringAsync();
-
-      return responseString;
+      return await response.Content.ReadAsStringAsync();
     }
   }
 }
\ No newline at end of file
diff --git a/PocketSharp/PocketSharp.csproj b/PocketSharp/PocketSharp.csproj
index aa37969..0d50e15 100644
--- a/PocketSharp/PocketSharp.csproj
+++ b/PocketSharp/PocketSharp.csproj
@@ -43,13 +43,13 @@
     <Compile Include="Models\Parameters\RegisterParameters.cs" />
     <Compile Include="Models\PocketArticle.cs" />
     <Compile Include="Models\PocketStatistics.cs" />
-    <Compile Include="PocketException.cs" />
+    <Compile Include="Utilities\PocketException.cs" />
     <Compile Include="Components\Add.cs" />
     <Compile Include="Components\Account.cs" />
     <Compile Include="Components\Modify.cs" />
     <Compile Include="Components\ModifyTags.cs" />
     <Compile Include="Components\Get.cs" />
-    <Compile Include="JsonExtensions.cs" />
+    <Compile Include="Utilities\JsonExtensions.cs" />
     <Compile Include="Models\Parameters\ActionParameter.cs" />
     <Compile Include="Models\Parameters\AddParameters.cs" />
     <Compile Include="Models\Parameters\ModifyParameters.cs" />
@@ -69,7 +69,7 @@
     <Compile Include="PocketClient.cs" />
     <Compile Include="PocketReader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utilities.cs" />
+    <Compile Include="Utilities\Utilities.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Threading.Tasks">
diff --git a/PocketSharp/JsonExtensions.cs b/PocketSharp/Utilities/JsonExtensions.cs
similarity index 100%
rename from PocketSharp/JsonExtensions.cs
rename to PocketSharp/Utilities/JsonExtensions.cs
diff --git a/PocketSharp/PocketException.cs b/PocketSharp/Utilities/PocketException.cs
similarity index 100%
rename from PocketSharp/PocketException.cs
rename to PocketSharp/Utilities/PocketException.cs
diff --git a/PocketSharp/Utilities.cs b/PocketSharp/Utilities/Utilities.cs
similarity index 100%
rename from PocketSharp/Utilities.cs
rename to PocketSharp/Utilities/Utilities.cs