remove unused codes

This commit is contained in:
2022-05-10 23:05:10 +02:00
parent a9a569a314
commit 5d61d550d0
9 changed files with 29 additions and 364 deletions
+7 -62
View File
@@ -1,18 +1,11 @@
import logging
import random
import sys
import time
from concurrent.futures import ThreadPoolExecutor
from typing import Union
from gsmmodem import GsmModem
import params
from workers.commandor_page import CommandorPage
from logs.AppLogging import init_logger
from params import oracle_log_sender
from pojo.serial_modem import SerialModem
from utils.excel_reader import ExcelHelper
from workers.commandor_page import CommandorPage
OTP_TIMEOUT = 240
current_gsm_modem = None
@@ -23,65 +16,17 @@ 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())
msg = ser.read(100)
count = 0
while 'OK' not in str(msg) and count < wait_time_in_s:
time.sleep(1)
count = count + 1
msg = ser.read(100)
print(msg)
return msg
def create_modem_for_port(port: str) -> Union[SerialModem, None]:
logger.info('Initializing modem... for ' + port)
serial_modem = None
try:
modem = GsmModem(port)
return SerialModem(modem=modem)
except Exception as ext:
logger.error(ext)
return serial_modem
def start_book(start_number, end_number, store=0):
# read the contact, and contact the 2 objects together
excel_reader = ExcelHelper()
contacts = excel_reader.read_contacts()[start_number - 1: end_number - 1]
print(contacts)
# for i in contacts_range:
# logger.info("will switch to contact {}".format(i))
# with ThreadPoolExecutor(max_workers=10) as executor:
# for modem in modem_list:
# current_sim_position = current_sim_position + 1
# try:
# modem.get_ccid()
# # find the contact with ccid
# contact = [contact for contact in contacts if
# contact.ccid.replace("F", "") == modem.ccid.replace("F", "")]
# if len(contact) > 0:
# modem.phone_number = contact[0].phone
# modem.contact = contact[0]
# else:
# logger.info("contact not found for this ccid:{}".format(modem.ccid))
# error_msg = "slot({}):sim({}):ccid({})".format(i, current_sim_position, modem.ccid)
# oracle_log_sender.send_contact_not_found(error_msg)
# modem.modem.close()
# continue
# if modem.contact:
# logger.info("contact found for this ccid")
# signal = modem.modem.signalStrength
# logger.info("信号强度: " + str(signal))
# proxy = get_proxy(modem.phone_number)
# commandor = CommandorPage(modem, sim_position=current_sim_position,
# slot_position=current_card_pool_slot, store_type=store)
# # start the task in thread
# executor.submit(commandor.start_page, proxy)
# except Exception as error:
# print(error)
# continue
with ThreadPoolExecutor(max_workers=10) as executor:
for contact in contacts:
proxy = get_proxy(contact.phone_number)
commandor = CommandorPage(contact, store_type=store)
# start the task in thread
executor.submit(commandor.start_page, proxy)
def get_proxy(phone_number):