Refactoring

betMODEL.py → Models/betMODEL.py

@@ -43,7 +43,7 @@ class User(Base):
     notify = Column(Integer)
 
 
-schema = os.environ.get('betBOTSchema')
+schema = os.environ.get('BET_BOT_SCHEMA')
 engine = create_engine(schema)
 Base.metadata.create_all(engine)
 

Settings/.env.exemple

@@ -0,0 +1,5 @@
+#ENV conf
+BET_BOT_SCHEMA='sqlite:///db.sqlite'
+BET_BOT_API_KEY=TELEGRAM_API_KEY
+BET_BOT_LANG=fr
+BET_BOT_ADMINS="[12412421, 4124124]"

betLANG.py → Settings/settings.py

@@ -1,16 +1,22 @@
+# Settings.py
 import json
 import os
+from dotenv import load_dotenv
 
+# Load .ENV
+load_dotenv()
+
+#Load Translation
 texts = {}
 lang = 'en'
 path = os.path.dirname(os.path.abspath(__file__))
 
 
-with open(path + '/lang.json') as json_data:
+with open(path + '/../lang.json') as json_data:
     texts = json.load(json_data)
 
 
-def change_lang(lan='en'):
+def change_lang(lan='fr'):
     global lang
     if texts.get(lan):
         lang = lan
@@ -23,3 +29,4 @@ def gettext(string):
     if texts.get(lang) and texts[lang].get(string):
         return texts[lang][string]
     return string
+

betBOT.py

@@ -6,27 +6,26 @@
 import sys
 import ast
 import datetime
+from Settings.settings import *
 
 from telebot import TeleBot, types
 from emoji import emojize
-from betMODEL import Match, Ranking, Bet, User, get_matches, get_bets, \
+from Models.betMODEL import Match, Ranking, Bet, User, get_matches, get_bets, \
      get_users, get_ranking, add, update, delete, get_session
-from betLANG import gettext, change_lang
 
 
-token = os.environ.get('betBOT')
+token = os.environ.get('BET_BOT_API_KEY')
 
+#Getter for translation
 _ = gettext
 
 if not token:
     sys.exit(_('Add an enviroment variable $betBOT with your token.'))
 
-if sys.argv[1] and 'lang=' in sys.argv[1]:
-    lang = sys.argv[1].split('=')[1]
-    change_lang(lang)
+lang = os.environ.get('BET_BOT_LANG')
+change_lang(lang)
 
-if sys.argv[2] and 'admins=' in sys.argv[2]:
-    administrators = ast.literal_eval(sys.argv[2][7:])
+administrators = ast.literal_eval(os.environ.get('BET_BOT_ADMINS'))
 
 
 bot = TeleBot(token)