fix bugs

Author: AceDroidX

LiveStreams.py

@@ -35,6 +35,10 @@ def Del(self, string):
 
 
 class Streamer:
+    state = None
+    rbcThread = None
+    queue = None
+
     def __init__(self, name, channelId):
         self.name = name
         self.channelId = channelId
@@ -46,6 +50,7 @@ def cancel(self):
     async def autocheck(self):
         while True:
             state = await self.check()
+            logging.debug(f'state:{state}--self.state:{self.state}')
             if state != self.state:
                 self.changeRebroadcast(state)
                 self.state = state
@@ -54,14 +59,20 @@ async def autocheck(self):
     def changeRebroadcast(self, state):
         logging.debug(f'改变转播状态:[{self.name}]{state}')
         if not state is None:  # 正在直播中
-            if self.rbcThread is None:
-                self.queue = queue.Queue()
-                self.rbcThread = Rebroadcast.RebroadcastThread(self.queue)
-            self.queue.put(self.name, self.channelId)
+            if not self.rbcThread is None:
+                self.queue.put('stop')
+                self.rbcThread = None
+                self.queue = None
+            self.queue = queue.Queue()
+            self.queue.put((self.name, state))
+            self.rbcThread = Rebroadcast.RebroadcastThread(self.queue)
             self.rbcThread.start()
+
         else:  # 不在直播中
             if not self.rbcThread is None:
                 self.queue.put('stop')
+                self.rbcThread = None
+                self.queue = None
 
     async def check(self):
         logging.debug('直播状态检测:'+self.name)

Rebroadcast.py

@@ -2,6 +2,7 @@
 import time
 import queue
 import logging
+import subprocess
 
 TemplateArg = r'streamlink --hls-live-edge 1 "https://www.youtube.com/watch?v={}" "best" -O | ffmpeg -re -i pipe:0 -c copy -f flv rtmp://localhost/flv/{}'
 workingdir = r'/web/hls'
@@ -13,6 +14,7 @@ def __init__(self, queue):
         # self.threadID = threadID
         self.queue = queue
         self.name, self.id = queue.get()
+        logging.debug(f'RebroadcastThread:[name]{self.name}[id]{self.id}')
 
     def run(self):
         arg = TemplateArg.format(self.id, self.name)

main.py

@@ -5,6 +5,7 @@
 import logging
 import sys
 import asyncio
+import traceback
 import aioconsole
 
 
@@ -25,11 +26,20 @@ async def mainConsole(manager):
         else:
             print('未知的控制台命令')
 
+def exception_handler(loop, context):
+    logging.error('Exception handler called')
+    traceback.print_tb(context['exception'])
+
 if __name__ == "__main__":
     logging.basicConfig(
         format='%(asctime)s[%(levelname)s]%(threadName)s>%(message)s', level=logging.DEBUG)
     logging.info('eventloop已启动')
     manager = LiveStreams.StreamerManager()
+    # manager.Add('tamaki','UC8NZiqKx6fsDT3AVcMiVFyA')
+    # add matsuri UCQ0UDLQCjY0rmuxCDE38FGg
+    # add kizunaai UC4YaOt1yT-ZeyB0OmxHgolA
+    asyncio.get_event_loop().set_debug(True)
     asyncio.ensure_future(manager.run())
     asyncio.ensure_future(mainConsole(manager))
+    asyncio.get_event_loop().set_exception_handler(exception_handler)
     asyncio.get_event_loop().run_forever()

youtube_util.py

@@ -15,7 +15,7 @@ async def getLiveVideoId(id):
 
 
 async def checkIsLive(videoid):
-    fp = urllib.request.urlopen(Request(
+    fp = urllib.request.urlopen(urllib.request.Request(
         f"https://www.youtube.com/watch?v={videoid}", headers={'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.24 Safari/537.36'}))
     mybytes = fp.read()
     fp.close()
@@ -26,7 +26,7 @@ async def checkIsLive(videoid):
 
 
 async def channelId2videoId(channelId):
-    fp = urllib.request.urlopen(Request(
+    fp = urllib.request.urlopen(urllib.request.Request(
         f"https://www.youtube.com/channel/{channelId}/live", headers={'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.24 Safari/537.36'}))
     mybytes = fp.read()
     fp.close()