改bug

Author: AceDroidX

Discord.py

@@ -1,24 +1,27 @@
 import APIKey
 import logging
 import discord
+import asyncio
 
 
 class DiscordClient(discord.Client):
-    self.channel = None
+    channel = None
 
-    def __init__(self, manage):
+    def __init__(self, manage=None):
+        super().__init__()
         self.manage = manage
-        self.client = discord.Client()
 
-    async def start(self):
-        await client.start(APIKey.dc_bot_token)
+    def set_manage(self, manage):
+        self.manage = manage
 
     async def on_ready(self):
-        print('Discord:We have logged in as {0.user}'.format(client))
+        print(f'Discord:We have logged in as {self.user}')
 
     async def on_message(self, message):
-        if message.author == client.user:
+        if message.author == self.user:
             return
+        logging.debug(
+            'DiscordClient.on_message.message.content:'+message.content)
         if message.content.startswith('/vtblive hello'):
             await message.channel.send('Hello!')
         elif message.content.startswith('/vtblive init'):

LiveStreams.py

@@ -13,16 +13,20 @@
 
 
 class StreamerManager:
+    discord = None
     streamers = {}
 
+    def __init__(self, discord=None):
+        self.discord = discord
+
     async def run(self):
         logging.debug('启动直播流管理')
         # while True:
         #     for name, streamer in list(self.streamers.items()):
         #         state = streamer.getState()
 
     def Add(self, name, channelId):
-        self.streamers[name] = Streamer(name, channelId)
+        self.streamers[name] = Streamer(name, channelId, self.discord)
         print('成功添加:['+name+']'+channelId)
         return '成功添加:['+name+']'+channelId
 
@@ -57,11 +61,11 @@ async def autocheck(self):
             state = await self.check()
             logging.debug(f'state:{state}--self.state:{self.state}')
             if state != self.state:
-                self.changeRebroadcast(state)
+                await self.changeRebroadcast(state)
                 self.state = state
             await asyncio.sleep(15)
 
-    def changeRebroadcast(self, state):
+    async def changeRebroadcast(self, state):
         logging.debug(f'改变转播状态:[{self.name}]{state}')
         if not state is None:  # 正在直播中
             if not self.rbcThread is None:
@@ -72,13 +76,14 @@ def changeRebroadcast(self, state):
             self.queue.put((self.name, state))
             self.rbcThread = Rebroadcast.RebroadcastThread(self.queue)
             self.rbcThread.start()
-            self.sendMessage(f'{self.name}正在直播中:https://www.youtube.com/watch?v={state}')
+            await self.sendMessage(
+                f'{self.name}正在直播中:https://www.youtube.com/watch?v={state}\n转播链接:https://live.acedroidx.top/?stream={self.name}')
         else:  # 不在直播中
             if not self.rbcThread is None:
                 self.queue.put('stop')
                 self.rbcThread = None
                 self.queue = None
-            self.sendMessage(f'{self.name}直播已结束')
+            await self.sendMessage(f'{self.name}直播已结束')
 
     async def check(self):
         logging.debug('直播状态检测:'+self.name)
@@ -89,5 +94,8 @@ async def check(self):
     def getState(self):
         return self.state
 
-    def sendMessage(self,msg):
-        self.discord.send_message(msg)
+    async def sendMessage(self, msg):
+        if self.discord is None:
+            logging.warning('Streamer.discord is None')
+            return
+        await self.discord.send_message(msg)

main.py

@@ -28,20 +28,22 @@ async def mainConsole(manager):
 
 def exception_handler(loop, context):
     logging.error('Exception handler called')
-    traceback.print_tb(context['exception'])
+    traceback.print_exc()
 
 if __name__ == "__main__":
     logging.basicConfig(
         format='%(asctime)s[%(levelname)s]%(threadName)s>%(message)s', level=logging.DEBUG)
+    logging.getLogger('discord').setLevel(logging.INFO)
     logging.info('eventloop已启动')
-    manager = LiveStreams.StreamerManager()
-    discord = Discord.DiscordClient(manager)
+    discord = Discord.DiscordClient()
+    manager = LiveStreams.StreamerManager(discord)
+    discord.set_manage(manager)
     # manager.Add('tamaki','UC8NZiqKx6fsDT3AVcMiVFyA')
     # add matsuri UCQ0UDLQCjY0rmuxCDE38FGg
     # add kizunaai UC4YaOt1yT-ZeyB0OmxHgolA
     asyncio.get_event_loop().set_debug(True)
+    asyncio.ensure_future(discord.start(APIKey.dc_bot_token))
     asyncio.ensure_future(manager.run())
     asyncio.ensure_future(mainConsole(manager))
-    asyncio.ensure_future(discord.start(manager))
     asyncio.get_event_loop().set_exception_handler(exception_handler)
     asyncio.get_event_loop().run_forever()