speed.

Author: lieuwex

bin/MataSharp.XML

@@ -47,14 +47,14 @@ public partial class AssignmentVersion
         public override string ToString() { return this.Name; }
     }
 
-    internal partial struct AssignmentFolder
+    internal struct AssignmentFolder
     {
         public AssignmentFolderItem[] Items { get; set; }
         public object Paging { get; set; }
         public int TotalCount { get; set; } //Looks like that's broken at their side.
     }
 
-    internal partial struct AssignmentFolderListItem
+    internal struct AssignmentFolderListItem
     {
         public uint? Beoordeling { get; set; }
         public Attachment[] Bijlagen { get; set; }
@@ -71,14 +71,14 @@ internal partial struct AssignmentFolderListItem
         public object VersieNavigatieItems { get; set; }
     }
 
-    internal partial struct MagisterStyleAssignmentListVersion
+    internal struct MagisterStyleAssignmentListVersion
     {
         public int Id { get; set; }
         public string Omschrijving { get; set; }
         public object Ref { get; set; }
     }
 
-    internal partial struct MagisterStyleAssignmentVersion
+    sealed internal class MagisterStyleAssignmentVersion
     {
         public uint? Beoordeling { get; set; }
         public string DocentOpmerking { get; set; }
@@ -89,25 +89,23 @@ internal partial struct MagisterStyleAssignmentVersion
         public string LeerlingOpmerking { get; set; }
         public string Titel { get; set; }
 
-        public Mata Mata { get; internal set; }
-
-        public AssignmentVersion ToVersion()
+        public AssignmentVersion ToVersion(Mata mata)
         {
             return new AssignmentVersion()
             {
                 Grade = this.Beoordeling,
                 TeacherNotice = this.DocentOpmerking,
-                FeedbackAttachments = this.FeedbackBijlagen.ToList(AttachmentType.Assignment_teacher, this.Mata),
+                FeedbackAttachments = this.FeedbackBijlagen.ToList(AttachmentType.Assignment_teacher, mata),
                 HandInTime = this.IngeleverdOp.ToDateTime(),
                 DeadLine = this.InleverenVoor.ToDateTime(),
-                HandedInAttachments = this.LeerlingBijlagen.ToList(AttachmentType.Assignment_pupil, this.Mata),
+                HandedInAttachments = this.LeerlingBijlagen.ToList(AttachmentType.Assignment_pupil, mata),
                 HandedInFooter = this.LeerlingOpmerking,
                 Name = this.Titel
             };
         }
     }
 
