Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add timeout to login process #532

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add timeout to login process #532

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6acdb3b
Add timeout
Oct 10, 2017
974f0de
Add timeout callback
Oct 10, 2017
0166af7
Update doc
Oct 10, 2017
c5a0767
get current timestamp only when timeout=true
excelle08 Dec 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion itchat/components/login.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ def load_login(core):
core.logout = logout

def login(self, enableCmdQR=False, picDir=None, qrCallback=None,
loginCallback=None, exitCallback=None):
loginCallback=None, exitCallback=None, timeout=None, timeoutCallback=None):
start_time = time.time()
if self.alive or self.isLogging:
logger.warning('itchat has already logged in.')
return
Expand All @@ -50,6 +51,14 @@ def login(self, enableCmdQR=False, picDir=None, qrCallback=None,
logger.info('Please scan the QR code to log in.')
isLoggedIn = False
while not isLoggedIn:
now = time.time()
if timeout and (now - start_time) >= timeout:
excelle08 marked this conversation as resolved.
Show resolved Hide resolved
logger.warning('Login timeout, exit.')
if hasattr(timeoutCallback, '__call__'):
timeoutCallback()
print('Timeout as user setting.')
return

status = self.check_login()
if hasattr(qrCallback, '__call__'):
qrCallback(uuid=self.uuid, status=status, qrcode=qrStorage.getvalue())
Expand Down
8 changes: 5 additions & 3 deletions itchat/components/register.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def load_register(core):

def auto_login(self, hotReload=False, statusStorageDir='itchat.pkl',
enableCmdQR=False, picDir=None, qrCallback=None,
loginCallback=None, exitCallback=None):
loginCallback=None, exitCallback=None, timeout=None, timeoutCallback=None):
if not test_connect():
logger.info("You can't get access to internet or wechat domain, so exit.")
sys.exit()
Expand All @@ -29,11 +29,13 @@ def auto_login(self, hotReload=False, statusStorageDir='itchat.pkl',
loginCallback=loginCallback, exitCallback=exitCallback):
return
self.login(enableCmdQR=enableCmdQR, picDir=picDir, qrCallback=qrCallback,
loginCallback=loginCallback, exitCallback=exitCallback)
loginCallback=loginCallback, exitCallback=exitCallback, timeout=timeout,
timeoutCallback=timeoutCallback)
self.dump_login_status(statusStorageDir)
else:
self.login(enableCmdQR=enableCmdQR, picDir=picDir, qrCallback=qrCallback,
loginCallback=loginCallback, exitCallback=exitCallback)
loginCallback=loginCallback, exitCallback=exitCallback, timeout=timeout,
timeoutCallback=timeoutCallback)

def configured_reply(self):
''' determine the type of message and reply if its method is defined
Expand Down
16 changes: 14 additions & 2 deletions itchat/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ def __init__(self):
self.useHotReload, self.hotReloadDir = False, 'itchat.pkl'
self.receivingRetryCount = 5
def login(self, enableCmdQR=False, picDir=None, qrCallback=None,
loginCallback=None, exitCallback=None):
loginCallback=None, exitCallback=None, timeout=None,
timeoutCallback=None):
''' log in like web wechat does
for log in
- a QR code will be downloaded and opened
Expand All @@ -45,6 +46,11 @@ def login(self, enableCmdQR=False, picDir=None, qrCallback=None,
- if not set, screen is cleared and qrcode is deleted
- exitCallback: callback after logged out
- it contains calling of logout
- timeout: the login process will forcibly end after dedicated
timeout seconds
- if not set, login process will always wait until user
scan the QRCode to proceed.
- timeoutCallback: callback after timeout
for usage
..code::python

Expand Down Expand Up @@ -399,7 +405,8 @@ def load_login_status(self, fileDir,
raise NotImplementedError()
def auto_login(self, hotReload=False, statusStorageDir='itchat.pkl',
enableCmdQR=False, picDir=None, qrCallback=None,
loginCallback=None, exitCallback=None):
loginCallback=None, exitCallback=None, timeout=None,
timeoutCallback=None):
''' log in like web wechat does
for log in
- a QR code will be downloaded and opened
Expand All @@ -416,6 +423,11 @@ def auto_login(self, hotReload=False, statusStorageDir='itchat.pkl',
- exitCallback: callback after logged out
- it contains calling of logout
- qrCallback: method that should accept uuid, status, qrcode
- timeout: the login process will forcibly end after dedicated
timeout seconds
- if not set, login process will always wait until user
scan the QRCode to proceed.
- timeoutCallback: callback after timeout
for usage
..code::python

Expand Down