suti7yk5032/Dislocker
1
0
Fork 0
Code Issues 11 Pull requests Projects 3 Releases Packages Wiki Activity Actions

monitorの時間類の設定をconfigファイルへ移動

Browse source
This commit is contained in:
suti7yk5032 2024-08-15 22:41:38 +09:00
parent 3073f12e6c
commit f7ecdc535f
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dislocker.py
View file

@ -43,7 +43,12 @@ class DL():
}, },
"log_channel_id" : "TYPE HERE CHANNEL ID (YOU MUST USE INT !!!!)", "log_channel_id" : "TYPE HERE CHANNEL ID (YOU MUST USE INT !!!!)",
"config_channel_id": "TYPE HERE CHANNEL ID (YOU MUST USE INT !!!!)", "config_channel_id": "TYPE HERE CHANNEL ID (YOU MUST USE INT !!!!)",
"config_public_channel_id": "TYPE HERE CHANNEL ID (YOU MUST USE INT !!!!)" "config_public_channel_id": "TYPE HERE CHANNEL ID (YOU MUST USE INT !!!!)",
"monitor": {
"search_frequency": 1,
"allowable_time": 180,
"fstop_time": "21:00:00"
}
} }
} }
@ -655,13 +660,14 @@ class Bot(discord.Client):
class Monitor(): class Monitor():
def __init__(self, **kwargs) -> None: def __init__(self, **kwargs) -> None:
self.serach_time = kwargs["search_time"] self.search_frequency = kwargs["search_frequency"]
self.allowable_time = kwargs["allowable_time"] self.allowable_time = kwargs["allowable_time"]
self.fstop_time = kwargs["fstop_time"]
self.init_wait_time = 10 self.init_wait_time = 10
def start(self, **kwargs): def start(self, **kwargs):
serach_thread = threading.Thread(target=self.search) search_thread = threading.Thread(target=self.search)
serach_thread.start() search_thread.start()
def search(self): def search(self):
@ -672,7 +678,7 @@ class Monitor():
cursor.execute("SELECT * FROM pc_list WHERE password_hash IS NOT NULL") cursor.execute("SELECT * FROM pc_list WHERE password_hash IS NOT NULL")
pc_list = cursor.fetchall() pc_list = cursor.fetchall()
current_datetime = datetime.now() current_datetime = datetime.now()
fstop_time = "21:00:00" fstop_time = self.fstop_time
print(pc_list) print(pc_list)
print(len(pc_list)) print(len(pc_list))
if current_datetime.time().strftime("%H:%M:%S") == fstop_time: if current_datetime.time().strftime("%H:%M:%S") == fstop_time:
@ -731,7 +737,7 @@ class Monitor():
result = {"result": "NONE"} result = {"result": "NONE"}
print(result["result"]) print(result["result"])
time.sleep(self.serach_time) time.sleep(self.search_frequency)
except Exception as error: except Exception as error:
@ -786,7 +792,7 @@ if dislocker.init_result == "ok":
intents = discord.Intents.default() intents = discord.Intents.default()
intents.message_content = True intents.message_content = True
bot = Bot(intents=intents) bot = Bot(intents=intents)
monitor = Monitor(search_time=1, allowable_time=60) monitor = Monitor(search_frequency=dislocker.server_config["bot"]["monitor"]["search_frequency"], allowable_time=dislocker.server_config["bot"]["monitor"]["allowable_time"], fstop_time=dislocker.server_config["bot"]["monitor"]["fstop_time"])
monitor.start() monitor.start()
bot.run(dislocker.server_config['bot']['token']) bot.run(dislocker.server_config['bot']['token'])
else: else: