Combine MagisterMessageFolder and MessageList.

Author: lieuwex

bin/MataSharp.XML

@@ -7,17 +7,17 @@ namespace MataSharp
     public partial class Attachment : IComparable<Attachment>
     {
         [JsonProperty("Id")]
-        public int ID { get; internal set; }
+        public int ID { get; private set; }
         [JsonProperty("Ref")]
-        public object Ref { get; internal set; } // Even Schoolmaster doesn't know what this is, it's mysterious. Just keep it in case.
+        public object Ref { get; private set; } // Even Schoolmaster doesn't know what this is, it's mysterious. Just keep it in case.
         [JsonProperty("Naam")]
-        public string Name { get; internal set; }
+        public string Name { get; private set; }
         [JsonProperty("Datum")]
         internal DateTime _Date { get; set; }
         [JsonIgnore]
         public DateTime Date { get { return this._Date.Date; } }
         [JsonProperty("Grootte")]
-        public int Size { get; internal set; }
+        public int Size { get; private set; }
 
         [JsonIgnore]
         internal AttachmentType Type { get; set; }

bin/MataSharp.dll

@@ -30,7 +30,7 @@ public bool IsRead
 
                 this._IsRead = value;
 
-                _Session.HttpClient.Put(this.URL(), JsonConvert.SerializeObject(this.ToMagisterStyle()));
+                _Session.HttpClient.Put(this.URL, JsonConvert.SerializeObject(this.ToMagisterStyle()));
             }
         }
 
@@ -62,7 +62,7 @@ public bool CanSend
         private Mata Mata { get; set; }
         #endregion
 
-        private string URL() { return "https://" + this.Mata.School.URL + "/api/personen/" + this.Mata.UserID + "/communicatie/berichten/mappen/" + this._Folder + "/berichten/" + this.ID; }
+        private string URL { get { return "https://" + this.Mata.School.URL + "/api/personen/" + this.Mata.UserID + "/communicatie/berichten/mappen/" + this._Folder + "/berichten/" + this.ID; } }
 
         /// <summary>
         /// Returns new MagisterMessage.
@@ -274,7 +274,7 @@ public void Move(int FolderID)
 
             this._Folder = FolderID;
 
-            _Session.HttpClient.Put(this.URL(), JsonConvert.SerializeObject(this.ToMagisterStyle()));
+            _Session.HttpClient.Put(this.URL, JsonConvert.SerializeObject(this.ToMagisterStyle()));
             thisCopied.Delete();
         }
 
@@ -286,7 +286,7 @@ public void Delete()
             if (this.Deleted) return;
 
             this.Deleted = true;
-            _Session.HttpClient.Delete(this.URL(), "SESSION_ID=" + this.Mata.SessionID + "&fileDownload=true");
+            _Session.HttpClient.Delete(this.URL, "SESSION_ID=" + this.Mata.SessionID + "&fileDownload=true");
         }
 
         /// <summary>

src/MataSharp/Attachment.cs

@@ -79,7 +79,7 @@ public void ComposeAndSendMessage(string Subject, string Body, IEnumerable<Magis
             {
                 Subject = Subject,
                 Body = Body,
-                Recipients = Recipients.ToList()
+                Recipients = Recipients.ToList(this)
             }.Send();
         }
 
@@ -111,7 +111,7 @@ public bool ComposeAndTrySendMessage(string Subject, string Body, IEnumerable<Ma
             {
                 Subject = Subject,
                 Body = Body,
-                Recipients = Recipients.ToList()
+                Recipients = Recipients.ToList(this)
             }.TrySend();
         }
 
@@ -141,7 +141,7 @@ public List<MagisterMessageFolder> GetMessageFolders()
             string MessageFoldersRAW = _Session.HttpClient.DownloadString(url);
             var MessageFolders = JsonConvert.DeserializeObject<MagisterStyleMessageFolderListItem[]>(MessageFoldersRAW);
 
-            List<MagisterMessageFolder> tmplst = new List<MagisterMessageFolder>();
+            var tmplst = new List<MagisterMessageFolder>();
             foreach (var messageFolder in MessageFolders)
             {
                 tmplst.Add(new MagisterMessageFolder()

src/MataSharp/MagisterMessage.cs

@@ -5,7 +5,7 @@
 
 namespace MataSharp
 {
-    public partial class MagisterMessageFolder
+    public partial class MagisterMessageFolder : IEnumerable<MagisterMessage>
     {
         public string Name { get; set; }
         public uint UnreadMessagesCount { get; set; }
@@ -17,17 +17,6 @@ public partial class MagisterMessageFolder
 
         internal Mata Mata { get; set; }
         internal MagisterSchool School { get { return this.Mata.School; } }
-
-        public MessageList<MagisterMessage> Messages { get { return new MessageList<MagisterMessage>(this); } }
-        /// <summary>
-        /// Gets the MagisterMessage on the given index.
-        /// </summary>
-        /// <param name="index">The zero-based index of the MagisterMessage to get.</param>
-        /// <returns>The MagisterMessage on the given index.</returns>
-        public MagisterMessage this[int index]
-        {
-            get { return this.Messages[index]; }
-        }
     }
 
     public enum MessageFolder : int

src/MataSharp/Mata.cs

@@ -5,45 +5,36 @@
 
 namespace MataSharp
 {
-    public class MessageList<Message> : IEnumerable<Message> where Message : MagisterMessage
+    public partial class MagisterMessageFolder : IEnumerable<MagisterMessage>
     {
-        private MagisterMessageFolder Sender { get; set; }
-
-        public MessageList() { throw new Exception("MessageLists are only able to be internally created."); }
-
-        internal MessageList(MagisterMessageFolder Sender)
-        {
-            this.Sender = Sender;
-        }
-
         /// <summary>
         /// Gets the item on the given index.
         /// </summary>
         /// <param name="index">The zero-based index of the item to get.</param>
         /// <returns>The item on the given index.</returns>
-        public Message this[int index] { get { return this.GetSpecificEnumerator().GetAt(index); } }
+        public MagisterMessage this[int index] { get { return this.GetSpecificEnumerator().GetAt(index); } }
 
-        public IEnumerator<Message> GetEnumerator()
+        public IEnumerator<MagisterMessage> GetEnumerator()
         {
-            return new Enumerator<Message>(this.Sender.Mata, this.Sender);
+            return new Enumerator<MagisterMessage>(this);
         }
 
         System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
         {
             return GetEnumerator();
         }
 
-        private Enumerator<Message> GetSpecificEnumerator()
+        private Enumerator<MagisterMessage> GetSpecificEnumerator()
         {
-            return new Enumerator<Message>(this.Sender.Mata, this.Sender);
+            return new Enumerator<MagisterMessage>(this);
         }
 
-        public Message ElementAt(int index)
+        public MagisterMessage ElementAt(int index)
         {
             return this[index];
         }
 
-        public List<Message> Take(int count)
+        public List<MagisterMessage> Take(int count)
         {
             return this.GetRange(0, count);
         }
@@ -54,7 +45,7 @@ public List<Message> Take(int count)
         /// <param name="Ammount">Ammount to ask for on the server.</param>
         /// <param name="Skip">Ammount of messages to skip | Default = 0</param>
         /// <returns>List of unread MagisterMessages.</returns>
-        public List<Message> WhereUnread(uint Ammount, uint Skip = 0)
+        public List<MagisterMessage> WhereUnread(uint Ammount, uint Skip = 0)
         {
             return this.GetSpecificEnumerator().GetUnread(Ammount, Skip);
         }
@@ -63,7 +54,7 @@ public List<Message> WhereUnread(uint Ammount, uint Skip = 0)
         /// Gets ALL the new messages on the parent's mata server.
         /// </summary>
         /// <returns>List of unread MagisterMessages.</returns>
-        public List<Message> WhereUnread()
+        public List<MagisterMessage> WhereUnread()
         {
             return this.GetSpecificEnumerator().GetUnread();
         }
@@ -93,7 +84,7 @@ public void RemoveRange(int index, int count)
         /// <param name="index">The zero-based index at which the range starts.</param>
         /// <param name="count">The number of elements in the range.</param>
         /// <returns>The given range of MagisterMessages as a List</returns>
-        public List<Message> GetRange(int index, int count)
+        public List<MagisterMessage> GetRange(int index, int count)
         {
             return this.GetSpecificEnumerator().GetRange(count, index);
         }
@@ -103,10 +94,10 @@ public List<Message> GetRange(int index, int count)
         /// </summary>
         /// <param name="item">The item to get its position from.</param>
         /// <returns>A zero-based index of the position of the given item.</returns>
-        public int IndexOf(Message item)
+        public int IndexOf(MagisterMessage item)
         {
             var enumerator = this.GetSpecificEnumerator();
-            Message currentItem = null;
+            MagisterMessage currentItem = null;
             int pos = -1;
             do
             {
@@ -122,7 +113,7 @@ public int IndexOf(Message item)
         /// </summary>
         /// <param name="max">The ammount of messages to check for on the server.</param>
         /// <param name="predicate">The predicate the messages must match to.</param>
-        public void RemoveAll(int max, Predicate<Message> predicate)
+        public void RemoveAll(int max, Predicate<MagisterMessage> predicate)
         {
             this.GetSpecificEnumerator().GetRange(max, 0).Where(m => predicate(m)).ToList().ForEach(m => m.Delete());
         }
@@ -133,7 +124,7 @@ public void RemoveAll(int max, Predicate<Message> predicate)
         /// <param name="max">The max value to check for on the server.</param>
         /// <param name="predicate">The predicate the messages must match</param>
         /// <returns>A List containing the messages that matched the predicate.</returns>
-        public List<Message> Where(int max, Func<Message,bool> predicate)
+        public List<MagisterMessage> Where(int max, Func<MagisterMessage, bool> predicate)
         {
             return this.GetSpecificEnumerator().GetRange(max, 0).Where(m => predicate(m)).ToList();
         }
@@ -144,7 +135,7 @@ public List<Message> Where(int max, Func<Message,bool> predicate)
         /// <param name="max">The max value to check for on the server.</param>
         /// <param name="predicate">The predicate the message must match.</param>
         /// <returns>The first message on the server that matches the predicate.</returns>
-        public Message First(int max, Func<Message,bool> predicate)
+        public MagisterMessage First(int max, Func<MagisterMessage, bool> predicate)
         {
             var enumerator = this.GetSpecificEnumerator();
             for (int i = 0; i < max; i++)
@@ -161,7 +152,7 @@ public Message First(int max, Func<Message,bool> predicate)
         /// <param name="max">The max value to check for on the server.</param>
         /// <param name="predicate">The predicate the message must match.</param>
         /// <returns>The last message on the server that matches the predicate.</returns>
-        public Message Last(int max, Func<Message,bool> predicate)
+        public MagisterMessage Last(int max, Func<MagisterMessage, bool> predicate)
         {
             return this.GetSpecificEnumerator().GetRange(max, 0).Last(m => predicate(m));
         }
@@ -172,15 +163,15 @@ public Message Last(int max, Func<Message,bool> predicate)
         /// <param name="max">The max value to check for on the server.</param>
         /// <param name="predicate">The predicate the message must match.</param>
         /// <returns>The first message on the server that matches the predicate.</returns>
-        public Message FirstOrDefault(int max, Func<Message, bool> predicate)
+        public MagisterMessage FirstOrDefault(int max, Func<MagisterMessage, bool> predicate)
         {
             var enumerator = this.GetSpecificEnumerator();
             for (int i = 0; i < max; i++)
             {
                 var msg = enumerator.GetAt(i);
                 if (predicate(msg)) return msg;
-            } 
-            return default(Message);
+            }
+            return default(MagisterMessage);
         }
 
         /// <summary>
@@ -189,17 +180,17 @@ public Message FirstOrDefault(int max, Func<Message, bool> predicate)
         /// <param name="max">The max value to check for on the server.</param>
         /// <param name="predicate">The predicate the message must match.</param>
         /// <returns>The last message on the server that matches the predicate.</returns>
-        public Message LastOrDefault(int max, Func<Message, bool> predicate)
+        public MagisterMessage LastOrDefault(int max, Func<MagisterMessage, bool> predicate)
         {
             var enumerator = this.GetSpecificEnumerator();
-            Message msg = null;
+            MagisterMessage msg = null;
             for(int i = 0; i < max; i++)
             {
                 var tmpMsg = enumerator.GetAt(i);
                 if (predicate(tmpMsg)) msg = tmpMsg;
             }
             if (msg != null) return msg;
-            else return default(Message);
+            else return default(MagisterMessage);
         }
 
         /// <summary>
@@ -208,7 +199,7 @@ public Message LastOrDefault(int max, Func<Message, bool> predicate)
         /// <param name="max">The max value to check for on the server.</param>
         /// <param name="predicate">The predicate the message must match.</param>
         /// <returns>A boolean value that tells if there is a message matching the given predicate.</returns>
-        public bool Any(int max, Func<Message, bool> predicate)
+        public bool Any(int max, Func<MagisterMessage, bool> predicate)
         {
             var enumerator = this.GetSpecificEnumerator();
             for(int i = 0; i < max; i++)
@@ -225,10 +216,10 @@ public bool Any(int max, Func<Message, bool> predicate)
         /// <param name="predicate">The predicate that the message must match to.</param>
         /// <param name="max">The max ammount of messages to get from the server.</param>
         /// <returns>A single MagisterMessage matching the given predicate.</returns>
-        public Message Single(int max, Func<Message, bool> predicate)
+        public MagisterMessage Single(int max, Func<MagisterMessage, bool> predicate)
         {
             var enumerator = this.GetSpecificEnumerator();
-            Message msg = null;
+            MagisterMessage msg = null;
             for(int i = 0; i <= max; i++)
             {
                 var tmpMsg = enumerator.GetAt(i);
@@ -249,10 +240,10 @@ public Message Single(int max, Func<Message, bool> predicate)
         /// <param name="max">The max ammount of messages to get from the server.</param>
         /// <param name="predicate">The predicate that the message must match to.</param>
         /// <returns>A single MagisterMessage matching the given predicate.</returns>
-        public Message SingleOrDefault(int max, Func<Message, bool> predicate)
+        public MagisterMessage SingleOrDefault(int max, Func<MagisterMessage, bool> predicate)
         {
             var enumerator = this.GetSpecificEnumerator();
-            Message msg = null;
+            MagisterMessage msg = null;
             for (int i = 0; i <= max; i++)
             {
                 var tmpMsg = enumerator.GetAt(i);
@@ -263,30 +254,29 @@ public Message SingleOrDefault(int max, Func<Message, bool> predicate)
                 }
             }
             if (msg != null) return msg;
-            else return default(Message);
+            else return default(MagisterMessage);
         }
 
         /// <summary>
         /// Checks if the given messages exist on the servers.
         /// </summary>
         /// <param name="item">The item to check if it exists.</param>
         /// <returns>A boolean value telling if the given message exists.</returns>
-        public bool Contains(Message item)
+        public bool Contains(MagisterMessage item)
         {
-            return (!item.Deleted && this.Sender.FolderType == item.Folder);
+            return (!item.Deleted && this.FolderType == item.Folder);
         }
 
-        private class Enumerator<T> : IEnumerator<T>, IDisposable where T : Message
+        private class Enumerator<T> : IEnumerator<T>, IDisposable where T : MagisterMessage
         {
             private int Next = 0;
             private int Skip = -1;
-            private Mata Mata { get; set; }
+            private Mata Mata { get { return this.Sender.Mata; } }
             private MagisterMessageFolder Sender { get; set; }
             private const int MaxMessages = 750;
 
-            public Enumerator(Mata Mata, MagisterMessageFolder Sender)
+            public Enumerator(MagisterMessageFolder Sender)
             {
-                this.Mata = Mata;
                 this.Sender = Sender;
             }
 
@@ -401,7 +391,6 @@ public void Reset()
             public void Dispose()
             {
                 this.Reset();
-                this.Mata = null;
                 this.Sender = null;
                 GC.Collect();
             }