Fix YouTube shortlink incompatibility, remove 'graceful' SIGTERM.
Signed-off-by: Abdulkadir Furkan Şanlı <me@abdulocra.cy>
This commit is contained in:
parent
a181660836
commit
de13265915
16
main.py
16
main.py
@ -5,7 +5,6 @@ import asyncio
|
|||||||
import os
|
import os
|
||||||
import pickle
|
import pickle
|
||||||
import re
|
import re
|
||||||
import signal
|
|
||||||
import sqlite3
|
import sqlite3
|
||||||
import sys
|
import sys
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
@ -181,7 +180,7 @@ async def message_callback(client, room, event):
|
|||||||
)
|
)
|
||||||
|
|
||||||
for link in youtube_links:
|
for link in youtube_links:
|
||||||
video_id = link.split("v=")[-1]
|
video_id = link.split("v=")[-1].split("&")[0].split("/")[-1]
|
||||||
if is_music(youtube, video_id):
|
if is_music(youtube, video_id):
|
||||||
try:
|
try:
|
||||||
cursor.execute(
|
cursor.execute(
|
||||||
@ -248,23 +247,12 @@ async def get_client():
|
|||||||
return client
|
return client
|
||||||
|
|
||||||
|
|
||||||
def sigterm_handler(signum, frame):
|
|
||||||
"""Gracefully stop syncing on SIGTERM."""
|
|
||||||
asyncio.get_event_loop().stop()
|
|
||||||
|
|
||||||
|
|
||||||
async def main():
|
async def main():
|
||||||
"""Get DB and Matrix client ready, and start syncing."""
|
"""Get DB and Matrix client ready, and start syncing."""
|
||||||
define_tables()
|
define_tables()
|
||||||
client = await get_client()
|
client = await get_client()
|
||||||
signal.signal(signal.SIGTERM, sigterm_handler)
|
|
||||||
sync_token = load_sync_token()
|
sync_token = load_sync_token()
|
||||||
try:
|
await client.sync_forever(30000, full_state=True, since=sync_token)
|
||||||
await client.sync_forever(30000, full_state=True, since=sync_token)
|
|
||||||
finally:
|
|
||||||
conn.close()
|
|
||||||
await client.logout()
|
|
||||||
sys.exit()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
Loading…
Reference in New Issue
Block a user