Update the API to v1.4

License.txt

@@ -1,5 +1,14 @@
-Copyright (c) 2012, Daniel Widegren daniel@widegren.org
+Copyright (c) 2012, Daniel Widegren <daniel@widegren.org>
+Copyright (c) 2015, Iris Ward <aditu.venyhandottir@gmail.com>
 
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.

Readme.md

@@ -1,9 +1,10 @@
 ## C-Sharp-API-Client
 This is a simple API Client for WaniKani to speed up projects written in .NET
-Current API version is 1.1
+Current API version is 1.4
 
 Copyright (c) 2012, Daniel Widegren
-All code is licensed under the MIT License, Please read License.txt for more information.
+Copyright (c) 2015, Iris Ward
+All code is licensed under the ISC License, Please read License.txt for more information.
 
 ## How to use:
 Include the dll or code into your project.

WaniKaniApp.sln

@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaniKaniClientDemo", "WaniKaniApp\WaniKaniClientDemo.csproj", "{AC47E8F6-4436-4FFF-AF3D-F3F7A538696F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaniKaniClientLib", "WaniKaniClient\WaniKaniClientLib.csproj", "{6546956C-826B-4A5C-B639-A0F909C68F31}"

WaniKaniClient/Models/BaseCharacter.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace WaniKaniClientLib.Models
 {
@@ -13,19 +9,7 @@ public class BaseCharacter
         public string Meaning { get; set; }
         public int Level { get; set; }
 
-        [JsonProperty("unlocked_date")]
-        public long UnlockTimeStamp { get; set; }
-        public DateTime UnlockedDate
-        {
-            get
-            {
-                var date = new DateTime(1970, 1, 1, 0, 0, 0, 0);
-                return date.AddSeconds(UnlockTimeStamp);
-            }
-        }
-
-        public string Percentage { get; set; }
-
+        [JsonProperty("user_specific")]
         public Stats Stats { get; set; }
     }
 }

WaniKaniClient/Models/Kanji.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace WaniKaniClientLib.Models
 {
@@ -14,7 +10,8 @@ public Kanji()
         }
 
         public string Onyomi { get; set; }
-        public string kunyomi { get; set; }
+        public string Kunyomi { get; set; }
+        public string Nanori { get; set; }
 
         [JsonProperty("important_reading")]
         public string ImportantReading { get; set; }

