djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix wrong time calculation

Browse Source
This commit is contained in:
jb_alvarado 2018-01-07 22:31:06 +01:00
parent dbca973dfc
commit 2876e1a243
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ffplayout.py
View File

@ -34,36 +34,15 @@ from xml.dom import minidom
from xml.parsers.expat import ExpatError from xml.parsers.expat import ExpatError
# ------------------------------------------------------------------------------
# read variables from config file
# ------------------------------------------------------------------------------
# read config # read config
cfg = configparser.ConfigParser() cfg = configparser.ConfigParser()
cfg.read("/etc/ffplayout/ffplayout.conf") cfg.read("/etc/ffplayout/ffplayout.conf")
# get different time informations
def cur_ts(time_value, day):
start_clock = datetime.now().strftime('%H:%M:%S')
start_h, start_m, start_s = re.split(':', start_clock)
time_in_sec = int(start_h) * 3600 + int(start_m) * 60 + int(start_s)
if time_value == 't_hour':
return start_h
elif time_value == 't_full':
return time_in_sec
elif time_value == 't_date':
t_from_cfg = int(cfg.get('PLAYLIST', 'day_start'))
if int(start_h) < t_from_cfg and day != 'today':
yesterday = date.today() - timedelta(1)
list_date = yesterday.strftime('%Y-%m-%d')
else:
list_date = datetime.now().strftime('%Y-%m-%d')
return list_date
# ------------------------------------------------------------------------------
# read values from config file
# ------------------------------------------------------------------------------
class _mail: class _mail:
server = cfg.get('MAIL', 'smpt_server') server = cfg.get('MAIL', 'smpt_server')
port = cfg.get('MAIL', 'smpt_port') port = cfg.get('MAIL', 'smpt_port')
@ -87,9 +66,6 @@ class _playlist:
path = cfg.get('PLAYLIST', 'playlist_path') path = cfg.get('PLAYLIST', 'playlist_path')
start = int(cfg.get('PLAYLIST', 'day_start')) start = int(cfg.get('PLAYLIST', 'day_start'))
if cur_ts('t_full', '0') > 0 and cur_ts('t_full', '0') < start:
start += 86400
class _buffer: class _buffer:
length = cfg.get('BUFFER', 'buffer_length') length = cfg.get('BUFFER', 'buffer_length')
@ -121,6 +97,26 @@ class _playout:
# global functions # global functions
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# get different time informations
def cur_ts(time_value, day):
start_clock = datetime.now().strftime('%H:%M:%S')
start_h, start_m, start_s = re.split(':', start_clock)
time_in_sec = int(start_h) * 3600 + int(start_m) * 60 + int(start_s)
if time_value == 't_hour':
return start_h
elif time_value == 't_full':
return time_in_sec
elif time_value == 't_date':
if int(start_h) < int(_playlist.start) and day != 'today':
yesterday = date.today() - timedelta(1)
list_date = yesterday.strftime('%Y-%m-%d')
else:
list_date = datetime.now().strftime('%Y-%m-%d')
return list_date
# send error messages to email addresses # send error messages to email addresses
def send_mail(message, path): def send_mail(message, path):
if _mail.recip: if _mail.recip:
@ -271,7 +267,11 @@ def get_from_playlist(last_time, list_date, seek_in_clip):
# independent thread for clip preparation # independent thread for clip preparation
def play_clips(out_file): def play_clips(out_file):
if cur_ts('t_full', '0') > 0 and cur_ts('t_full', '0') < _playlist.start:
last_time = int(cur_ts('t_full', '0')) + 86400
else:
last_time = cur_ts('t_full', '0') last_time = cur_ts('t_full', '0')
list_date = cur_ts('t_date', '0') list_date = cur_ts('t_date', '0')
seek_in_clip = True seek_in_clip = True