deflax/television
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: deflax:eec8482df310fb64c126f96d2b70a6810ea57d42
Branches Tags
deflax:main
..
compare: deflax:a576869f0540f468eabc8fe993a7748466172a3b
Branches Tags
deflax:main

No commits in common. "eec8482df310fb64c126f96d2b70a6810ea57d42" and "a576869f0540f468eabc8fe993a7748466172a3b" have entirely different histories.
eec8482df3 ... a576869f05

2 changed files with 5 additions and 5 deletions
Show stats Expand all files Collapse all files

6
src/discordbot/discordbot.py
View file

@ -157,9 +157,9 @@ async def query_database():
video_download_url = f'https://{scheduler_hostname}/video/download/{video_filename}' video_download_url = f'https://{scheduler_hostname}/video/download/{video_filename}'
video_filename_no_extension = video_filename.split('.')[0] video_filename_no_extension = video_filename.split('.')[0]
video_watch_url = f'https://{scheduler_hostname}/video/watch/{video_filename_no_extension}' video_watch_url = f'https://{scheduler_hostname}/video/watch/{video_filename_no_extension}'
embed = discord.Embed(title=f'VOD: {video_filename_no_extension}', embed = discord.Embed(title=f'{rec_stream_name}',
url=f'{video_watch_url}', url=f'{video_watch_url}',
description=f'{rec_stream_name}', description=f'{video_filename_no_extension}',
colour=0x00b0f4, colour=0x00b0f4,
timestamp=datetime.now()) timestamp=datetime.now())
embed.add_field(name="Download", embed.add_field(name="Download",
@ -169,7 +169,7 @@ async def query_database():
value=f'[plyr.js player]({video_watch_url}) :]', value=f'[plyr.js player]({video_watch_url}) :]',
inline=True) inline=True)
#embed.set_image(url=thumb_url) #embed.set_image(url=thumb_url)
#embed.set_thumbnail(url=f'{img_url}/logo-96.png') embed.set_thumbnail(url=f'{img_url}/logo-96.png')
embed.set_footer(text="DeflaxTV", embed.set_footer(text="DeflaxTV",
icon_url=f'{img_url}/logo-96.png') icon_url=f'{img_url}/logo-96.png')
# Sending the embed to the channel # Sending the embed to the channel

4
src/scheduler/scheduler.py
View file

@ -61,7 +61,7 @@ def process_running_channel(database, scheduler, stream_id, stream_name, stream_
if stream_start == "never": if stream_start == "never":
# Skip channels that are set to never start automatically # Skip channels that are set to never start automatically
return return
logger_job.warning(f'{stream_id} ({stream_name}) has been registered.') logger_job.warning(f'{stream_id} ({stream_name}) has been registered to the database')
if stream_start == "now": if stream_start == "now":
logger_job.warning("Stream should start now. Preparing") logger_job.warning("Stream should start now. Preparing")
# Check if the stream_hls_url returns 200 # Check if the stream_hls_url returns 200
@ -99,7 +99,7 @@ def remove_channel_from_database(database, scheduler, stream_id, stream_name, st
global playhead global playhead
global rechead global rechead
if stream_id in database: if stream_id in database:
logger_job.warning(f'{stream_id} ({stream_name}) will be removed. Reason: {state.exec}') logger_job.warning(f'{stream_id} ({stream_name}) will be removed from the database. Reason: {state.exec}')
database.pop(stream_id) database.pop(stream_id)
try: try:
scheduler.remove_job(stream_id) scheduler.remove_job(stream_id)