github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-19 21:03:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Made the requested changes.

Browse source 
The requested changes by JonnyWong16 in the PR request were done in this
commit.
This commit is contained in:
samip5 2018-04-10 20:07:56 +03:00
commit eabea2deeb
No known key found for this signature in database
GPG key ID: 50718B4E2773CE16
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plexpy/newsletters.py
View file

@ -308,14 +308,13 @@ class Newsletter(object):
_TEMPLATE_MASTER = ''
_TEMPLATE = ''
def __init__(self, config=None, email_config=None, start_date=None, week_number=None, end_date=None,
def __init__(self, config=None, email_config=None, start_date=None, end_date=None,
subject=None, body=None, message=None):
self.config = self.set_config(config=config, default=self._DEFAULT_CONFIG)
self.email_config = self.set_config(config=email_config, default=self._DEFAULT_EMAIL_CONFIG)
self.uuid = generate_newsletter_uuid()
self.start_date = None
self.week_number = None
self.end_date = None
if end_date:
@ -333,9 +332,6 @@ class Newsletter(object):
except ValueError:
pass
if week_number is None:
self.week_number = arrow.now().isocalendar()[1]
if self.start_date is None:
self.start_date = self.end_date.shift(days=-self.config['last_days']+1).floor('day')
@ -481,7 +477,7 @@ class Newsletter(object):
'server_name': plexpy.CONFIG.PMS_NAME,
'start_date': self.start_date.format(date_format),
'end_date': self.end_date.format(date_format),
'week_number': self.week_number,
'week_number': self.start_date.isocalendar()[1],
'newsletter_days': self.config['last_days'],
'newsletter_url': base_url.rstrip('/') + plexpy.HTTP_ROOT + 'newsletter/' + self.uuid,
'newsletter_uuid': self.uuid