github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-11 15:56:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add hours as time frame for newsletters

Browse source
This commit is contained in:
JonnyWong16 2018-04-10 21:16:16 -07:00
parent d316aa34e2
commit df72ecebf5
5 changed files with 43 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plexpy/common.py
View file

@ -522,7 +522,8 @@ NEWSLETTER_PARAMETERS = [
{'name': 'Start Date', 'type': 'str', 'value': 'start_date', 'description': 'The start date of the newesletter.'},
{'name': 'End Date', 'type': 'str', 'value': 'end_date', 'description': 'The end date of the newesletter.'},
{'name': 'Week Number', 'type': 'int', 'value': 'week_number', 'description': 'The week number of the newsletter.'},
{'name': 'Newsletter Days', 'type': 'int', 'value': 'newsletter_days', 'description': 'The past number of days included in the newsletter.'},
{'name': 'Newsletter Time Frame', 'type': 'int', 'value': 'newsletter_time_frame', 'description': 'The time frame included in the newsletter.'},
{'name': 'Newsletter Time Frame Units', 'type': 'str', 'value': 'newsletter_time_frame_units', 'description': 'The time frame units included in the newsletter.'},
{'name': 'Newsletter URL', 'type': 'str', 'value': 'newsletter_url', 'description': 'The self-hosted URL to the newsletter.'},
{'name': 'Newsletter UUID', 'type': 'str', 'value': 'newsletter_uuid', 'description': 'The unique identifier for the newsletter.'},
]

22
plexpy/newsletters.py
View file

@ -296,7 +296,8 @@ def generate_newsletter_uuid():
class Newsletter(object):
NAME = ''
_DEFAULT_CONFIG = {'custom_cron': 0,
'last_days': 7,
'time_frame': 7,
'time_frame_units': 'days',
'formatted': 1,
'notifier_id': 0}
_DEFAULT_EMAIL_CONFIG = EMAIL().return_default_config()
@ -324,7 +325,7 @@ class Newsletter(object):
pass
if self.end_date is None:
self.end_date = arrow.now().ceil('day')
self.end_date = arrow.now()
if start_date:
try:
@ -333,7 +334,10 @@ class Newsletter(object):
pass
if self.start_date is None:
self.start_date = self.end_date.shift(days=-self.config['last_days']+1).floor('day')
if self.config['time_frame_units'] == 'days':
self.start_date = self.end_date.shift(days=-self.config['time_frame']+1).floor('day')
else:
self.start_date = self.end_date.shift(hours=-self.config['time_frame']).floor('hour')
self.end_time = self.end_date.timestamp
self.start_time = self.start_date.timestamp
@ -478,7 +482,8 @@ class Newsletter(object):
'start_date': self.start_date.format(date_format),
'end_date': self.end_date.format(date_format),
'week_number': self.start_date.isocalendar()[1],
'newsletter_days': self.config['last_days'],
'newsletter_time_frame': self.config['time_frame'],
'newsletter_time_frame_units': self.config['time_frame_units'],
'newsletter_url': base_url.rstrip('/') + plexpy.HTTP_ROOT + 'newsletter/' + self.uuid,
'newsletter_uuid': self.uuid
}
@ -528,14 +533,7 @@ class Newsletter(object):
return self._return_config_options()
def _return_config_options(self):
config_options = [
{'label': 'Number of Days',
'value': self.config['last_days'],
'name': 'newsletter_config_last_days',
'description': 'The past number of days to include in the newsletter.',
'input_type': 'number'
}
]
config_options = []
return config_options

3
plexpy/webserve.py
View file

@ -5521,7 +5521,8 @@ class WebInterface(object):
"friendly_name": "",
"cron": "0 0 * * 1",
"active": 1
"config": {"last_days": 7,
"config": {"time_frame": 7,
"time_frame_units": "days",
"incl_libraries": [1, 2]
},
"email_config": {...},