-    internal partial struct AssignmentFolderItem
+    sealed internal class AssignmentFolderItem
     {
         public uint? Beoordeling { get; set; }
         public Attachment[] Bijlagen { get; set; }
@@ -123,26 +121,24 @@ internal partial struct AssignmentFolderItem
         public string Vak { get; set; }
         public MagisterStyleAssignmentListVersion[] VersieNavigatieItems { get; set; }
 
-        public Mata Mata { get; internal set; }
-
-        public Assignment toAssignment()
+        public Assignment toAssignment(Mata mata)
         {
             var tmpVersions = new List<AssignmentVersion>();
             foreach(var compactAssignmentVersion in this.VersieNavigatieItems)
             {
-                string URL = "https://" + this.Mata.School.URL + "/api/leerlingen/" + this.Mata.UserID + "/opdrachten/" + this.Id + "/versie/" + compactAssignmentVersion.Id;
+                string URL = "https://" + mata.School.URL + "/api/leerlingen/" + mata.UserID + "/opdrachten/" + this.Id + "/versie/" + compactAssignmentVersion.Id;
 
-                string versionRaw = this.Mata.HttpClient.DownloadString(URL);
-                var versionClean = JsonConvert.DeserializeObject<MagisterStyleAssignmentVersion>(versionRaw); versionClean.Mata = this.Mata;
+                string versionRaw = mata.HttpClient.DownloadString(URL);
+                var versionClean = JsonConvert.DeserializeObject<MagisterStyleAssignmentVersion>(versionRaw);
 
-                tmpVersions.Add(versionClean.ToVersion());
+                tmpVersions.Add(versionClean.ToVersion(mata));
             }
 
             return new Assignment()
             {
                 Grade = this.Beoordeling,
-                Attachments = this.Bijlagen.ToList(AttachmentType.Assignment_teacher, this.Mata),
-                Teachers = this.Docenten.ToList(true, true, this.Mata),
+                Attachments = this.Bijlagen.ToList(AttachmentType.Assignment_teacher, mata),
+                Teachers = this.Docenten.ToList(true, true, mata),
                 ID = this.Id,
                 HandInTime = this.IngeleverdOp.ToDateTime(),
                 DeadLine = this.InleverenVoor.ToDateTime(),

bin/MataSharp.dll

@@ -5,7 +5,7 @@
 
 namespace MataSharp
 {
-    public partial class DigitalSchoolUtility : IComparable<DigitalSchoolUtility>
+    public class DigitalSchoolUtility : IComparable<DigitalSchoolUtility>
     {
         public long EAN { get; set; }
         public DateTime End { get; set; }
@@ -29,7 +29,7 @@ public int CompareTo(DigitalSchoolUtility other)
         }
     }
 
-    public partial class DigitalSchoolUtilityClass : IComparable<DigitalSchoolUtilityClass>
+    public class DigitalSchoolUtilityClass : IComparable<DigitalSchoolUtilityClass>
     {
         public string ClassAbbreviation { get; set; }
         public int ID { get; set; }
@@ -43,7 +43,7 @@ public int CompareTo(DigitalSchoolUtilityClass other)
         }
     }
 
-    internal partial struct DigitaalLesMatriaalLijstItem
+    internal struct DigitaalLesMatriaalLijstItem
     {
         public string Afkorting { get; set; }
         public int Id { get; set; }
@@ -52,7 +52,7 @@ internal partial struct DigitaalLesMatriaalLijstItem
         public object Ref { get; set; }
     }
 
-    internal partial struct DigitaalLesMatriaal
+    sealed internal class DigitaalLesMatriaal
     {
         public long EAN { get; set; }
         public string Eind { get; set; }
@@ -85,7 +85,7 @@ internal DigitalSchoolUtility ToDigitalSchoolUtility()
         }
     }
 
-    internal partial struct DigitaalLesMatriaalVakDetails
+    sealed internal class DigitaalLesMatriaalVakDetails
     {
         public string Afkorting { get; set; }
         public int Id { get; set; }

src/MataSharp/Assignment.cs

@@ -7,7 +7,7 @@
 
 namespace MataSharp
 {
-    internal class MataHTTPClient : IDisposable
+    sealed internal class MataHTTPClient : IDisposable
     {
         private WebClient Client = new WebClient();
 

src/MataSharp/DigitalSchoolUtilities.cs

@@ -111,7 +111,7 @@ internal partial struct HuiswerkItemLijstDagItem
         public string VakOmschrijvingen { get; set; }
     }
 
-    internal partial class Huiswerk
+    sealed internal class Huiswerk
     {
         public string AantekeningLeerling { get; set; }
         public bool Afgerond { get; set; }

src/MataSharp/HTTPClient.cs

@@ -345,7 +345,7 @@ object ICloneable.Clone()
         }
     }
 
-    internal partial class MagisterStyleMessage
+    sealed internal partial class MagisterStyleMessage
     {
         #region Content
         public int Id { get; set; }

src/MataSharp/Homework.cs

@@ -6,7 +6,7 @@
 
 namespace MataSharp
 {
-    public partial class MagisterPerson : IComparable<MagisterPerson>, ICloneable, IEqualityComparer<MagisterPerson>
+    sealed public partial class MagisterPerson : IComparable<MagisterPerson>, ICloneable, IEqualityComparer<MagisterPerson>
     {
         public uint ID { get; set; }
         public object Ref { get; set; } // Even Schoolmaster doesn't know what this is, it's mysterious. Just keep it in case.
@@ -100,7 +100,7 @@ public enum PersonType : int
         Project = 8
     }
 
-    internal partial struct MagisterStylePerson
+    sealed internal class MagisterStylePerson
     {
         public uint Id { get; set; }
         public object Ref { get; set; } // Even Schoolmaster doesn't know what this is, it's mysterious. Just keep it in case.

src/MataSharp/MagisterMessage.cs

@@ -20,10 +20,10 @@ public partial class Mata : IDisposable, ICloneable
         public string SessionID { get; private set; }
 
         public string UserName { get; private set; }
-        internal MagisterSchool School { get; private set; }
+        public MagisterSchool School { get; private set; }
         public MagisterPerson Person { get; private set; }
 
-        internal readonly MataHTTPClient HttpClient;
+        internal readonly MataHTTPClient HttpClient = new MataHTTPClient();
         internal readonly Dictionary<string, List<MagisterStylePerson>> checkedPersons = new Dictionary<string, List<MagisterStylePerson>>();
 
         /// <summary>
@@ -34,8 +34,6 @@ public partial class Mata : IDisposable, ICloneable
         /// <param name="UserPassword">Password to log in with.</param>
         public Mata(MagisterSchool School, string UserName, string UserPassword)
         {
-            this.HttpClient = new MataHTTPClient();
-
             this.School = School;
             this.UserName = UserName;
 
@@ -52,7 +50,7 @@ public Mata(MagisterSchool School, string UserName, string UserPassword)
 
             this.HttpClient.Cookie = "SESSION_ID=" + this.SessionID + "&fileDownload=true"; //yummy! cookies!
 
-            this.Person = this.GetPersons(this.Name)[0]; //Get itself as MagisterPerson from the servers.
+            this.Person = this.GetPersons(this.Name).Single(); //Get itself as MagisterPerson from the servers.
         }
 
         /// <summary>
@@ -108,7 +106,7 @@ public bool ComposeAndTrySendMessage(string Subject, string Body, IEnumerable<Ma
         /// </summary>
         /// <param name="Subject">Subject to use</param>
         /// <param name="Body">Body to use</param>
-        /// <param name="Recipients">MagisterPersons to send to</param>
+        /// <param name="Recipients">Name of the persons to send to</param>
         public bool ComposeAndTrySendMessage(string Subject, string Body, IEnumerable<string> Recipients)
         {
             return new MagisterMessage(this)
@@ -140,8 +138,7 @@ public List<MagisterMessageFolder> GetMessageFolders()
                     ParentID = messageFolder.ParentId,
                     Ref = messageFolder.Ref,
                     MessagesURI = messageFolder.BerichtenUri,
-                    Mata = this,
-                    FolderType = (MessageFolder)messageFolder.Id
+                    Mata = this
                 });
             }
             return tmplst;
@@ -253,9 +250,9 @@ public List<StudyGuide> GetStudyGuides()
                 URL = "https://" + School.URL + "/api/leerlingen/" + this.UserID + "/studiewijzers/" + compactStudyGuide.Id;
 
                 string studyGuideRaw = this.HttpClient.DownloadString(URL);
-                var studyGuideClean = JsonConvert.DeserializeObject<StudieWijzer>(studyGuideRaw); studyGuideClean.Mata = this;
+                var studyGuideClean = JsonConvert.DeserializeObject<StudieWijzer>(studyGuideRaw);
 
-                list.Add(studyGuideClean.ToStudyGuide());
+                list.Add(studyGuideClean.ToStudyGuide(this));
             }
             return list;
         }
@@ -272,8 +269,8 @@ public List<Assignment> GetAssignments()
             {
                 URL = "https://" + School.URL + "/api/leerlingen/" + this.UserID + "/opdrachten/" + CompactAssignment.Id;
                 string AssignmentRaw = this.HttpClient.DownloadString(URL);
-                var AssignmentClean = JsonConvert.DeserializeObject<AssignmentFolderItem>(AssignmentRaw); AssignmentClean.Mata = this;
-                list.Add(AssignmentClean.toAssignment());
+                var AssignmentClean = JsonConvert.DeserializeObject<AssignmentFolderItem>(AssignmentRaw);
+                list.Add(AssignmentClean.toAssignment(this));
             }
             return list;
         }
@@ -359,7 +356,7 @@ object ICloneable.Clone()
         }
     }
 
