修复了console

Author: yjqiang

bilibili.py

@@ -210,7 +210,7 @@ async def request_send_danmu_msg_andriod(self, msg, roomId):
             # 必须为 "json"
             'type': "json"
         }
-        print('send msg app')
+        # print('send msg app')
 
         response = await self.bili_section_post(url, headers=self.dic_bilibili['appheaders'], data=data)
         return response

biliconsole.py

@@ -2,6 +2,7 @@
 from statistics import Statistics
 from connect import connect
 from printer import Printer
+import threading
 import asyncio
 
 def guide_of_console():
@@ -19,28 +20,27 @@ def guide_of_console():
     print('￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣')
 
 
-async def preprocess_send_danmu_msg_andriod():
+def preprocess_send_danmu_msg_andriod():
     msg = input('请输入要发送的信息:')
     roomid = input('请输入要发送的房间号:')
-    await utils.send_danmu_msg_andriod(msg, int(roomid))
+    Biliconsole().append2list_console([[msg, int(roomid)], utils.send_danmu_msg_andriod])
 
-async def preprocess_send_danmu_msg_web():
+def preprocess_send_danmu_msg_web():
     msg = input('请输入要发送的信息:')
     roomid = input('请输入要发送的房间号:')
-    await utils.send_danmu_msg_web(msg, int(roomid))
+    Biliconsole().append2list_console([[msg, int(roomid)], utils.send_danmu_msg_web])
 
-async def preprocess_check_room():
+def preprocess_check_room():
     roomid = input('请输入要转化的房间号:')
-    await utils.check_room(roomid)
+    Biliconsole().append2list_console([[roomid], utils.check_room])
 
 def process_send_gift_web():
-    utils.fetch_bag_list(verbose=True)
+    Biliconsole().append2list_console([[True], utils.fetch_bag_list])
     bagid = input('请输入要发送的礼物编号:')
-    giftid = utils.fetch_bag_list(bagid=bagid)
     # print('是谁', giftid)
     giftnum = input('请输入要发送的礼物数目:')
     roomid = input('请输入要发送的房间号:')
-    utils.send_gift_web(roomid, giftid, giftnum, bagid)
+    Biliconsole().append2list_console([[roomid, [[False, bagid],utils.fetch_bag_list], giftnum, bagid],utils.send_gift_web])
 
 def preprocess_change_danmuji_roomid():
     roomid = input('请输入roomid')
@@ -57,14 +57,14 @@ def change_printer_dic_user():
 options ={
     '1': Statistics().getlist,
     '2': Statistics().getresult,
-    '3': utils.fetch_bag_list,
-    '4': utils.fetch_medal,
-    '5': utils.fetch_user_info,
-    '6': utils.check_taskinfo,
-    '7': preprocess_send_danmu_msg_andriod,
-    '8': preprocess_send_danmu_msg_web,
-    '9': preprocess_check_room,
-    '10': process_send_gift_web,
+    '3': utils.fetch_bag_list,#async
+    '4': utils.fetch_medal,#async
+    '5': utils.fetch_user_info,#async
+    '6': utils.check_taskinfo,#async
+    '7': preprocess_send_danmu_msg_andriod,#input async
+    '8': preprocess_send_danmu_msg_web,#input async
+    '9': preprocess_check_room,#input async
+    '10': process_send_gift_web,#input async !!!
     '11': preprocess_change_danmuji_roomid,
     '12': change_printer_dic_user,
     'help': guide_of_console
@@ -73,25 +73,68 @@ def change_printer_dic_user():
 def return_error():
     print('命令无法识别，请重新输入')
 
-async def controler():
+def controler():
     while True:
         x = input('')
-        if x == '7':
+        # input and async
+        if x == ['7', '8', '9', '10']:
             # func = options.get(x, return_error)
-            await preprocess_check_room()
+            args, func = options.get(x, return_error)()
+            #print(args)
+            #Biliconsole().append2list_console(answer)
+        # async
+        elif x in ['3', '4', '5', '6']:
+            answer = options.get(x, return_error)
+            Biliconsole().append2list_console(answer)
+        # normal
         else:
             options.get(x, return_error)()
-        await asyncio.sleep(0.1)
 
-def main():
-    loop = asyncio.new_event_loop()
-    tasks = [
-        controler()
-    ]
-    
-    loop.run_until_complete(asyncio.wait(tasks))
-    #console_thread.join()
+class Biliconsole():
+    instance = None
+
+    def __new__(cls, *args, **kw):
+        if not cls.instance:
+            cls.instance = super(Biliconsole, cls).__new__(cls, *args, **kw)
+            cls.instance.list_console = []
+            cls.lock = threading.Lock()
+        return cls.instance
+        
+    def append2list_console(self, request):
+        self.lock.acquire()
+        self.list_console.append(request)
+        self.lock.release()
+        
+    async def run(self):
+        while True:
+            len_list_console = len(self.list_console)
+            tasklist = []
+            for i in self.list_console:
+                if isinstance(i, list):
+                    # 对10号单独简陋处理
+                    for j in range(len(i[0])):
+                        if isinstance(i[0][j], list):
+                            i[0][j] = await i[0][j][1](*(i[0][j][0]))
+                    task = asyncio.ensure_future(i[1](*i[0]))
+                else:
+                    task = asyncio.ensure_future(i())
+                tasklist.append(task)
+            if tasklist:  
+                await asyncio.wait(tasklist, return_when=asyncio.ALL_COMPLETED)
+                #print('本批次结束')
+            else:
+                #print('本批次轮空')
+                pass
+            self.lock.acquire()
+            del self.list_console[:len_list_console]
+            self.lock.release()
+            if len_list_console == 0:
+                await asyncio.sleep(1)
+            else:
+                await asyncio.sleep(0.3)
+        
+        
+        
 
-    loop.close()
 
 

rafflehandler.py

@@ -45,8 +45,10 @@ async def run(self):
 
             del self.list_activity[:len_list_activity]
             del self.list_TV[:len_list_TV]
-                
-            await asyncio.sleep(5)
+            if len_list_activity == 0 and len_list_TV == 0:
+                await asyncio.sleep(5)
+            else:
+                await asyncio.sleep(1)
 
 
 

run.py

@@ -25,7 +25,7 @@
 Statistics()
 
 rafflehandler = Rafflehandler()
-
+biliconsole.Biliconsole()
 
 task = OnlineHeart()
 task1 = Silver()
@@ -34,7 +34,7 @@
 task4 = connect()
 
 
-console_thread = threading.Thread(target=biliconsole.main)
+console_thread = threading.Thread(target=biliconsole.controler)
 
 console_thread.start()
 
@@ -50,7 +50,8 @@
     task4.connect(),
     task3.query(),
     printer.clean_printlist(),
-    rafflehandler.run()
+    rafflehandler.run(),
+    biliconsole.Biliconsole().run()
 
 ]
 

utils.py

@@ -60,7 +60,7 @@ async def fetch_medal(printer=True):
         return roomid,today_feed,day_limit
 async def send_danmu_msg_andriod(msg, roomId):
     response = await bilibili().request_send_danmu_msg_andriod(msg, roomId)
-    print('ggghhhjj')
+    # print('ggghhhjj')
     print(await response.json())
 
 async def send_danmu_msg_web(msg, roomId):
@@ -128,9 +128,9 @@ async def fetch_bag_list(verbose=False, bagid=None,printer=True):
     # print(temp)
     return temp,gift_list
 
-def check_taskinfo():
-    response = bilibili().request_check_taskinfo()
-    json_response = response.json()
+async def check_taskinfo():
+    response = await bilibili().request_check_taskinfo()
+    json_response = await response.json()
     # print(json_response)
     if json_response['code'] == 0:
         data = json_response['data']
@@ -181,7 +181,7 @@ def check_taskinfo():
 
 async def check_room(roomid):
     response = await bilibili().request_check_room(roomid)
-    json_response = await response.json()
+    json_response = await response.json(content_type=None)
     if json_response['code'] == 0:
         print('查询结果:')
         data = json_response['data']
@@ -206,15 +206,15 @@ async def send_gift_web(roomid, giftid, giftnum, bagid):
         print("# 错误", json_response1['msg'])
 
 async def check_room_true(roomid):
-        response = await bilibili().request_check_room(roomid)
-        json_response = await response.json(content_type=None)
-        
-        if json_response['code'] == 0:
-            data = json_response['data']
-            param1 = data['is_hidden']
-            param2 = data['is_locked']
-            param3 = data['encrypted']
-            # print(param1, param2, param3)
-            return param1, param2, param3
+    response = await bilibili().request_check_room(roomid)
+    json_response = await response.json(content_type=None)
+    
+    if json_response['code'] == 0:
+        data = json_response['data']
+        param1 = data['is_hidden']
+        param2 = data['is_locked']
+        param3 = data['encrypted']
+        # print(param1, param2, param3)
+        return param1, param2, param3