diff --git a/appointment.spec b/appointment.spec index 773958b..d268acf 100644 --- a/appointment.spec +++ b/appointment.spec @@ -29,7 +29,7 @@ exe = EXE( a.datas, [], name='appointment', - debug=False, + debug=True, bootloader_ignore_signals=False, strip=False, upx=True, @@ -41,8 +41,9 @@ exe = EXE( target_arch=None, codesign_identity=None, entitlements_file=None, + icon='C:\\Users\\landd\\IdeaProjects\\appointment_tool\\hermes-logo.ico' ) import shutil -shutil.copyfile('C:\\Users\\landd\\IdeaProjects\\appointment_tool\\appointment.json', '{0}/application.json'.format(DISTPATH)) +shutil.copyfile('C:\\Users\\landd\\IdeaProjects\\appointment_tool\\appointment.json', '{0}/appointment.json'.format(DISTPATH)) shutil.copyfile('C:\\Users\\landd\\IdeaProjects\\appointment_tool\\contact_all.xlsx', '{0}/contact_all.xlsx'.format(DISTPATH)) shutil.copyfile('C:\\Users\\landd\\IdeaProjects\\appointment_tool\\config.ini', '{0}/config.ini'.format(DISTPATH)) \ No newline at end of file diff --git a/hermes-logo.ico b/hermes-logo.ico new file mode 100644 index 0000000..d918c81 Binary files /dev/null and b/hermes-logo.ico differ diff --git a/main.py b/main.py index 040372c..120cc1e 100644 --- a/main.py +++ b/main.py @@ -16,7 +16,10 @@ logger.addHandler(logging.StreamHandler(stream=sys.stdout)) def start_book(start_number, end_number, store_choose_state=0, max_workers=10): # read the contact, and contact the 2 objects together excel_reader = ExcelHelper() - contacts = excel_reader.read_contacts()[start_number - 1: end_number] + all_contacts = excel_reader.read_contacts() + if len(all_contacts) <= end_number: + end_number = len(all_contacts) + contacts = all_contacts[start_number - 1: end_number] logger.info(contacts) with ThreadPoolExecutor(max_workers=max_workers) as executor: for contact in contacts: diff --git a/requirements.txt b/requirements.txt index b4542a2..88ee6bc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,10 +2,8 @@ dataclasses_json==0.5.6 firebase_admin==5.2.0 pandas==1.4.1 playwright==1.21.0 -pydotenv==0.0.7 dataclasses~=0.6 oci~=2.54.1 XlsxWriter~=3.0.3 boto3~=1.21.13 -openpyxl==3.0.9 -iniFile==0.4.1 \ No newline at end of file +openpyxl==3.0.9 \ No newline at end of file diff --git a/utils/excel_reader.py b/utils/excel_reader.py index 9da8df6..596b4f7 100644 --- a/utils/excel_reader.py +++ b/utils/excel_reader.py @@ -1,8 +1,6 @@ import json import pandas as pandas - -import definitions from definitions import CONTACT_LIST_FILE from pojo.contact_pojo import ContactPojo diff --git a/workers/commandor_page.py b/workers/commandor_page.py index 5616cf8..06ff11b 100644 --- a/workers/commandor_page.py +++ b/workers/commandor_page.py @@ -11,7 +11,6 @@ import params from params import PROXY_SERVER, PROXY_PASSWORD from pojo.ReserveResultPojo import ReserveResultPojo, PublishType from pojo.contact_pojo import ContactPojo -from utils.excel_reader import ExcelHelper RDV_URL = "https://rendezvousparis.hermes.com/client/register" @@ -138,6 +137,7 @@ class CommandorPage: except Exception as error: params.oracle_log_sender.send_error(str(error)) self.logger.exception(error) + self.logger.info("will close browser") self.browser.close() return None