From bd47790b0dec391faf3bffeeb8b3be3ca260bbd5 Mon Sep 17 00:00:00 2001 From: Profitroll <47523801+profitrollgame@users.noreply.github.com> Date: Thu, 15 Sep 2022 00:16:38 +0200 Subject: [PATCH] Making sure multilanguage is possible --- bot.py | 26 ++++++---- config.json | 1 + strings.json => locale/en.json | 0 modules/functions.py | 21 ++++---- modules/functions_bot.py | 89 +++++++++++++++++++++++++++------- 5 files changed, 99 insertions(+), 38 deletions(-) rename strings.json => locale/en.json (100%) diff --git a/bot.py b/bot.py index ad9d16c..c1309f3 100644 --- a/bot.py +++ b/bot.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -import os import subprocess from sys import exit +from os import getpid, listdir, sep, system from modules.functions import * from modules.functions_bot import * from pyrogram import Client, filters, idle @@ -10,7 +10,7 @@ from pyrogram.types import ForceReply, BotCommand, BotCommandScopeChat from pyrogram.enums.chat_action import ChatAction if configGet("bot_token") != "12345678:asdfghjklzxcvbnm": - pid = os.getpid() + pid = getpid() app = Client("auto_zoom_public_bot", api_id=configGet("api_id"), api_hash=configGet("api_hash"), bot_token=configGet("bot_token")) else: logWrite("Could not start the bot. Please, configure token in config.json") @@ -28,9 +28,11 @@ def start(app, msg): app.send_chat_action(chat_id=msg.chat.id, action=ChatAction.TYPING) - if f"{msg.from_user.id}.json" not in os.listdir("data/users/"): + user_locale = msg.from_user.language_code + + if f"{msg.from_user.id}.json" not in listdir(f"data{sep}users{sep}"): logWrite(f'Creating blank data file for {msg.from_user.id}') - jsonSave( f"data/users/{msg.from_user.id}.json", {"api_key": None, "linked": False, "context": {"action": None, "data": None}} ) + jsonSave( f"data{sep}users{sep}{msg.from_user.id}.json", {"api_key": None, "linked": False, "context": {"action": None, "data": None}} ) if not userGet(msg.from_user.id, "linked"): msg.reply_text(locale("link_input", "msg"), reply_markup=ForceReply(placeholder=locale("link", "fry"))) @@ -45,13 +47,15 @@ def unlink(app, msg): app.send_chat_action(chat_id=msg.chat.id, action=ChatAction.TYPING) + user_locale = msg.from_user.language_code + if not userGet(msg.from_user.id, "linked"): msg.reply_text(locale("not_linked", "msg")) else: try: - keys_storage = jsonLoad("data/keys_storage.json") + keys_storage = jsonLoad(f"data{sep}keys_storage.json") del keys_storage[userGet(msg.from_user.id, "api_key")] - jsonSave("data/keys_storage.json", keys_storage) + jsonSave(f"data{sep}keys_storage.json", keys_storage) except: pass userClear(msg.from_user.id, "api_key") @@ -63,6 +67,8 @@ def cancel(app, msg): app.send_chat_action(chat_id=msg.chat.id, action=ChatAction.TYPING) + user_locale = msg.from_user.language_code + if userGet(msg.from_user.id, "context") is not None: userClear(msg.from_user.id, "context") userClear(msg.from_user.id, "context_content") @@ -76,7 +82,7 @@ def kill(app, msg): if msg.from_user.id == configGet("admin"): msg.reply_text(f"Shutting down bot with pid `{pid}`") - os.system('kill -9 '+str(pid)) + system('kill -9 '+str(pid)) # REFACTOR @app.on_message(~ filters.scheduled) @@ -84,13 +90,15 @@ def any_message_handler(app, msg): if userGet(msg.from_user.id, "context") == "link_key": + user_locale = msg.from_user.language_code + if msg.text in jsonLoad(configGet("api_keys"))["autozoom"]: msg.reply_text(locale("key_correct", "msg")) userSet(msg.from_user.id, "api_key", msg.text) userSet(msg.from_user.id, "linked", True) - keys_storage = jsonLoad("data/keys_storage.json") + keys_storage = jsonLoad(f"data{sep}keys_storage.json") keys_storage[msg.text] = msg.from_user.id - jsonSave("data/keys_storage.json", keys_storage) + jsonSave(f"data{sep}keys_storage.json", keys_storage) logWrite(f"Added apikey {msg.text} for user {msg.from_user.id}") else: logWrite(f"User {msg.from_user.id} tried to pair with invalid apikey {msg.text}") diff --git a/config.json b/config.json index 09bc830..5bb2a75 100644 --- a/config.json +++ b/config.json @@ -1,4 +1,5 @@ { + "locale": "en", "admin": 123456789, "api_id": 1234567, "api_hash": "01234567890qwertyuiop", diff --git a/strings.json b/locale/en.json similarity index 100% rename from strings.json rename to locale/en.json diff --git a/modules/functions.py b/modules/functions.py index 733c268..55eb072 100644 --- a/modules/functions.py +++ b/modules/functions.py @@ -1,12 +1,11 @@ # -*- coding: utf-8 -*- """Some set of functions needed for discord/telegram bots and other types of apps""" -import gzip -import os -import shutil - +from os import sep, stat, makedirs from datetime import datetime from ujson import loads, dumps +from shutil import copyfileobj +from gzip import open as gzipopen def nowtimeGet(format="%H:%M:%S | %d.%m.%Y"): @@ -21,7 +20,7 @@ def nowtimeGet(format="%H:%M:%S | %d.%m.%Y"): return datetime.now().strftime(format) -def checkSize(logs_folder="logs/", log_size=1024): +def checkSize(logs_folder=f"logs{sep}", log_size=1024): """Checks latest log file size and rotates it if needed. ### Args: @@ -31,11 +30,11 @@ def checkSize(logs_folder="logs/", log_size=1024): i = 0 while i < 2: try: - log = os.stat(logs_folder + 'latest.log') + log = stat(logs_folder + 'latest.log') if (log.st_size / 1024) > log_size: with open(logs_folder + 'latest.log', 'rb') as f_in: - with gzip.open(f'{logs_folder}{datetime.now().strftime("%d.%m.%Y_%H:%M:%S")}.zip', 'wb') as f_out: - shutil.copyfileobj(f_in, f_out) + with gzipopen(f'{logs_folder}{datetime.now().strftime("%d.%m.%Y_%H:%M:%S")}.zip', 'wb') as f_out: + copyfileobj(f_in, f_out) open(logs_folder + 'latest.log', 'w').close() i = 2 except FileNotFoundError: @@ -44,7 +43,7 @@ def checkSize(logs_folder="logs/", log_size=1024): open(logs_folder + 'latest.log', 'a').close() except: try: - os.mkdir(logs_folder) + makedirs(logs_folder, exist_ok=True) log = open(logs_folder + 'latest.log', 'a') open(logs_folder + 'latest.log', 'a').close() except: @@ -52,7 +51,7 @@ def checkSize(logs_folder="logs/", log_size=1024): i += 1 -def logWrite(message, logs_folder="logs/", level="INFO"): +def logWrite(message, logs_folder=f"logs{sep}", level="INFO"): """Append some message to latest log file. ### Args: @@ -68,7 +67,7 @@ def logWrite(message, logs_folder="logs/", level="INFO"): open(logs_folder + 'latest.log', 'a').close() except: try: - os.mkdir(logs_folder) + makedirs(logs_folder, exist_ok=True) log = open(logs_folder + 'latest.log', 'a') open(logs_folder + 'latest.log', 'a').close() except: diff --git a/modules/functions_bot.py b/modules/functions_bot.py index ded028e..efac870 100644 --- a/modules/functions_bot.py +++ b/modules/functions_bot.py @@ -1,21 +1,41 @@ # -*- coding: utf-8 -*- +"""Essential set of functions needed for discord/telegram bots and other types of apps""" + from modules.functions import jsonLoad, jsonSave +from os import sep -def locale(key, *args): - strings = jsonLoad("strings.json") - string = strings +def configGet(key: str, *args: str): + """Get value of the config key + Args: + * key (str): The last key of the keys path. + * *args (str): Path to key like: dict[args][key]. + Returns: + * any: Value of provided key + """ + this_dict = jsonLoad("config.json") + this_key = this_dict for dict_key in args: - string = string[dict_key] - return string[key] + this_key = this_key[dict_key] + return this_key[key] - -def configGet(key): - return jsonLoad("config.json")[key] - -def configAppend(key, value): - config = jsonLoad("config.json") - config[key].append(value) - jsonSave("config.json", config) +def configAppend(key: str, value, *args: str): + """Set key to a value + Args: + * key (str): The last key of the keys path. + * value (str/int/float/list/dict/None): Some needed value. + * *args (str): Path to key like: dict[args][key]. + """ + this_dict = jsonLoad("config.json") + string = "this_dict" + for arg in args: + string += f'["{arg}"]' + if type(value) in [str]: + string += f'["{key}"].append("{value}")' + else: + string += f'["{key}"].append({value})' + exec(string) + jsonSave(this_dict, "config.json") + return def configRemove(key, value): config = jsonLoad("config.json") @@ -23,14 +43,47 @@ def configRemove(key, value): jsonSave("config.json", config) +def locale(key: str, *args: str, locale=configGet("locale")): + """Get value of locale string + Args: + * key (str): The last key of the locale's keys path. + * *args (list): Path to key like: dict[args][key]. + * locale (str): Locale to looked up in. Defaults to config's locale value. + Returns: + * any: Value of provided locale key + """ + if (locale == None): + locale = configGet("locale") + + try: + this_dict = jsonLoad(f'{configGet("locale", "locations")}{sep}{locale}.json') + except FileNotFoundError: + try: + this_dict = jsonLoad(f'{configGet("locale", "locations")}{sep}{configGet("locale")}.json') + except FileNotFoundError: + try: + this_dict = jsonLoad(f'{configGet("locale_fallback", "locations")}{sep}{configGet("locale")}.json') + except: + return f'⚠️ Locale in config is invalid: could not get "{key}" in {str(args)} from locale "{locale}"' + + this_key = this_dict + for dict_key in args: + this_key = this_key[dict_key] + + try: + return this_key[key] + except KeyError: + return f'⚠️ Locale in config is invalid: could not get "{key}" in {str(args)} from locale "{locale}"' + + def userSet(userid, key, value): - user = jsonLoad(f"data/users/{userid}.json") + user = jsonLoad(f"data{sep}users{sep}{userid}.json") user[key] = value - jsonSave(f"data/users/{userid}.json", user) + jsonSave(f"data{sep}users{sep}{userid}.json", user) def userGet(userid, key): try: - return jsonLoad(f"data/users/{userid}.json")[key] + return jsonLoad(f"data{sep}users{sep}{userid}.json")[key] except KeyError: return None except FileNotFoundError: @@ -38,8 +91,8 @@ def userGet(userid, key): def userClear(userid, key): try: - user = jsonLoad(f"data/users/{userid}.json") + user = jsonLoad(f"data{sep}users{sep}{userid}.json") del user[key] - jsonSave(f"data/users/{userid}.json", user) + jsonSave(f"data{sep}users{sep}{userid}.json", user) except KeyError: pass \ No newline at end of file