Keep working

Eldinnie · Eldinnie · commit 03056e13a3d5 · 2018-02-20T11:36:41.000+01:00
diff --git a/telegram/ext/basepersistence.py b/telegram/ext/basepersistence.py
@@ -18,35 +18,36 @@
 # along with this program.  If not, see [http://www.gnu.org/licenses/].
 """This module contains the BasePersistence class."""
 
+
 class BasePersistence(object):
     def __init__(self, store_job_queue=False, store_user_data=False, store_chat_data=False):
         self.store_job_queue = store_job_queue
         self.store_user_data = store_user_data
         self.store_chat_data = store_chat_data
 
     def get_job_queue(self):
-        raise NotImplemented
+        raise NotImplementedError
 
     def get_user_data(self):
-        raise NotImplemented
+        raise NotImplementedError
 
     def get_chat_data(self):
-        raise NotImplemented
+        raise NotImplementedError
 
     def get_conversations(self):
-        raise NotImplemented
+        raise NotImplementedError
 
-    def change_conversation(self):
-        raise NotImplemented
+    def update_conversation(self, conversations):
+        raise NotImplementedError
 
     def update_job_queue(self):
-        raise NotImplemented
+        raise NotImplementedError
 
-    def set_user_data(self):
-        raise NotImplemented
+    def update_user_data(self, user_data):
+        raise NotImplementedError
 
-    def set_chat_data(self):
-        raise NotImplemented
+    def update_chat_data(self, chat_data):
+        raise NotImplementedError
 
     def flush(self):
-        raise NotImplemented
+        raise NotImplementedError
diff --git a/telegram/ext/conversationhandler.py b/telegram/ext/conversationhandler.py
@@ -142,6 +142,9 @@ def __init__(self,
         if persistent and not self.name:
             raise ValueError("Conversations can't be persistent when handler is unnamed.")
         self.persistent = persistent
+        self.persistence = None
+        """:obj:`telegram.ext.BasePersistance`: The persistence used to store conversations.
+        Set by dispatcher"""
 
         self.conversations = dict()
         self.current_conversation = None
@@ -315,3 +318,6 @@ def update_state(self, new_state, key):
 
         elif new_state is not None:
             self.conversations[key] = new_state
+
+        if self.persistent:
+            self.persistence.update_conversation(self.conversations)
diff --git a/telegram/ext/dispatcher.py b/telegram/ext/dispatcher.py
@@ -35,7 +35,6 @@
 from telegram.utils.promise import Promise
 from telegram.ext import BasePersistence
 
-
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 DEFAULT_GROUP = 0
 
@@ -50,6 +49,7 @@ def run_async(func):
     Note: Use this decorator to run handlers asynchronously.
 
     """
+
     @wraps(func)
     def async_func(*args, **kwargs):
         return Dispatcher.get_instance().run_async(func, *args, **kwargs)
@@ -90,7 +90,8 @@ class Dispatcher(object):
     __singleton = None
     logger = logging.getLogger(__name__)
 
-    def __init__(self, bot, update_queue, workers=4, exception_event=None, job_queue=None, persistence=None):
+    def __init__(self, bot, update_queue, workers=4, exception_event=None, job_queue=None,
+                 persistence=None):
         self.bot = bot
         self.update_queue = update_queue
         self.workers = workers
@@ -298,6 +299,11 @@ def process_update(self, update):
             try:
                 for handler in (x for x in self.handlers[group] if x.check_update(update)):
                     handler.handle_update(update, self)
+                    if self.persistence:
+                        if self.persistence.store_chat_data:
+                            self.persistence.update_chat_data(self.chat_data)
+                        if self.persistence.store_user_data:
+                            self.persistence.update_user_data(self.user_data)
                     break
 
             # Stop processing with any other handler.
@@ -354,8 +360,11 @@ def add_handler(self, handler, group=DEFAULT_GROUP):
             raise TypeError('group is not int')
         if isinstance(handler, ConversationHandler) and handler.persistent:
             if not self.persistence:
-                raise ValueError("Conversationhandler {} can not be persistent if logger has no persistence", handler.name)
+                raise ValueError(
+                    "Conversationhandler {} can not be persistent if logger has no persistence",
+                    handler.name)
             handler.conversations = self.persistence.get_conversations(handler.name)
+            handler.persistence = self.persistence
 
         if group not in self.handlers:
             self.handlers[group] = list()
