From 2ef4d639bf551639dc9d8f1190bd5fb8bc467a15 Mon Sep 17 00:00:00 2001 From: suti7yk5032 Date: Sun, 7 Jul 2024 15:24:55 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=84=E3=81=A3=E3=81=B1=E5=88=9D=E6=9C=9F?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=A8=E9=96=A2=E9=80=A3=E3=81=AE=E5=A4=89?= =?UTF-8?q?=E6=95=B0=E3=81=AE=E3=82=AF=E3=83=A9=E3=82=B9=E3=82=92=E5=88=86?= =?UTF-8?q?=E3=81=91=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dislocker.py | 198 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 115 insertions(+), 83 deletions(-) diff --git a/dislocker.py b/dislocker.py index 33ea745..96cc890 100644 --- a/dislocker.py +++ b/dislocker.py @@ -7,8 +7,7 @@ import string import random import csv - -class Bot(discord.Client): +class Dislocker(): def __init__(self): self.config_dir_path = "./config/" self.export_dir_path = "./export/" @@ -16,7 +15,10 @@ class Bot(discord.Client): if not os.path.isdir(self.config_dir_path): print("config ディレクトリが見つかりません... 作成します。") - os.mkdir(self.config_dir_path) + try: + os.mkdir(self.config_dir_path) + except: + print("config ディレクトリを作成できませんでした。") if not os.path.isfile(self.server_config_path): print("config ファイルが見つかりません... 作成します。") @@ -35,8 +37,11 @@ class Bot(discord.Client): } } - with open(self.server_config_path, "w") as w: - json.dump(self.server_config, w, indent=4) + try: + with open(self.server_config_path, "w") as w: + json.dump(self.server_config, w, indent=4) + except: + print("config ファイルを作成できませんでした。") elif os.path.isfile(self.server_config_path): with open(self.server_config_path, "r") as r: @@ -44,10 +49,16 @@ class Bot(discord.Client): if not os.path.isdir(self.export_dir_path): print("export ディレクトリが見つかりません... 作成します。") - os.mkdir(self.export_dir_path) + try: + os.mkdir(self.export_dir_path) + except: + print("export ディレクトリを作成できませんでした。") self.db = psycopg2.connect(f"host={self.server_config['db']['host']} dbname={self.server_config['db']['db_name']} port={self.server_config['db']['port']} user={self.server_config['db']['username']} password={self.server_config['db']['password']}") + + +class Bot(discord.Client): def password_generate(self, length): numbers = string.digits # (1) password = ''.join(random.choice(numbers) for _ in range(length)) # (2) @@ -58,33 +69,50 @@ class Bot(discord.Client): return hashed.hexdigest() def register(self, **kwargs): - discord_user_id = str(kwargs["user_id"]) - pc_number = int(kwargs["pc_number"]) - device_number = int(kwargs["device_number"]) - if "detail" in kwargs: - detail = str(kwargs["detail"]) - else: - detail = None - #パスワード生成、ハッシュ化 - password = self.password_generate(4) - password_hash = self.hash_genarate(password) - print("password generated") - #メンバーリストと送信者を照合 - cursor = self.db.cursor() - cursor.execute("SELECT * FROM club_member WHERE discord_userid = %s", (discord_user_id,)) - user_record = cursor.fetchall() - #ユーザーデータがなかったら(未登録の場合) - if not user_record: - result = {"result": "user_data_not_found"} - #ユーザーデータが見つかった場合(登録済みの場合) - else: - print("found user data") - cursor.execute("SELECT * FROM pc_usage_history WHERE member_id=%s ORDER BY id DESC LIMIT 1", (user_record[0][0],)) - pc_usage_history_record = cursor.fetchall() - if pc_usage_history_record: - print("used") - if pc_usage_history_record[0][5] == None: - result = {"result": "pc_already_in_use_by_you", "pc_number": str(pc_usage_history_record[0][2]), "device_number": str(pc_usage_history_record[0][3]), "start_time": str(pc_usage_history_record[0][4]), "detail": str(pc_usage_history_record[0][6])} + try: + discord_user_id = str(kwargs["user_id"]) + pc_number = int(kwargs["pc_number"]) + device_number = int(kwargs["device_number"]) + if "detail" in kwargs: + detail = str(kwargs["detail"]) + else: + detail = None + #パスワード生成、ハッシュ化 + password = self.password_generate(4) + password_hash = self.hash_genarate(password) + print("password generated") + #メンバーリストと送信者を照合 + cursor = dislocker.db.cursor() + cursor.execute("SELECT * FROM club_member WHERE discord_userid = %s", (discord_user_id,)) + user_record = cursor.fetchall() + #ユーザーデータがなかったら(未登録の場合) + if not user_record: + result = {"result": "user_data_not_found"} + #ユーザーデータが見つかった場合(登録済みの場合) + else: + print("found user data") + cursor.execute("SELECT * FROM pc_usage_history WHERE member_id=%s ORDER BY id DESC LIMIT 1", (user_record[0][0],)) + pc_usage_history_record = cursor.fetchall() + if pc_usage_history_record: + print("used") + if pc_usage_history_record[0][5] == None: + result = {"result": "pc_already_in_use_by_you", "pc_number": str(pc_usage_history_record[0][2]), "device_number": str(pc_usage_history_record[0][3]), "start_time": str(pc_usage_history_record[0][4]), "detail": str(pc_usage_history_record[0][6])} + else: + cursor.execute("SELECT * FROM pc_list WHERE pc_number=%s", (pc_number,)) + pc_list_record = cursor.fetchall() + if not pc_list_record[0][1] == None: + result = {"result": "pc_already_in_use_by_other"} + else: + if detail == None: + cursor.execute("INSERT INTO pc_usage_history (member_id, pc_number, device_number, start_use_time) VALUES (%s, %s, %s, current_timestamp)", (user_record[0][0], pc_number, device_number)) + #使用用途があるとき + else: + cursor.execute("INSERT INTO pc_usage_history (member_id, pc_number, device_number, start_use_time, use_detail) VALUES (%s, %s, %s, current_timestamp, %s)", (user_record[0][0], pc_number, device_number, detail)) + + cursor.execute("UPDATE pc_list SET using_user_id = %s WHERE pc_number = %s", (user_record[0][0], pc_number)) + cursor.execute("UPDATE pc_list SET password_hash = %s WHERE pc_number = %s", (password_hash, pc_number)) + dislocker.db.commit() + result = {"result": "ok", "password": str(password), "name": str(user_record[0][1])} else: cursor.execute("SELECT * FROM pc_list WHERE pc_number=%s", (pc_number,)) pc_list_record = cursor.fetchall() @@ -99,65 +127,68 @@ class Bot(discord.Client): cursor.execute("UPDATE pc_list SET using_user_id = %s WHERE pc_number = %s", (user_record[0][0], pc_number)) cursor.execute("UPDATE pc_list SET password_hash = %s WHERE pc_number = %s", (password_hash, pc_number)) - self.db.commit() + dislocker.db.commit() result = {"result": "ok", "password": str(password), "name": str(user_record[0][1])} - else: - cursor.execute("SELECT * FROM pc_list WHERE pc_number=%s", (pc_number,)) - pc_list_record = cursor.fetchall() - if not pc_list_record[0][1] == None: - result = {"result": "pc_already_in_use_by_other"} - else: - if detail == None: - cursor.execute("INSERT INTO pc_usage_history (member_id, pc_number, device_number, start_use_time) VALUES (%s, %s, %s, current_timestamp)", (user_record[0][0], pc_number, device_number)) - #使用用途があるとき - else: - cursor.execute("INSERT INTO pc_usage_history (member_id, pc_number, device_number, start_use_time, use_detail) VALUES (%s, %s, %s, current_timestamp, %s)", (user_record[0][0], pc_number, device_number, detail)) - - cursor.execute("UPDATE pc_list SET using_user_id = %s WHERE pc_number = %s", (user_record[0][0], pc_number)) - cursor.execute("UPDATE pc_list SET password_hash = %s WHERE pc_number = %s", (password_hash, pc_number)) - self.db.commit() - result = {"result": "ok", "password": str(password), "name": str(user_record[0][1])} + except: + print("登録処理中にエラーが発生しました。") + result = {"result": "error"} + + finally: + cursor.close() return result def stop(self, **kwargs): - discord_user_id = str(kwargs["user_id"]) - cursor = self.db.cursor() - cursor.execute("SELECT * FROM club_member WHERE discord_userid = %s", (discord_user_id,)) - user_record = cursor.fetchall() - cursor.execute("SELECT * FROM pc_usage_history WHERE member_id= %s ORDER BY id DESC LIMIT 1", (user_record[0][0],)) - pc_usage_history_record = cursor.fetchall() - if pc_usage_history_record: - if not pc_usage_history_record[0][5] == None: - result = {"result": "unused"} - else: - cursor.execute("UPDATE pc_usage_history SET end_use_time = current_timestamp WHERE id = %s", (pc_usage_history_record[0][0],)) - cursor.execute("UPDATE pc_list SET using_user_id = NULL WHERE pc_number = %s", (pc_usage_history_record[0][2],)) - cursor.execute("UPDATE pc_list SET password_hash = NULL WHERE pc_number = %s", (pc_usage_history_record[0][2],)) - self.db.commit() - result = {"result": "ok", "pc_number": str(pc_usage_history_record[0][2]), "name": str(user_record[0][1])} + try: + discord_user_id = str(kwargs["user_id"]) + cursor = dislocker.db.cursor() + cursor.execute("SELECT * FROM club_member WHERE discord_userid = %s", (discord_user_id,)) + user_record = cursor.fetchall() + cursor.execute("SELECT * FROM pc_usage_history WHERE member_id= %s ORDER BY id DESC LIMIT 1", (user_record[0][0],)) + pc_usage_history_record = cursor.fetchall() + if pc_usage_history_record: + if not pc_usage_history_record[0][5] == None: + result = {"result": "unused"} + else: + cursor.execute("UPDATE pc_usage_history SET end_use_time = current_timestamp WHERE id = %s", (pc_usage_history_record[0][0],)) + cursor.execute("UPDATE pc_list SET using_user_id = NULL WHERE pc_number = %s", (pc_usage_history_record[0][2],)) + cursor.execute("UPDATE pc_list SET password_hash = NULL WHERE pc_number = %s", (pc_usage_history_record[0][2],)) + dislocker.db.commit() + result = {"result": "ok", "pc_number": str(pc_usage_history_record[0][2]), "name": str(user_record[0][1])} + except: + print("停止処理にエラーが発生しました。") + result = {"result": "error"} return result def user_register(self, **kwargs): - discord_user_id = str(kwargs["discord_user_id"]) - discord_user_name = str(kwargs["discord_user_name"]) - name = str(kwargs["name"]) - cursor = self.db.cursor() - cursor.execute("SELECT * FROM club_member WHERE discord_userid = %s", (discord_user_id,)) - user_record = cursor.fetchall() - if not user_record: - cursor.execute("INSERT INTO club_member (name, discord_username, discord_userid) VALUES (%s, %s, %s)", (name, discord_user_name, discord_user_id)) - self.db.commit() - result = {"result": "ok"} - else: - result = {"result": "already_exists"} + try: + discord_user_id = str(kwargs["discord_user_id"]) + discord_user_name = str(kwargs["discord_user_name"]) + name = str(kwargs["name"]) + cursor = dislocker.db.cursor() + cursor.execute("SELECT * FROM club_member WHERE discord_userid = %s", (discord_user_id,)) + user_record = cursor.fetchall() + if not user_record: + cursor.execute("INSERT INTO club_member (name, discord_username, discord_userid) VALUES (%s, %s, %s)", (name, discord_user_name, discord_user_id)) + dislocker.db.commit() + result = {"result": "ok"} + else: + result = {"result": "already_exists"} + + except: + print("ユーザー登録中にエラーが発生しました。") + result = {"result": "error"} + + finally: + cursor.close() + return result def report_export(self, **kwargs): try: csv_file_path = self.export_dir_path + "pc_usage_history.csv" - cursor = self.db.cursor() + cursor = dislocker.db.cursor() # メインテーブルの列情報を取得（user_idを除く） cur.execute(sql.SQL("SELECT * FROM {} LIMIT 0").format(sql.Identifier(main_table))) main_columns = [desc[0] for desc in cur.description if desc[0] != 'member_id'] @@ -190,6 +221,7 @@ class Bot(discord.Client): csvwriter.writerow(formatted_row) print(f"テーブル '{main_table}' の内容を '{csv_file_path}' に出力しました。") + result = {"result": "ok", "file_path": csv_file_path} except (Exception, psycopg2.Error) as error: print("使用履歴のエクスポート時にエラーが発生しました\nエラー内容\n", error) @@ -197,7 +229,6 @@ class Bot(discord.Client): finally: cursor.close() - result = {"result": "ok", "file_path": csv_file_path} return result @@ -232,7 +263,7 @@ class Bot(discord.Client): await message.channel.send(f"使用が開始されました。\nパスワード | {register["password"]}\nPC番号 | {msg_split[1]}\nデバイス番号 | {msg_split[2]}") elif len(msg_split) == 4: await message.channel.send(f"使用が開始されました。\nパスワード | {register["password"]}\nPC番号 | {msg_split[1]}\nデバイス番号 | {msg_split[2]}\n使用目的 | {msg_split[3]}") - await self.get_channel(self.server_config["bot"]["log_channel_id"]).send(f'{register["name"]} さんがPC {msg_split[1]} を使用しています') + await self.get_channel(dislocker.server.config["bot"]["log_channel_id"]).send(f'{register["name"]} さんがPC {msg_split[1]} を使用しています') elif register["result"] == "user_data_not_found": await message.channel.send("ユーザーとして登録されていないようです。管理者に問い合わせてください。") elif register["result"] == "pc_already_in_use_by_you": @@ -250,9 +281,9 @@ class Bot(discord.Client): await message.channel.send("使用されていないようです...") elif stop["result"] == "ok": await message.channel.send(f"PC番号 {stop["pc_number"]} の使用が終了されました。") - await self.get_channel(self.server_config["bot"]["log_channel_id"]).send(f'{stop["name"]} さんがPC {stop["pc_number"]} の使用を終了しました') + await self.get_channel(dislocker.server.config["bot"]["log_channel_id"]).send(f'{stop["name"]} さんがPC {stop["pc_number"]} の使用を終了しました') - elif message.channel.id == self.server_config["bot"]["config_channel_id"]: + elif message.channel.id == dislocker.server.config["bot"]["config_channel_id"]: msg_split = message.content.split() if msg_split[0] == "/register": if len(msg_split) <= 3: @@ -281,5 +312,6 @@ class Bot(discord.Client): intents = discord.Intents.default() intents.message_content = True +dislocker = Dislocker() bot = Bot(intents=intents) -bot.run(bot.server_config['bot']['token']) +bot.run(dislocker.server_config['bot']['token'])