Merge pull request #42 from d-Rickyy-b/State_Handling

State handling

Author: devcarron

database/statistics.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-from time import time
+import logging
 from datetime import datetime
+from time import time
+
 from database.db_wrapper import DBwrapper
-import logging
 
 __author__ = 'Rico'
 logger = logging.getLogger(__name__)
@@ -27,10 +28,10 @@ def add_game_played(user_id):
 
 def get_stats(percentage):
     text = ""
-    perc = int(percentage//10+1)
+    perc = int(percentage // 10 + 1)
     for _ in range(perc):
         text += "🏆"
-    for _ in range(10-perc):
+    for _ in range(10 - perc):
         text += "🔴"
     return text
 

game/blackJack.py

@@ -6,13 +6,13 @@
 from telegram.replykeyboardmarkup import ReplyKeyboardMarkup
 
 from database.statistics import add_game_played, set_game_won
-from game.deck import CardDeck
 from game.dealer import Dealer
+from game.deck import CardDeck
 from game.message import Message
 from game.player import Player
 from lang.language import translate
 
-__author__ = 'Rico & Julian'
+__author__ = 'Rico'
 
 
 class BlackJack(object):

game/dealer.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 from game.player import Player
 
 

game/deck.py

@@ -6,31 +6,31 @@
 
 
 class CardDeck(object):
-	symbols = ["♥", "♦", "♣", "♠"]
-	valueInt = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 10, 10]
-
-	@staticmethod
-	def create_deck():
-		from random import shuffle
-		deck = list(range(1, 52))
-		shuffle(deck)
-		return deck[:]
-
-	def pick_one_card(self):
-		card = self.deck[0]
-		self.deck.pop(0)
-		return card
-
-	def get_card_name(self, card):
-		symbol = self.symbols[card // 13]
-		value = self.value_str[card % 13]
-		card_name = "|" + symbol + " " + value + "|"
-		return card_name
-
-	def get_card_value(self, card):
-		return self.valueInt[card % 13]
-
-	def __init__(self, lang_id):
-		self.deck = self.create_deck()
-		self.value_str = [translate("ace", lang_id), "2", "3", "4", "5", "6", "7", "8", "9", "10",
-						  translate("jack", lang_id), translate("queen", lang_id), translate("king", lang_id)]
+    symbols = ["♥", "♦", "♣", "♠"]
+    valueInt = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 10, 10]
+
+    @staticmethod
+    def create_deck():
+        from random import shuffle
+        deck = list(range(1, 52))
+        shuffle(deck)
+        return deck[:]
+
+    def pick_one_card(self):
+        card = self.deck[0]
+        self.deck.pop(0)
+        return card
+
+    def get_card_name(self, card):
+        symbol = self.symbols[card // 13]
+        value = self.value_str[card % 13]
+        card_name = "|" + symbol + " " + value + "|"
+        return card_name
+
+    def get_card_value(self, card):
+        return self.valueInt[card % 13]
+
+    def __init__(self, lang_id):
+        self.deck = self.create_deck()
+        self.value_str = [translate("ace", lang_id), "2", "3", "4", "5", "6", "7", "8", "9", "10",
+                          translate("jack", lang_id), translate("queen", lang_id), translate("king", lang_id)]

game/player.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 __author__ = 'Rico'
 
 
@@ -32,7 +34,7 @@ def get_cards_string(self):
         cards_string = ""
         for i, card in enumerate(self.cards):
             cards_string += self.deck.get_card_name(card)
-            if i+1 < len(self.cards):
+            if i + 1 < len(self.cards):
                 cards_string += ", "
         return cards_string
 

gamehandler.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import random
 import string
 

main.py

@@ -14,6 +14,8 @@
 from game.blackJack import BlackJack
 from gamehandler import GameHandler
 from lang.language import translate
+from statehandler import StateHandler
+from userstate import UserState
 
 __author__ = 'Rico'
 
@@ -31,7 +33,6 @@
 
 game_handler = GameHandler()
 tg_bot = updater.bot
-comment_list = []
 lang_list = ["de", "en", "nl", "eo", "br", "es", "ru", "fa"]
 
 
@@ -44,6 +45,9 @@ def start(bot, update):
     username = update.message.from_user.username
     db = DBwrapper.get_instance()
 
+    state_handler = StateHandler.get_instance()
+    user = state_handler.get_user(user_id)
+
     if not db.is_user_saved(user_id):
         logger.info("New user")
         db.add_user(user_id, "en", first_name, last_name, username)
@@ -52,12 +56,10 @@ def start(bot, update):
             language(bot, update)
             return
 
-    if user_id in comment_list:
-        comment_list.remove(user_id)
-
     # check if user already has got a game (in the same chat):
     game_index = game_handler.get_index_by_chatid(chat_id)
     if game_index is None:
+        user.set_state(UserState.PLAYING)
         logger.debug("Creating a game")
         lang_id = db.get_lang_id(user_id)
         bj = BlackJack(chat_id, user_id, lang_id, first_name, game_handler, message_id, send_message)
@@ -105,8 +107,10 @@ def join_secret(bot, update):
 
 def stop(bot, update):
     user_id = update.message.from_user.id
-    if user_id in comment_list:
-        comment_list.remove(user_id)
+    state_handler = StateHandler.get_instance()
+    user = state_handler.get_user(user_id)
+
+    user.set_state(UserState.IDLE)
 
     chat_id = update.message.chat_id
     game_handler.gl_remove(chat_id)
@@ -156,38 +160,49 @@ def comment(bot, update):
     lang_id = db.get_lang_id(user_id)
     text = update.message.text
     params = text.split()
-    if game_handler.get_game_by_chatid(chat_id) is None:
+
+    state_handler = StateHandler.get_instance()
+    user = state_handler.get_user(user_id)
+
+    if user.get_state() == UserState.IDLE:
         if len(params) > 1:
             text = " ".join(params[1:])
             logger.debug("New comment! {}!".format(user_id))
-            send_message(chat_id, translate("userComment", lang_id))
-            for admin_id in db.get_admins():
-                send_message(admin_id, "New comment:\n\n{}\n\n{} | {} | {} | @{} | {}".format(text, user_id, first_name,
-                                                                                              last_name, username,
-                                                                                              lang_id))
 
-            if user_id in comment_list:
-                logger.debug("Remove {} from comment_list!".format(user_id))
-                comment_list.remove(user_id)
+            bot.sendMessage(chat_id=chat_id, text=translate("userComment", lang_id))
+            for admin_id in db.get_admins():
+                bot.sendMessage(admin_id, "New comment:\n\n{}\n\n{} | {} | {} | @{} | {}".format(text, user_id, first_name,
+                                                                                                 last_name, username,
+                                                                                                 lang_id))
+            logger.debug("Set {}'s state to IDLE!".format(user_id))
+            user.set_state(UserState.IDLE)
         else:
             # The user just wrote "/comment" -> Ask him to send a message
             logger.debug("Add {} to comment_list!".format(user_id))
-            comment_keyboard = ReplyKeyboardMarkup([[KeyboardButton(translate("cancel", lang_id))]])
-            send_message(chat_id, translate("sendCommentNow", lang_id), reply_markup=comment_keyboard)
-            if user_id not in comment_list:
-                comment_list.append(user_id)
+
+            keyboard = [[InlineKeyboardButton(text=translate("cancel", lang_id), callback_data="cancel_comment")]]
+            reply_markup = InlineKeyboardMarkup(keyboard)
+
+            bot.sendMessage(chat_id=chat_id, text=translate("sendCommentNow", lang_id), reply_markup=reply_markup)
+            user.set_state(UserState.COMMENTING)
 
 
 def cancel(bot, update):
-    user_id = update.message.from_user.id
+    user_id = update.callback_query.from_user.id
+    message_id = update.callback_query.message.message_id
+    callback_query_id = update.callback_query.id
     chat_id = update.message.chat_id
-    db = DBwrapper.get_instance()
-    lang_id = db.get_lang_id(user_id)
 
-    if user_id in comment_list:
-        comment_list.remove(user_id)
-        # send message - cancelledMessage
-        send_message(chat_id, translate("cancelledMessage", lang_id))
+    state_handler = StateHandler.get_instance()
+    user = state_handler.get_user(user_id)
+
+    if user.get_state() == UserState.COMMENTING:
+        db = DBwrapper.get_instance()
+        lang_id = db.get_lang_id(user_id)
+
+        user.set_state(UserState.IDLE)
+        bot.editMessageText(chat_id=chat_id, message_id=message_id, text=translate("cancelledMessage", lang_id))
+        bot.answerCallbackQuery(callback_query_id=callback_query_id, text=translate("cancelledMessage", lang_id))
 
 
 def answer(bot, update):
@@ -237,6 +252,8 @@ def callback_eval(bot, update):
     elif query_data == "com_ch_lang":
         language(bot, update)
 
+    elif query_data == "cancel_comment":
+        cancel(bot, update)
 
 def send_message(chat_id, text, message_id=None, parse_mode=None, reply_markup=None, game_id=None):
     tg_bot.sendMessage(chat_id=chat_id, text=text, reply_to_message_id=message_id, parse_mode=parse_mode,
@@ -264,15 +281,18 @@ def game_commands(bot, update):
     db = DBwrapper.get_instance()
     lang_id = db.get_lang_id(user_id)
 
-    if user_id in comment_list:
+    state_handler = StateHandler.get_instance()
+    user = state_handler.get_user(user_id)
+
+    if user.get_state() == UserState.COMMENTING:
         # User wants to comment!
         send_message(chat_id, translate("userComment", lang_id))
         for admin_id in db.get_admins():
             send_message(admin_id,
                          "New comment:\n\n{}\n\n{} | {} | {} | @{} | {}".format(text, user_id, first_name, last_name,
                                                                                 username, lang_id))
 
-        comment_list.remove(user_id)
+        user.set_state(UserState.IDLE)
         return
 
     if not db.is_user_saved(user_id):

statehandler.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+from userstate import UserState
+
+
+class StateHandler(object):
+    class __StateHandler(object):
+        def __init__(self):
+            self.user_list = []
+
+        def add_user(self, user_id: int) -> None:
+            self.user_list.append(UserState(user_id))
+
+        def get_user(self, user_id: int) -> UserState:
+            for userState in self.user_list:
+                if userState.get_userid() == user_id:
+                    return userState
+
+            self.add_user(user_id)
+            return self.get_user(user_id)
+
+    instance = None
+
+    def __init__(self):
+        if not StateHandler.instance:
+            StateHandler.instance = StateHandler.__StateHandler()
+
+    @staticmethod
+    def get_instance():
+        if not StateHandler.instance:
+            StateHandler.instance = StateHandler.__StateHandler()
+
+        return StateHandler.instance

tests/test_blackJack.py

@@ -1,5 +1,7 @@
+# -*- coding: utf-8 -*-
+
 from unittest import TestCase
-from game.blackJack import BlackJack
+
 from database.db_wrapper import DBwrapper
 
 
@@ -179,7 +181,7 @@ def pick_one_card(self):
         def get_card_name(self, card):
             symbol = self.symbols[card//13]
             value = self.value_str[card % 13]
-            card_name = "|"+symbol+" "+value+"|"
+            card_name = "|" + symbol + " " + value + "|"
             return card_name
 
         def get_card_value(self, card):

userstate.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+class UserState(object):
+    IDLE = 0
+    COMMENTING = 1
+    PLAYING = 2
+
+    def __init__(self, user_id: int):
+        self._user_id = user_id
+        self._state = UserState.IDLE
+
+    def get_state(self) -> int:
+        return self._state
+
+    def set_state(self, state: int) -> None:
+        self._state = state
+
+    def get_userid(self) -> int:
+        return self._user_id