WaniKaniClient/Models/LevelProgression.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace WaniKaniClientLib.Models
 {

WaniKaniClient/Models/Radical.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace WaniKaniClientLib.Models
+namespace WaniKaniClientLib.Models
 {
     public class Radical : BaseCharacter
     {

WaniKaniClient/Models/SrsDistribution.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace WaniKaniClientLib.Models
+namespace WaniKaniClientLib.Models
 {
     public class SrsDistribution
     {

WaniKaniClient/Models/SrsDistributionItem.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace WaniKaniClientLib.Models
+namespace WaniKaniClientLib.Models
 {
     public class SrsDistributionItem
     {

WaniKaniClient/Models/Stats.cs

@@ -1,14 +1,20 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
+using WaniKaniClientLib.Utils;
 
 namespace WaniKaniClientLib.Models
 {
     public class Stats
     {
         public string Srs { get; set; }
+
+        // The precise stage of SRS the learning item is currently at.
+        // Stages 1 to 4 fall within "Apprentice"; stages 5 & 6 are "Guru";
+        // Stages 7, 8 and 9 are "Master", "Enlightened" and "Burned"
+        // respectively
+        [JsonProperty("srs_numeric")]
+        public int SrsLevel { get; set; }
+
         public bool Burned { get; set; }
 
         [JsonProperty("meaning_correct")]
@@ -44,8 +50,7 @@ public DateTime? UnlockedDate
                 if (UnlockedTimeStamp == 0)
                     return null;
 
-                var date = new DateTime(1970, 1, 1, 0, 0, 0, 0);
-                return date.AddSeconds(UnlockedTimeStamp);
+                return Utilities.UnixEpoch.AddSeconds(UnlockedTimeStamp);
             }
         }
 
@@ -58,8 +63,7 @@ public DateTime? AvailableDate
                 if (AvailableTimeStamp == 0)
                     return null;
 
-                var date = new DateTime(1970, 1, 1, 0, 0, 0, 0);
-                return date.AddSeconds(AvailableTimeStamp);
+                return Utilities.UnixEpoch.AddSeconds(AvailableTimeStamp);
             }
         }
 
@@ -72,10 +76,18 @@ public DateTime? BurnedDate
                 if (BurnedTimeStamp == 0)
                     return null;
 
-                var date = new DateTime(1970, 1, 1, 0, 0, 0, 0);
-                return date.AddSeconds(BurnedTimeStamp);
+                return Utilities.UnixEpoch.AddSeconds(BurnedTimeStamp);
             }
         }
+
+        [JsonProperty("meaning_note")]
+        public string MeaningNote { get; set; }
+
+        [JsonProperty("reading_note")]
+        public string ReadingNote { get; set; }
+
+        [JsonProperty("user_synonyms")]
+        public string UserSynonyms { get; set; }
 
     }
 }

WaniKaniClient/Models/StudyQueue.cs

@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
+using WaniKaniClientLib.Utils;
 
 namespace WaniKaniClientLib.Models
 {
@@ -20,8 +18,7 @@ public DateTime NextReviewDate
         {
             get
             {
-                var date = new DateTime(1970, 1, 1, 0, 0, 0, 0);
-                return date.AddSeconds(NextReviewTimeStamp);
+                return Utilities.UnixEpoch.AddSeconds(NextReviewTimeStamp);
             }
         }
 

WaniKaniClient/Models/UserInformation.cs

@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
+using WaniKaniClientLib.Utils;
 
 namespace WaniKaniClientLib.Models
 {
@@ -24,14 +22,28 @@ public class UserInformation
 
         [JsonProperty("creation_date")]
         public long CreationTimeStamp { get; set; }
-        public DateTime CreatioDate
+        public DateTime CreationDate
         {
             get
             {
-                var date = new DateTime(1970, 1, 1, 0, 0, 0, 0);
-                return date.AddSeconds(CreationTimeStamp);
+                return Utilities.UnixEpoch.AddSeconds(CreationTimeStamp);
             }
         }
 
+        // We have to use a nullable long here as the vacation date is passed as "null" in the API
+        // if the user is not on vacation, rather than being omitted as in learning items
+        [JsonProperty("vacation_date")]
+        public long? VacationTimeStamp { get; set; }
+        public DateTime? VacationDate
+        {
+            get
+            {
+                if (VacationTimeStamp.HasValue)
+                {
+                    return Utilities.UnixEpoch.AddSeconds(VacationTimeStamp.Value);
+                }
+                return null;
+            }
+        }
     }
 }

WaniKaniClient/Models/Vocabulary.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace WaniKaniClientLib.Models
+namespace WaniKaniClientLib.Models
 {
     public class Vocabulary : BaseCharacter
     {

WaniKaniClient/Utils/Extensions.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace WaniKaniClientLib.Utils
+{
+    internal static class Utilities
+    {
+        public static DateTime UnixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
+    }
+}

WaniKaniClient/WaniKaniClient.cs

@@ -13,7 +13,7 @@ namespace WaniKaniClientLib
     public class WaniKaniClient
     {
         public string APIKey { get; private set; }
-        public static readonly string ApiVersion = "v1.1";
+        public static readonly string ApiVersion = "v1.4";
         public int CacheInMinutes { get; set; }
 
         private UserInformation _cachedUserInformation;
@@ -262,6 +262,7 @@ private string BuildUrl(string resource = null, string optionalArgument = null)
         private JObject Request(string resource = null, string optionalArgument = null)
         {
             WebClient httpClient = new WebClient();
+            httpClient.Encoding = Encoding.UTF8;
             string responce = httpClient.DownloadString(BuildUrl(resource, optionalArgument));
 
             return JObject.Parse(responce);

WaniKaniClient/WaniKaniClientLib.csproj

@@ -54,6 +54,7 @@
     <Compile Include="Models\StudyQueue.cs" />
     <Compile Include="Models\UserInformation.cs" />
     <Compile Include="Models\Vocabulary.cs" />
+    <Compile Include="Utils\Extensions.cs" />
     <Compile Include="WaniKaniClient.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>