diff --git a/iptv/__init__.py b/iptv/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/iptv/downloadchannels.py b/iptv/downloadchannels.py index 73b6c2f..cb7800e 100644 --- a/iptv/downloadchannels.py +++ b/iptv/downloadchannels.py @@ -10,7 +10,7 @@ from appPublic.streamhttpclient import StreamHttpClient from appPublic.uniqueID import getID from appPublic.log import debug from sqlor.dbpools import DBPools -import m3u +from iptv import m3u async def download(url): client = StreamHttpClient() diff --git a/iptv/init.py b/iptv/init.py index 17fad6a..cc5b3af 100644 --- a/iptv/init.py +++ b/iptv/init.py @@ -1,16 +1,17 @@ +from ahserver.serverenv import ServerEnv from iptv.downloadchannels import load_url_iptv from iptv.m3u8test import kickout_badchannels async def get_channel_by_id(id): - db = DBPools() + db = DBPools() env = ServerEnv() dbname = env.get_module_dbname('iptv') - async with db.sqlorContext(dbname) as sor: - recs = await sor.R('iptvchannels', {'id':id, 'del_flg':'0'}) - if len(recs) < 1: - return None - return recs[0] - return None + async with db.sqlorContext(dbname) as sor: + recs = await sor.R('iptvchannels', {'id':id, 'del_flg':'0'}) + if len(recs) < 1: + return None + return recs[0] + return None def load_iptv(): env = ServerEnv() diff --git a/iptv/m3u8test.py b/iptv/m3u8test.py index d3e59a9..7f6f509 100644 --- a/iptv/m3u8test.py +++ b/iptv/m3u8test.py @@ -14,7 +14,7 @@ async def test_channels(channels): except ClientConnectionError as e: c.error_code = 499 badchannels.append(c) - except Exception as e + except Exception as e: debug(f'{c.url}, {e}') c.errorcode = x.status_code badchannels.append(c)