From 5624885bd014386eadfcbe62cea2ee11a60f850a Mon Sep 17 00:00:00 2001
From: Javinator9889 <javialonso007@hotmail.es>
Date: Wed, 27 Jun 2018 10:51:45 +0200
Subject: [PATCH] Created files for handlers | defined method for instantiating
 handlers

---
 App/.idea/workspace.xml                       | 210 +++++++++++++++---
 App/application.py                            |  40 +++-
 App/handlers/DeveloperHandler.py              |  10 +
 App/handlers/HelpHandler.py                   |  14 ++
 .../__init__.py => handlers/StartHandler.py}  |  29 +--
 App/handlers/VideoIDHandler.py                |  10 +
 App/handlers/__init__.py                      |   3 +
 7 files changed, 247 insertions(+), 69 deletions(-)
 create mode 100644 App/handlers/DeveloperHandler.py
 create mode 100644 App/handlers/HelpHandler.py
 rename App/{commands/__init__.py => handlers/StartHandler.py} (63%)
 create mode 100644 App/handlers/VideoIDHandler.py
 create mode 100644 App/handlers/__init__.py

diff --git a/App/.idea/workspace.xml b/App/.idea/workspace.xml
index 7f013ec..9e475b0 100644
--- a/App/.idea/workspace.xml
+++ b/App/.idea/workspace.xml
@@ -2,9 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="ecb85847-acff-4336-b3d7-4f5563aac01d" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/messages/es_ES.json" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/handlers/DeveloperHandler.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/handlers/HelpHandler.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/handlers/StartHandler.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/handlers/VideoIDHandler.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/commands/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/commands/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application.py" beforeDir="false" afterPath="$PROJECT_DIR$/application.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/commands/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/handlers/__init__.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -84,11 +88,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="application.py" pinned="false" current-in-tab="false">
+      <file leaf-file-name="application.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="631">
-              <caret line="83" column="72" selection-start-line="83" selection-start-column="72" selection-end-line="83" selection-end-column="72" />
+            <state relative-caret-position="408">
+              <caret line="29" column="73" lean-forward="true" selection-start-line="29" selection-start-column="73" selection-end-line="29" selection-end-column="73" />
               <folding>
                 <element signature="e#154#184#0" expanded="true" />
               </folding>
@@ -96,14 +100,59 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="__init__.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/commands/__init__.py">
+      <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/handlers/__init__.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="51">
+              <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="DeveloperHandler.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/handlers/DeveloperHandler.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="85">
+              <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+              <folding>
+                <element signature="e#0#43#0" expanded="true" />
+                <marker date="1530089149601" expanded="true" signature="207:216" ph="..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="VideoIDHandler.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/handlers/VideoIDHandler.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="170">
+              <caret line="10" selection-start-line="10" selection-end-line="10" />
+              <folding>
+                <element signature="e#0#43#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="HelpHandler.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/handlers/HelpHandler.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="238">
+              <caret line="14" selection-start-line="14" selection-end-line="14" />
+              <folding>
+                <element signature="e#0#43#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="StartHandler.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/handlers/StartHandler.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="476">
-              <caret line="28" column="100" selection-start-line="28" selection-start-column="100" selection-end-line="28" selection-end-column="100" />
+            <state relative-caret-position="136">
+              <caret line="8" column="28" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
               <folding>
                 <element signature="e#0#43#0" expanded="true" />
-                <marker date="1530037753191" expanded="true" signature="1444:1453" ph="..." />
               </folding>
             </state>
           </provider>
@@ -130,7 +179,7 @@
       <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/database/__init__.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="408">
+            <state relative-caret-position="629">
               <caret line="44" column="70" selection-start-line="44" selection-start-column="70" selection-end-line="44" selection-end-column="70" />
               <folding>
                 <element signature="e#0#11#0" expanded="true" />
@@ -174,10 +223,18 @@
         <option value="$PROJECT_DIR$/upgrader/__init__.py" />
         <option value="$PROJECT_DIR$/db_script_pycharm.ddl" />
         <option value="$PROJECT_DIR$/utils/__init__.py" />
