mirror of
https://github.com/evilhero/mylar
synced 2024-12-23 00:02:38 +00:00
21eee17344
torrents will now properly hide torrent information, IMP: Specified daemon port for deluge as an on-screen tip for more detail, IMP: Added 100,200,ALL as viewable watchlist views, FIX: When viewing pullist and annual integration enabled, if annual was present would incorrectly link to invalid annual series instead of the actual series itself, IMP: Added more detail error messages to metatagging errors and better handling of stranded files during cleanup, IMP: Improved some handling for weekly pull-list one-off's and refactored the nzb/oneoff post-processing into a seperate function for future callables, Moved all the main url locations for public torrent sites to the init module so that it can be cascaded down for use in other modules instead as a global, IMP: Added a 'deep_search_32p' variable in the config.ini for specific usage with 32p, where if there is more than one result will dig deeper into each result to try and figure out if there are series matches, as opposed to the default where it will only use ref32p table if available or just the first hit in a multiple series search results and ignore the remainder, FIX:Fixed some unknown characters appearing in the pullist due to unicode-related conversion problems, FIX: fixed some special cases of file parsing errors due to Volume label being named different than expected, FIX: Added a 3s pause between experimental searches to try and not hit their frequency limitation, IMP: Weekly Pullist One-off's will now show status of Snatched/Downloaded as required, FIX: Fixed some deluge parameter problems when using auto-snatch torrent script/option, IMP: Changed the downlocation in the auto-snatch option to an env variable instead of being passed to avoid unicode-related problems, FIX: Fixed some magnet-related issues for torrents when using a watchdir + TPSE, FIX: Added more verbose error message for rtorrent connection issues, FIX: Could not connect to rtorrent client if no username/password were provided, IMP: Set the db updater to run every 5 minutes on the watchlist, automatically refreshing the oldest updated series each time that is more than 5 hours old (force db update from the activity/job schedulers page will run the db updater against the entire watchlist in sequence), IMP: Attempt to handle long paths in windows (ie. > 256c) by prepending the unicode windows api character to the import a directory path (windows only), IMP: When manual metatagging a series, will update the series after all the metatagging has been completed as opposed to after each issue, IMP: Will now display available inkdrops on Config/Search Providers tab when using 32P (future will utilize/indicate inkdrop threshold when downloading)
92 lines
3.7 KiB
Python
92 lines
3.7 KiB
Python
from datetime import timedelta, datetime
|
|
from math import ceil
|
|
|
|
from tzlocal import get_localzone
|
|
|
|
from apscheduler.triggers.base import BaseTrigger
|
|
from apscheduler.util import convert_to_datetime, timedelta_seconds, datetime_repr, astimezone
|
|
|
|
|
|
class IntervalTrigger(BaseTrigger):
|
|
"""
|
|
Triggers on specified intervals, starting on ``start_date`` if specified, ``datetime.now()`` +
|
|
interval otherwise.
|
|
|
|
:param int weeks: number of weeks to wait
|
|
:param int days: number of days to wait
|
|
:param int hours: number of hours to wait
|
|
:param int minutes: number of minutes to wait
|
|
:param int seconds: number of seconds to wait
|
|
:param datetime|str start_date: starting point for the interval calculation
|
|
:param datetime|str end_date: latest possible date/time to trigger on
|
|
:param datetime.tzinfo|str timezone: time zone to use for the date/time calculations
|
|
"""
|
|
|
|
__slots__ = 'timezone', 'start_date', 'end_date', 'interval', 'interval_length'
|
|
|
|
def __init__(self, weeks=0, days=0, hours=0, minutes=0, seconds=0, start_date=None,
|
|
end_date=None, timezone=None):
|
|
self.interval = timedelta(weeks=weeks, days=days, hours=hours, minutes=minutes,
|
|
seconds=seconds)
|
|
self.interval_length = timedelta_seconds(self.interval)
|
|
if self.interval_length == 0:
|
|
self.interval = timedelta(seconds=1)
|
|
self.interval_length = 1
|
|
|
|
if timezone:
|
|
self.timezone = astimezone(timezone)
|
|
elif isinstance(start_date, datetime) and start_date.tzinfo:
|
|
self.timezone = start_date.tzinfo
|
|
elif isinstance(end_date, datetime) and end_date.tzinfo:
|
|
self.timezone = end_date.tzinfo
|
|
else:
|
|
self.timezone = get_localzone()
|
|
|
|
start_date = start_date or (datetime.now(self.timezone) + self.interval)
|
|
self.start_date = convert_to_datetime(start_date, self.timezone, 'start_date')
|
|
self.end_date = convert_to_datetime(end_date, self.timezone, 'end_date')
|
|
|
|
def get_next_fire_time(self, previous_fire_time, now):
|
|
if previous_fire_time:
|
|
next_fire_time = previous_fire_time + self.interval
|
|
elif self.start_date > now:
|
|
next_fire_time = self.start_date
|
|
else:
|
|
timediff_seconds = timedelta_seconds(now - self.start_date)
|
|
next_interval_num = int(ceil(timediff_seconds / self.interval_length))
|
|
next_fire_time = self.start_date + self.interval * next_interval_num
|
|
|
|
if not self.end_date or next_fire_time <= self.end_date:
|
|
return self.timezone.normalize(next_fire_time)
|
|
|
|
def __getstate__(self):
|
|
return {
|
|
'version': 1,
|
|
'timezone': self.timezone,
|
|
'start_date': self.start_date,
|
|
'end_date': self.end_date,
|
|
'interval': self.interval
|
|
}
|
|
|
|
def __setstate__(self, state):
|
|
# This is for compatibility with APScheduler 3.0.x
|
|
if isinstance(state, tuple):
|
|
state = state[1]
|
|
|
|
if state.get('version', 1) > 1:
|
|
raise ValueError(
|
|
'Got serialized data for version %s of %s, but only version 1 can be handled' %
|
|
(state['version'], self.__class__.__name__))
|
|
|
|
self.timezone = state['timezone']
|
|
self.start_date = state['start_date']
|
|
self.end_date = state['end_date']
|
|
self.interval = state['interval']
|
|
self.interval_length = timedelta_seconds(self.interval)
|
|
|
|
def __str__(self):
|
|
return 'interval[%s]' % str(self.interval)
|
|
|
|
def __repr__(self):
|
|
return "<%s (interval=%r, start_date='%s', timezone='%s')>" % (
|
|
self.__class__.__name__, self.interval, datetime_repr(self.start_date), self.timezone)
|