request改为aiohttp

Author: AceDroidX

LiveStreams.py

@@ -20,8 +20,8 @@ def __init__(self, discord=None):
         self.discord = discord
 
     def Add(self, name, channelId):
-        for name, streamer in list(self.streamers.items()):
-            if streamer.channelId == string or name == string:
+        for streamername, streamer in list(self.streamers.items()):
+            if streamer.channelId == channelId or streamername == name:
                 print(f'已经添加过了[{name}]{streamer.channelId}')
                 return f'已经添加过了[{name}]{streamer.channelId}'
         self.streamers[name] = Streamer(name, channelId, self.discord)

main.py

@@ -31,13 +31,26 @@ def exception_handler(loop, context):
     logging.error('Exception handler called')
     traceback.print_exc()
 
+# https://github.com/klen/muffin/issues/18#issuecomment-182138773
+# avoid frustrating INFO messages about timeout caused by sleep(1)
+class SkipTimeouts(logging.Filter):
+    def filter(self, rec):
+        if(rec.levelno == logging.INFO and
+           rec.msg.startswith('poll') and
+           rec.msg.endswith(': timeout') and
+           990 < rec.args[0] < 1000 and
+           1000 < rec.args[1] < 1010):
+            return False  # hide this record
+        return True
+
 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已启动')
     asyncio.get_event_loop().set_debug(True)
     asyncio.get_event_loop().set_exception_handler(exception_handler)
+    logging.getLogger('asyncio').addFilter(SkipTimeouts())
     ########
     discord = Discord.DiscordClient()
     manager = LiveStreams.StreamerManager(discord)

youtube_util.py

@@ -2,6 +2,10 @@
 import logging
 import re
 import urllib.request
+import aiohttp
+
+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'}
 
 
 async def getLiveVideoId(id):
@@ -15,26 +19,30 @@ async def getLiveVideoId(id):
 
 
 async def checkIsLive(videoid):
-    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()
-    htmlsource = mybytes.decode("utf-8")
-    if re.search(r'"isLive\\":true,', htmlsource) is None:  # \"isLive\":true,
-        return None
-    return id
+    async with aiohttp.ClientSession() as session:
+        async with session.get(f"https://www.youtube.com/watch?v={videoid}", headers=headers) as r:
+            if r.status == 200:
+                htmlsource = await r.text()
+                if re.search(r'"isLive\\":true,', htmlsource) is None:  # \"isLive\":true,
+                    return None
+                return id
+            else:
+                logging.error('checkIsLive.status:'+r.status)
+                return None
 
 
 async def channelId2videoId(channelId):
-    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()
-    htmlsource = mybytes.decode("utf-8")
-    if re.search(r'"isLive\\":true,', htmlsource) is None:  # \"isLive\":true,
-        return None
-    videoid = re.search(r'(?<="videoId\\":\\")(.*?)(?=\\",)', htmlsource)
-    if re.search(r'(?<="videoId\\":\\")(.*?)(?=\\",)', htmlsource) is None:
-        logging.warn(r're.search[videoId], htmlsource) is None')
-        return None
-    return videoid.group()
+    async with aiohttp.ClientSession() as session:
+        async with session.get(f"https://www.youtube.com/channel/{channelId}/live", headers=headers) as r:
+            if r.status == 200:
+                htmlsource = await r.text()
+                if re.search(r'"isLive\\":true,', htmlsource) is None:  # \"isLive\":true,
+                    return None
+                videoid = re.search(r'(?<="videoId\\":\\")(.*?)(?=\\",)', htmlsource)
+                if re.search(r'(?<="videoId\\":\\")(.*?)(?=\\",)', htmlsource) is None:
+                    logging.warn(r're.search[videoId], htmlsource) is None')
+                    return None
+                return videoid.group()
+            else:
+                logging.error('channelId2videoId.status:'+r.status)
+                return None