-        <option value="$PROJECT_DIR$/application.py" />
         <option value="$PROJECT_DIR$/database/__init__.py" />
         <option value="$PROJECT_DIR$/messages/es_ES.json" />
+        <option value="$PROJECT_DIR$/commands/StartHandler.py" />
+        <option value="$PROJECT_DIR$/commands/HelpHandler.py" />
+        <option value="$PROJECT_DIR$/commands/DeveloperHander.py" />
+        <option value="$PROJECT_DIR$/commands/DeveloperHandler.py" />
         <option value="$PROJECT_DIR$/commands/__init__.py" />
+        <option value="$PROJECT_DIR$/commands/VideoIDHandler.py" />
+        <option value="$PROJECT_DIR$/handlers/VideoIDHandler.py" />
+        <option value="$PROJECT_DIR$/handlers/__init__.py" />
+        <option value="$PROJECT_DIR$/handlers/StartHandler.py" />
+        <option value="$PROJECT_DIR$/application.py" />
       </list>
     </option>
   </component>
@@ -213,7 +270,7 @@
             <path>
               <item name="App" type="b2602c69:ProjectViewProjectNode" />
               <item name="App" type="462c0819:PsiDirectoryNode" />
-              <item name="commands" type="462c0819:PsiDirectoryNode" />
+              <item name="handlers" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="App" type="b2602c69:ProjectViewProjectNode" />
@@ -334,7 +391,14 @@
       <option name="project" value="LOCAL" />
       <updated>1530014316004</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="First messages included">
+      <created>1530037766868</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1530037766868</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="ToolWindowManager">
@@ -379,7 +443,8 @@
     <MESSAGE value="Completed UPDATE operations &amp; updated CQL file" />
     <MESSAGE value="Finished creation of methods for working with CQL" />
     <MESSAGE value="DB integration and handlers defined" />
-    <option name="LAST_COMMIT_MESSAGE" value="DB integration and handlers defined" />
+    <MESSAGE value="First messages included" />
+    <option name="LAST_COMMIT_MESSAGE" value="First messages included" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -387,6 +452,54 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/application.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1360">
+          <caret line="83" column="72" selection-start-line="83" selection-start-column="72" selection-end-line="83" selection-end-column="72" />
+          <folding>
+            <element signature="e#154#184#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/messages/es_ES.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="12" column="32" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/utils/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="7" selection-start-line="7" selection-end-line="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="629">
+          <caret line="44" column="70" selection-start-line="44" selection-start-column="70" selection-end-line="44" selection-end-column="70" />
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/db_script_pycharm.ddl">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="6" column="70" selection-start-line="6" selection-start-column="70" selection-end-line="6" selection-end-column="70" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/handlers/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="28" column="100" selection-start-line="28" selection-start-column="100" selection-end-line="28" selection-end-column="100" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/application.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1020">
@@ -414,14 +527,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/commands/__init__.py">
+    <entry file="file://$PROJECT_DIR$/handlers/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="578">
           <caret line="35" column="8" selection-start-line="35" selection-start-column="8" selection-end-line="35" selection-end-column="8" />
-          <folding>
-            <element signature="e#0#43#0" expanded="true" />
-            <marker date="1530037753191" expanded="true" signature="1444:1453" ph="..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -561,26 +670,54 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application.py">
+    <entry file="file://$PROJECT_DIR$/database/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="631">
-          <caret line="83" column="72" selection-start-line="83" selection-start-column="72" selection-end-line="83" selection-end-column="72" />
+        <state relative-caret-position="629">
+          <caret line="44" column="70" selection-start-line="44" selection-start-column="70" selection-end-line="44" selection-end-column="70" />
           <folding>
-            <element signature="e#154#184#0" expanded="true" />
+            <element signature="e#0#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/database/__init__.py">
+    <entry file="file://$PROJECT_DIR$/handlers/DeveloperHandler.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="44" column="70" selection-start-line="44" selection-start-column="70" selection-end-line="44" selection-end-column="70" />
+        <state relative-caret-position="85">
+          <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
           <folding>
