Merge branch 'evexml' into evecrest

ezet · Mar 23, 2016 · 3e50646 · 3e50646
2 parents 91d1e1f + 164e0b7
commit 3e50646
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/EveLib.EveXml/Corporation.cs b/EveLib.EveXml/Corporation.cs
@@ -558,7 +558,6 @@ public EveXmlResponse<OutpostList> GetOutpostList() {
         /// </summary>
         /// <returns></returns>
         public Task<EveXmlResponse<OutpostList>> GetOutpostListAsync() {
-            // TODO Link to OutpostServiceDetails
             const string relPath = "/corp/OutpostList.xml.aspx";
             return requestAsync<OutpostList>(relPath, ApiKey);
         }

diff --git a/EveLib.EveXml/Models/Character/SkillTraining.cs b/EveLib.EveXml/Models/Character/SkillTraining.cs
@@ -23,7 +23,6 @@ namespace eZet.EveLib.EveXmlModule.Models.Character {
     [Serializable]
     [XmlRoot("result", IsNullable = false)]
     public class SkillTraining {
-        // TODO Convert zone
         /// <summary>
         ///     Gets the current tq time.
         /// </summary>

diff --git a/EveLib.EveXml/RequestHandlers/EveXmlRequestHandler.cs b/EveLib.EveXml/RequestHandlers/EveXmlRequestHandler.cs
@@ -47,12 +47,18 @@ public async Task<T> RequestAsync<T>(Uri uri) {
             if (cached) return Serializer.Deserialize<T>(data);
             if (CacheLevel == CacheLevel.CacheOnly) return default(T);
             try {
-                data = await HttpRequestHelper.RequestAsync(uri).ConfigureAwait(false);
+                var response = await HttpRequestHelper.GetResponseAsync(HttpRequestHelper.CreateRequest(uri)).ConfigureAwait(false);
+                // special handling for status code 000, because we cannot fetch the response body
+                if (response.StatusCode.ToString() == "0") {
+                    throw new EveXmlException("Kill log exhausted (You can only fetch kills that are less than a month old)", 119, new WebException("Unknown", null, WebExceptionStatus.UnknownError, response));
+                }
+                data = await HttpRequestHelper.GetResponseContentAsync(response);
+
             }
             catch (WebException e) {
                 _trace.TraceEvent(TraceEventType.Error, 0, "Http Request failed");
                 var response = (HttpWebResponse) e.Response;
-                if (response == null) throw;
+                if (response == null) throw new EveXmlException("Unknown", 0, e);
                 var responseStream = response.GetResponseStream();
                 if (responseStream == null) throw;
                 using (var reader = new StreamReader(responseStream)) {

diff --git a/EveLib.Tests/EveXml/CharacterKey_ValidKeyTests.cs b/EveLib.Tests/EveXml/CharacterKey_ValidKeyTests.cs
@@ -111,7 +111,6 @@ public async Task GetIndustryJobsHistory_NoErrors() {
 
         [TestMethod]
         public void GetKillLog() {
-            // BUG Returns 000 OK when exhausted
             var res = _validKey.Characters[0].GetKillLog();
             Assert.IsNotNull(res.Result);
         }