-    internal partial struct MagisterStyleMata
+    internal struct MagisterStyleMata
     {
         public string Naam { get; set; }
         public string GebruikersId { get; set; }

src/MataSharp/MagisterPerson.cs

@@ -13,7 +13,7 @@ public partial class MagisterMessageFolder : IEnumerable<MagisterMessage>
         public string Name { get; set; }
         public uint UnreadMessagesCount { get; set; }
         public int ID { get; set; }
-        public MessageFolder FolderType { get; set; }
+        public MessageFolder FolderType { get { return (MessageFolder)this.ID; } }
         public int ParentID { get; set; }
         public string MessagesURI { get; set; }
         public object Ref { get; set; } // Even Schoolmaster doesn't know what this is, it's mysterious. Just keep it in case.
@@ -22,7 +22,7 @@ public partial class MagisterMessageFolder : IEnumerable<MagisterMessage>
     }
 
     public enum MessageFolder : int
-    { //Defines the folders where messages can be in, server handles it as ID's. We? We handle it as an enum :D
+    { //Defines the folders where messages possibly are in, server handles it as ID's. We? We handle it as an enum :D
         Inbox = -101,
         SentMessages = -103,
         Bin = -102
@@ -40,12 +40,12 @@ internal partial struct MagisterStyleMessageFolderListItem
 
     internal partial struct MagisterStyleMessageFolder
     {
-        public MessageFolderItem[] Items { get; set; }
+        public CompactMagisterMessage[] Items { get; set; }
         public int TotalCount { get; set; }
         public object Paging { get; set; }
     }
 
-    internal partial struct MessageFolderItem
+    internal partial struct CompactMagisterMessage
     {
         public int Id { get; set; }
         public object Ref {get; set; }