-            <element signature="e#0#11#0" expanded="true" />
+            <element signature="e#0#43#0" expanded="true" />
+            <marker date="1530089149601" expanded="true" signature="207:216" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/handlers/HelpHandler.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="14" selection-start-line="14" selection-end-line="14" />
+          <folding>
+            <element signature="e#0#43#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/handlers/VideoIDHandler.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="10" selection-start-line="10" selection-end-line="10" />
+          <folding>
+            <element signature="e#0#43#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/handlers/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/messages/es_ES.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="204">
@@ -588,13 +725,22 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/commands/__init__.py">
+    <entry file="file://$PROJECT_DIR$/handlers/StartHandler.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="476">
-          <caret line="28" column="100" selection-start-line="28" selection-start-column="100" selection-end-line="28" selection-end-column="100" />
+        <state relative-caret-position="136">
+          <caret line="8" column="28" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
           <folding>
             <element signature="e#0#43#0" expanded="true" />
-            <marker date="1530037753191" expanded="true" signature="1444:1453" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="29" column="73" lean-forward="true" selection-start-line="29" selection-start-column="73" selection-end-line="29" selection-end-column="73" />
+          <folding>
+            <element signature="e#154#184#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/App/application.py b/App/application.py
index df445c3..3bf4d22 100644
--- a/App/application.py
+++ b/App/application.py
@@ -6,7 +6,33 @@
 from out import cPrint, Colors
 from upgrader import PiPUpgrader
 from database import DatabaseOperationsBase
-from commands import *
+from handlers.StartHandler import StartHandler
+from handlers.HelpHandler import HelpHandler
+from handlers.DeveloperHandler import DeveloperHandler
+from handlers.VideoIDHandler import VideoIDHandler
+
+
+def handler_definer():
+    # type: () -> list
+    from telegram import MessageEntity
+    from telegram.ext import CommandHandler, MessageHandler, Filters
+
+    handlers = []
+    with open("messages/es_ES.json", 'r') as messages_file:
+        messages: dict = messages_file.read()
+    start = StartHandler(messages["welcome"])
+    help_handler = HelpHandler(messages["help"])
+    dev = DeveloperHandler(messages["dev"])
+    video = VideoIDHandler(messages["video_id"])
+    handlers.append(CommandHandler("start", start.start))
+    handlers.append(CommandHandler("help", help_handler.help))
+    handlers.append(CommandHandler("develop", dev.develop))
+    handlers.append(MessageHandler(Filters.command, video.video_handler))
+    handlers.append(MessageHandler(Filters.text & (Filters.entity(MessageEntity.URL) |
+                                                   Filters.entity(MessageEntity.TEXT_LINK)), ))
+    handlers.append(MessageHandler(Filters.text, ))
+    handlers.append(MessageHandler(Filters.all, ))
+    return handlers
 
 
 def main(arguments: Namespace):
@@ -17,8 +43,7 @@ def main(arguments: Namespace):
         import string
 
         from os import path
-        from telegram import MessageEntity
-        from telegram.ext import Updater, CommandHandler, MessageHandler, Filters
+        from telegram.ext import Updater
     except (ImportError, ModuleNotFoundError) as import_error:
         print("Modules needed not found: " + str(import_error))
         exit(-1)
@@ -65,14 +90,7 @@ def main(arguments: Namespace):
             cPrint("Starting database system...", Colors.GREEN)
             db_manager = DatabaseOperationsBase(username=database_user, password=database_password)
             cPrint("Defining handlers...", Colors.GREEN)
-            start_handler = CommandHandler("start", )
-            help_handler = CommandHandler("help", )
-            develop_handler = CommandHandler("develop", )
-            video_id_handler = MessageHandler(Filters.command, )
-            url_handler = MessageHandler(Filters.text & (Filters.entity(MessageEntity.URL) |
-                                                         Filters.entity(MessageEntity.TEXT_LINK)), )
-            message_handler = MessageHandler(Filters.text, )
-            unknown_handler = MessageHandler(Filters.all, )
+            handler_definer()
             updater = Updater(token=app_data["TOKEN"], workers=50)
             dispatcher = updater.dispatcher
 
