diff --git a/plexpy/common.py b/plexpy/common.py index 50dc6f37..3500efc8 100644 --- a/plexpy/common.py +++ b/plexpy/common.py @@ -520,8 +520,8 @@ NEWSLETTER_PARAMETERS = [ 'parameters': [ {'name': 'Server Name', 'type': 'str', 'value': 'server_name', 'description': 'The name of your Plex Server.'}, {'name': 'Start Date', 'type': 'str', 'value': 'start_date', 'description': 'The start date of the newesletter.'}, - {'name': 'Week Number', 'type': 'int', 'value': 'week_number', 'description': 'The week number of current week.'}, {'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 current week.'}, {'name': 'Newsletter Days', 'type': 'int', 'value': 'newsletter_days', 'description': 'The past number of days 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.'}, diff --git a/plexpy/newsletters.py b/plexpy/newsletters.py index 94cad245..f4071311 100644 --- a/plexpy/newsletters.py +++ b/plexpy/newsletters.py @@ -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