diff --git a/commandor_page.py b/commandor_page.py index 9dbe9de..243e8b8 100644 --- a/commandor_page.py +++ b/commandor_page.py @@ -121,7 +121,7 @@ class CommandorPage: def _on_page_loaded(self): self.logger.info("page loaded") - self.logger.info("content is " + self.page.content()) + # self.logger.info("content is " + self.page.content()) self.logger.info("url is " + self.page.url) self.getErrors() diff --git a/main.py b/main.py index 7b9857f..5012e40 100644 --- a/main.py +++ b/main.py @@ -30,6 +30,10 @@ card_pool = CardPool(CARD_POOL_PORT) current_card_pool_slot = 1 current_sim_position = 1 +init_logger() +logger = logging.getLogger() +logger.addHandler(logging.StreamHandler(stream=sys.stdout)) + def send_command(cmd: str, ser, wait_time_in_s: int = 0) -> bytes: ser.write(cmd.encode()) @@ -169,7 +173,7 @@ def on_ready_for_otp(e: Event, commandor: CommandorPage): def start_book(): start_slot_number = 1 - end_slot_number = 21 + end_slot_number = 1 slot_list = list(range(start_slot_number, end_slot_number + 1)) random.shuffle(slot_list) for i in slot_list: @@ -229,7 +233,4 @@ def get_proxy(phone_number): if __name__ == '__main__': - init_logger() - logger = logging.getLogger() - logger.addHandler(logging.StreamHandler(stream=sys.stdout)) start_book() diff --git a/scheduler.py b/scheduler.py index 7383208..3a82fc2 100644 --- a/scheduler.py +++ b/scheduler.py @@ -1,10 +1,7 @@ -import logging -import sys - from apscheduler.executors.pool import ThreadPoolExecutor, ProcessPoolExecutor from apscheduler.schedulers.blocking import BlockingScheduler -from logs.AppLogging import init_logger +from main import start_book from wait_for_sms import start_waiting_sms @@ -12,7 +9,15 @@ def waiting_for_sms_job(): start_waiting_sms() +def start_book_appointment(): + start_book() + + def start_waiting_sms_job(sched): + sched.add_job(start_book_appointment, 'cron', day_of_week='mon-sat', hour='10', + minute='30', + misfire_grace_time=10, + second='0', timezone='Europe/Paris', max_instances=1) sched.add_job(waiting_for_sms_job, 'cron', day_of_week='mon-sat', hour='20', minute='30', misfire_grace_time=10, @@ -31,4 +36,4 @@ def config_and_start_jobs(): if __name__ == '__main__': - config_and_start_jobs() \ No newline at end of file + config_and_start_jobs() diff --git a/wait_for_sms.py b/wait_for_sms.py index 8bf1f81..cdbcfe4 100644 --- a/wait_for_sms.py +++ b/wait_for_sms.py @@ -24,6 +24,7 @@ init_logger() logger = logging.getLogger() logger.addHandler(logging.StreamHandler(stream=sys.stdout)) + def get_devices_ports() -> list: return MODEM_POOL_PORTS @@ -116,5 +117,4 @@ def start_waiting_sms(): if __name__ == '__main__': - start_waiting_sms()