db: drop useless getters

1 files changed, 17 insertions, 26 deletions

diff --git a/alot/db/message.py b/alot/db/message.py
index ad9de9f4..0b59090d 100644
--- a/alot/db/message.py
+++ b/alot/db/message.py
@@ -29,6 +29,12 @@ class Message:
     """the :class:`~alot.db.Thread` this Message belongs to"""
     thread = None
 
+    """value of the Date header value as :class:`~datetime.datetime`"""
+    date = None
+
+    """value of the Message-Id header (str)"""
+    id = None
+
     def __init__(self, dbman, msg, thread):
         """
         :param dbman: db manager that is used for further lookups
@@ -39,13 +45,12 @@ class Message:
         :type thread: :class:`~alot.db.Thread`
         """
         self._dbman = dbman
-        self._id = msg.get_message_id()
-        self._thread_id = msg.get_thread_id()
+        self.id = msg.get_message_id()
         self.thread = thread
         try:
-            self._datetime = datetime.fromtimestamp(msg.get_date())
+            self.date = datetime.fromtimestamp(msg.get_date())
         except ValueError:
-            self._datetime = None
+            self.date = None
         self._filename = msg.get_filename()
         self._email = None  # will be read upon first use
         self._attachments = None  # will be read upon first use
@@ -79,11 +84,11 @@ class Message:
 
     def __hash__(self):
         """needed for sets of Messages"""
-        return hash(self._id)
+        return hash(self.id)
 
     def __eq__(self, other):
         if isinstance(other, type(self)):
-            return self._id == other.get_message_id()
+            return self.id == other.id
         return NotImplemented
 
     def get_email(self):
@@ -101,22 +106,10 @@ class Message:
                     warning, policy=email.policy.SMTP)
         return self._email
 
-    def get_date(self):
-        """returns Date header value as :class:`~datetime.datetime`"""
-        return self._datetime
-
     def get_filename(self):
         """returns absolute path of message files location"""
         return self._filename
 
-    def get_message_id(self):
-        """returns messages id (str)"""
-        return self._id
-
-    def get_thread_id(self):
-        """returns id (str) of the thread this message belongs to"""
-        return self._thread_id
-
     def get_message_parts(self):
         """yield all body parts of this message"""
         for msg in self.get_email().walk():
@@ -136,11 +129,9 @@ class Message:
 
         :rtype: str
         """
-        if self._datetime is None:
-            res = None
-        else:
-            res = settings.represent_datetime(self._datetime)
-        return res
+        if self.date is None:
+            return None
+        return settings.represent_datetime(self.date)
 
     def get_author(self):
         """
@@ -176,7 +167,7 @@ class Message:
             if callable(afterwards):
                 afterwards()
 
-        self._dbman.tag('id:' + self._id, tags, afterwards=myafterwards,
+        self._dbman.tag('id:' + self.id, tags, afterwards=myafterwards,
                         remove_rest=remove_rest)
         self._tags = self._tags.union(tags)
 
@@ -200,7 +191,7 @@ class Message:
             if callable(afterwards):
                 afterwards()
 
-        self._dbman.untag('id:' + self._id, tags, myafterwards)
+        self._dbman.untag('id:' + self.id, tags, myafterwards)
 
     def get_attachments(self):
         """
@@ -245,5 +236,5 @@ class Message:
 
     def matches(self, querystring):
         """tests if this messages is in the resultset for `querystring`"""
-        searchfor = '( {} ) AND id:{}'.format(querystring, self._id)
+        searchfor = '( {} ) AND id:{}'.format(querystring, self.id)
         return self._dbman.count_messages(searchfor) > 0