diff --git a/App/handlers/DeveloperHandler.py b/App/handlers/DeveloperHandler.py
new file mode 100644
index 0000000..84ce8ef
--- /dev/null
+++ b/App/handlers/DeveloperHandler.py
@@ -0,0 +1,10 @@
+from telegram import Bot, Update, ParseMode
+from telegram.ext import run_async
+
+from handlers import Handler
+
+
+class DeveloperHandler(Handler):
+    @run_async
+    def develop(self, bot: Bot, update: Update):
+        # to do
\ No newline at end of file
diff --git a/App/handlers/HelpHandler.py b/App/handlers/HelpHandler.py
new file mode 100644
index 0000000..fb56218
--- /dev/null
+++ b/App/handlers/HelpHandler.py
@@ -0,0 +1,14 @@
+from telegram import Bot, Update, ParseMode
+from telegram.ext import run_async
+
+from handlers import Handler
+
+
+class HelpHandler(Handler):
+    @run_async
+    def help(self, bot: Bot, update: Update, args: list):
+        chat_id = update.message.chat_id
+        if len(args) == 0:
+            print("no args")
+        else:
+            bot.sendMessage(chat_id, self.__messages["help"])
diff --git a/App/commands/__init__.py b/App/handlers/StartHandler.py
similarity index 63%
rename from App/commands/__init__.py
rename to App/handlers/StartHandler.py
index f42b4d7..9b991ce 100644
--- a/App/commands/__init__.py
+++ b/App/handlers/StartHandler.py
@@ -1,15 +1,15 @@
 from telegram import Bot, Update, ParseMode
 from telegram.ext import run_async
 
+from handlers import Handler
 from utils import Constants
 from database import InsertOperations
 
 
-class Handler:
+class StartHandler(Handler):
     def __init__(self, handler_messages: dict):
-        self.__messages = handler_messages
+        super().__init__(handler_messages=handler_messages)
 
-class StartHandler(Handler):
     @run_async
     def start(self, bot: Bot, update: Update):
         import os
@@ -27,26 +27,3 @@ def start(self, bot: Bot, update: Update):
                 pickle.dump(Constants.D_USER_DICT, user_info)
             db_insert.registerNewUser(user_id=user_id, username=username, name=name)
         bot.sendMessage(chat_id=user_id, text=self.__messages["msg"], parse_mode=ParseMode.MARKDOWN)
-
-
-class HelpHandler(Handler):
-    @run_async
-    def help(self, bot: Bot, update: Update, args: list):
-        chat_id = update.message.chat_id
-        if len(args) == 0:
-            print("no args")
-        else:
-            bot.sendMessage(chat_id, self.__messages["help"])
-
-
-class DeveloperHandler(Handler):
-    @run_async
-    def develop(self, bot: Bot, update: Update):
-        # to do
-
-
-class VideoIDHandler(Handler):
-    @run_async
-    def video_handler(self, bot: Bot, update: Update):
-        video_id = update.message.text
-
diff --git a/App/handlers/VideoIDHandler.py b/App/handlers/VideoIDHandler.py
new file mode 100644
index 0000000..27ca7fb
--- /dev/null
+++ b/App/handlers/VideoIDHandler.py
@@ -0,0 +1,10 @@
+from telegram import Bot, Update, ParseMode
+from telegram.ext import run_async
+
+from handlers import Handler
+
+
+class VideoIDHandler(Handler):
+    @run_async
+    def video_handler(self, bot: Bot, update: Update):
+        video_id = update.message.text
diff --git a/App/handlers/__init__.py b/App/handlers/__init__.py
new file mode 100644
index 0000000..4947811
--- /dev/null
+++ b/App/handlers/__init__.py
@@ -0,0 +1,3 @@
+class Handler:
+    def __init__(self, handler_messages: dict):
+        self.__messages = handler_messages