Skip to content

Commit

Permalink
Merge pull request #63 from nwithan8/develop
Browse files Browse the repository at this point in the history
Patch fix for channel's schedule
  • Loading branch information
nwithan8 authored Oct 29, 2020
2 parents e0b337a + cdbe063 commit ee44e15
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion dizqueTV/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = '1.2.0.0'
__version__ = '1.2.0.1'
__author__ = 'Nate Harris'
8 changes: 5 additions & 3 deletions dizqueTV/channels.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,11 @@ def __init__(self,
self.transcoding = ChannelFFMPEGSettings(data=data.get('transcoding'),
dizque_instance=dizque_instance,
channel_instance=self)
self.schedule = Schedule(data=data.get('scheduleBackup'),
dizque_instance=dizque_instance,
channel_instance=self)
self.schedule = None
if data.get('scheduleBackup'):
self.schedule = Schedule(data=data.get('scheduleBackup'),
dizque_instance=dizque_instance,
channel_instance=self)
self.plex_server = plex_server
self.scheduledableItems = self._get_schedulable_items()

Expand Down
2 changes: 1 addition & 1 deletion dizqueTV/dizquetv.py
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ def add_channel(self,
:param plex_server: plexapi.server.PlexServer (optional, required if adding PlexAPI Video, Movie or Episode)
:param kwargs: keyword arguments of setting names and values
:param handle_errors: Suppress error if they arise
(ex. alter invalid channel number, add redirect if no program is included)
(ex. alter invalid channel number, add Flex Time if no program is included)
:return: new Channel object or None
"""
kwargs['programs'] = []
Expand Down

0 comments on commit ee44e15

Please sign in to comment.