Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Addlast kwarg torun_repeating#1345

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.

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

Already on GitHub?Sign in to your account

Closed
Show file tree
Hide file tree
Changes fromall commits
Commits
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
1 change: 1 addition & 0 deletionsAUTHORS.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,7 @@ The following wonderful people contributed directly or indirectly to this projec
- `Oleg Sushchenko <https://github.com/feuillemorte>`_
- `Or Bin <https://github.com/OrBin>`_
- `overquota <https://github.com/overquota>`_
- `Paolo Lammens <https://github.com/plammens>`_
- `Patrick Hofmann <https://github.com/PH89>`_
- `Paul Larsen <https://github.com/PaulSonOfLars>`_
- `Pieter Schutz <https://github.com/eldinnie>`_
Expand Down
101 changes: 77 additions & 24 deletionstelegram/ext/jobqueue.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,27 +70,19 @@ def __init__(self):
def set_dispatcher(self, dispatcher):
self._dispatcher = dispatcher

def _put(self, job, next_t=None, last_t=None):
if next_t is None:
next_t = job.interval
if next_t is None:
raise ValueError('next_t is None')

if isinstance(next_t, datetime.datetime):
next_t = (next_t - datetime.datetime.now()).total_seconds()

elif isinstance(next_t, datetime.time):
next_datetime = datetime.datetime.combine(datetime.date.today(), next_t)

if datetime.datetime.now().time() > next_t:
next_datetime += datetime.timedelta(days=1)

next_t = (next_datetime - datetime.datetime.now()).total_seconds()

elif isinstance(next_t, datetime.timedelta):
next_t = next_t.total_seconds()
def _put(self, job, next_t=None, previous_t=None):
# """
# Enqueues the job, scheduling its next run at `<previous> + <interval>`.
# `<previous>` is the previous time the job was run, stored in `previous_t`,
# and defaults to `None`.
# `<interval>` is a time interval in seconds, and is calculated from the
# `next_t` kwarg (if given) or the job's interval.
# """

next_t += last_t or time.time()
# get time at which to run:
next_t = _to_timestamp(next_t or job.interval, previous_t=previous_t)
if next_t is None:
raise ValueError("'next_t' is None'")

self.logger.debug('Putting job %s with t=%f', job.name, next_t)

Expand DownExpand Up@@ -136,7 +128,7 @@ def run_once(self, callback, when, context=None, name=None):
self._put(job, next_t=when)
return job

def run_repeating(self, callback, interval, first=None, context=None, name=None):
def run_repeating(self, callback, interval, first=None,last=None,context=None, name=None):
"""Creates a new ``Job`` that runs at specified intervals and adds it to the queue.

Args:
Expand All@@ -163,6 +155,11 @@ def run_repeating(self, callback, interval, first=None, context=None, name=None)
tomorrow.

Defaults to ``interval``
last (:obj:`int` | :obj:`float` | :obj:`datetime.timedelta` | \
:obj:`datetime.datetime` | :obj:`datetime.time`, optional):
Time in or at which the job should stop running.
This parameter will be interpreted depending on its type (same as for `first`).
If `None`, the job will run indefinitely.
context (:obj:`object`, optional): Additional data needed for the callback function.
Can be accessed through ``job.context`` in the callback. Defaults to ``None``.
name (:obj:`str`, optional): The name of the new job. Defaults to
Expand All@@ -176,6 +173,7 @@ def run_repeating(self, callback, interval, first=None, context=None, name=None)
job = Job(callback,
interval=interval,
repeat=True,
finish_time=last,
context=context,
name=name,
job_queue=self)
Expand DownExpand Up@@ -248,6 +246,9 @@ def tick(self):
self._set_next_peek(t)
break

delay_buffer = 0.01 # tolerance for last
if job.finish_time is not None and now > job.finish_time + delay_buffer:
job.schedule_removal() # job shouldn't run anymore
if job.removed:
self.logger.debug('Removing job %s', job.name)
continue
Expand All@@ -266,9 +267,9 @@ def tick(self):
self.logger.debug('Skipping disabled job %s', job.name)

if job.repeat and not job.removed:
self._put(job,last_t=t)
self._put(job,previous_t=t)
else:
self.logger.debug('Dropping non-repeatingorremoved job %s', job.name)
self.logger.debug('Dropping non-repeating, removed,orfinished job %s', job.name)

def start(self):
"""Starts the job_queue thread."""
Expand DownExpand Up@@ -359,6 +360,7 @@ def __init__(self,
callback,
interval=None,
repeat=True,
finish_time=None,
context=None,
days=Days.EVERY_DAY,
name=None,
Expand All@@ -368,10 +370,12 @@ def __init__(self,
self.context = context
self.name = name or callback.__name__

self._repeat =repeat
self._repeat =None
self._interval = None
self._finish_time = None
self.interval = interval
self.repeat = repeat
self.finish_time = finish_time

self._days = None
self.days = days
Expand DownExpand Up@@ -454,6 +458,20 @@ def repeat(self, repeat):
raise ValueError("'repeat' can not be set to 'True' when no 'interval' is set")
self._repeat = repeat

@property
def finish_time(self):
""":obj:`float`: Optional. Time at which the job should stop repeating."""
return self._finish_time

@finish_time.setter
def finish_time(self, time_):
if time_ is not None:
if not self.repeat:
raise ValueError("'finish_time' cannot be set if job doesn't repeat")
self._finish_time = _to_timestamp(time_)
else:
self._finish_time = None

@property
def days(self):
"""Tuple[:obj:`int`]: Optional. Defines on which days of the week the job should run."""
Expand DownExpand Up@@ -488,3 +506,38 @@ def job_queue(self, job_queue):

def __lt__(self, other):
return False


def _to_timestamp(t, previous_t=None):
# """
# Converts a given time object (i.e., `datetime.datetime`,
# `datetime.time`, `datetime.timedelta`, interval from now
# in seconds) to POSIX timestamp. Used for converting given
# kwargs like `first` to a uniform format.
# """

now = time.time()
previous_t = previous_t or now

if t is None:
return None

if isinstance(t, datetime.timedelta):
return previous_t + t.total_seconds()

if isinstance(t, Number):
return previous_t + t

if isinstance(t, datetime.time):
date = datetime.date.today()

if t < datetime.datetime.today().time():
date += datetime.timedelta(days=1)

t = datetime.datetime.combine(date, t)

if isinstance(t, datetime.datetime):
# replacement for datetime.datetime.timestamp() for py2
return (t - datetime.datetime.fromtimestamp(now)).total_seconds() + now

raise TypeError('Unable to convert to timestamp')
7 changes: 7 additions & 0 deletionstests/test_jobqueue.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,13 @@ def test_run_repeating_first(self, job_queue):
sleep(0.07)
assert self.result == 1

def test_run_repeating_last(self, job_queue):
job_queue.run_repeating(self.job_run_once, 0.05, last=0.1)
sleep(0.12)
assert self.result == 2
sleep(0.1)
assert self.result == 2

def test_multiple(self, job_queue):
job_queue.run_once(self.job_run_once, 0.01)
job_queue.run_once(self.job_run_once, 0.02)
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp