rename stream_is_online to is_stream_online

このコミットが含まれているのは:
n9k 2021-04-12 12:02:38 +00:00
コミット 37140c612d
1個のファイルの変更7行の追加7行の削除

14
app.py
ファイルの表示

@ -149,7 +149,7 @@ def broadcaster():
@app.route('/stream.m3u8')
def playlist():
if not stream_is_online():
if not is_stream_online():
return abort(404)
token = request.args.get('token') or request.cookies.get('token') or new_token()
response = send_from_directory(SEGMENTS_DIR, 'stream.m3u8', add_etags=False)
@ -159,7 +159,7 @@ def playlist():
@app.route('/init.mp4')
def segment_init():
if not stream_is_online():
if not is_stream_online():
return abort(404)
token = request.args.get('token') or request.cookies.get('token') or new_token()
response = send_from_directory(SEGMENTS_DIR, f'init.mp4', add_etags=False)
@ -168,7 +168,7 @@ def segment_init():
@app.route('/stream<int:n>.m4s')
def segment_arbitrary(n):
if not stream_is_online():
if not is_stream_online():
return abort(404)
token = request.args.get('token') or request.cookies.get('token')
_view_segment(n, token)
@ -195,7 +195,7 @@ def _view_segment(n, token=None, check_exists=True):
@app.route('/stream.mp4')
def stream():
if not stream_is_online():
if not is_stream_online():
return abort(404)
token = request.cookies.get('token')
concatenated_segments = ConcatenatedSegments(segments_dir=SEGMENTS_DIR,
@ -311,7 +311,7 @@ def current_segment():
except ValueError:
return None
def stream_is_online():
def is_stream_online():
# If the playlist doesn't exist, return False
if not os.path.exists(SEGMENTS_M3U8):
return False
@ -361,7 +361,7 @@ def heartbeat():
if token in viewers:
viewers[token]['heartbeat'] = int(time.time())
return {'viewers': n_viewers(),
'online': stream_is_online(),
'online': is_stream_online(),
'current_segment': current_segment(),
'title': stream_title(),
'started': stream_start()}
@ -557,7 +557,7 @@ def stream_info():
viewer_count=n_viewers(),
stream_start_json=json.dumps(start),
stream_uptime=start_rel,
online=stream_is_online())
online=is_stream_online())
@app.route('/teapot')
def teapot():