修复：脑子不够用 判断反了

Update ReadMe.md

Signed-off-by: Jerry Yan <792602257@qq.com>

Chat.py

@@ -1,19 +1,27 @@
 from User import User
+from Lottery import Lottery
+
 
 class Chat:
 
-    content:str=""
-    user:User=None
+    content: str =""
+    user:    User=None
+    filterString:list = ["",]
+    isFiltered = False
 
-    def __init__(self, json=None):
+    def __init__(self, json=None, lottery:Lottery = None):
         if json:
             self.parse(json)
+        if lottery:
+            self.filterString.append(lottery.content)
 
     def parse(self, json):
         self.user = User(json)
-        if "Msg" in json:
-            if "content" in json["Msg"]:
-                self.content = json["Msg"]['content']
+        if "extra" in json:
+            if "content" in json["extra"]:
+                self.content = json["extra"]['content']
+        if self.content in self.filterString:
+            self.isFiltered = True
 
     def __str__(self):
         return "{} : {}".format(self.user,self.content)

Gift.py

@@ -6,7 +6,7 @@ class Gift:
     ID:int = 0
     count:int = 0
     roomID:int = 0
-    giftList:dict = {10001: {"Name": "西瓜", "Price": 0}}
+    giftList:dict = {}
     amount:int = 0
     user:User = None
 
@@ -16,26 +16,32 @@ class Gift:
 
     def parse(self, json):
         self.user = User(json)
-        if "Msg" in json:
-            if "present_end_info" in json["Msg"]:
-                self.ID = json["Msg"]['present_end_info']['id']
-                self.count = json["Msg"]['present_end_info']['count']
-            elif "present_info" in json["Msg"]:
-                self.ID = json["Msg"]['present_info']['id']
-                self.count = json["Msg"]['present_info']['repeat_count']
-        if self.ID in self.giftList:
+        if "common" in json and json["common"] is not None:
+            if Gift.roomID != int(json["common"]["room_id"]):
+                Gift.roomID = int(json["common"]["room_id"])
+                self.update()
+        if "extra" in json and json["extra"] is not None:
+            if "present_info" in json["extra"] and json["extra"]['present_info'] is not None:
+                self.ID = int(json["extra"]['present_info']['id'])
+                self.count = json["extra"]['present_info']['repeat_count']
+            elif "present_end_info" in json["extra"] and json["extra"]['present_end_info'] is not None:
+                self.ID = int(json["extra"]['present_end_info']['id'])
+                self.count = json["extra"]['present_end_info']['count']
+        if self.ID != 0 and self.ID in self.giftList:
             self.amount = self.giftList[self.ID]["Price"] * self.count
+        else:
+            self.update()
 
-    @staticmethod
-    def update(roomID):
-        Gift.roomID = roomID
-        p = requests.get("https://live.ixigua.com/api/gifts/{roomID}".format(roomID= roomID))
+    def update(self):
+        p = requests.get("https://i.snssdk.com/videolive/gift/get_gift_list?room_id={roomID}"
+                         "&version_code=730&device_platform=android".format(roomID = self.roomID))
         d = p.json()
-        if isinstance(d, int) or "data" not in d:
+        if "gift_info" not in d:
             print("错误：礼物更新失败")
         else:
-            for i in d["data"]:
-                Gift.giftList[i["ID"]] = {"Name": i["Name"], "Price": i["DiamondCount"]}
+            for i in d["gift_info"]:
+                _id = int(i["id"])
+                Gift.giftList[_id] = {"Name": i["name"], "Price": i["diamond_count"]}
 
     def __str__(self):
         if self.ID in self.giftList:

Lottery.py

@@ -0,0 +1,71 @@
+import requests
+import time
+from LuckyUser import LuckyUser
+
+
+class Lottery:
+    ID: int = 0
+    isActive = False
+    content = ""
+    isFinished = False
+    luckyUsers = []
+    joinedUserCount = 0
+    prizeName = ""
+    finish:int = 0
+
+    def __init__(self, json=None):
+        if json:
+            self.parse(json)
+
+    def parse(self, json):
+        if "lottery_info" in json and json["lottery_info"] is not None:
+            self.isActive = int(json["lottery_info"]["status"]) > 0
+            self.ID = json["lottery_info"]["lottery_id"]
+            for i in json["lottery_info"]['conditions']:
+                if i['type'] != 3:
+                    continue
+                self.content = i["content"]
+            self.joinedUserCount = int(json["lottery_info"]["candidate_num"])
+            self.prizeName = json["lottery_info"]["prize_info"]["name"]
+            _delta = int(json["lottery_info"]["draw_time"]) - int(json["lottery_info"]["current_time"])
+            self.finish = time.time()+_delta+1
+        elif "extra" in json and json["extra"] is not None:
+            if "lottery_info" in json["extra"] and json["extra"]["lottery_info"] is not None:
+                return self.parse(json["extra"])
+
+    def update(self):
+        if self.isActive:
+            if not self.isFinished and self.finish > time.time():
+                self.checkFinished()
+                return True
+        return False
+
+    def checkFinished(self):
+        p = requests.get("https://i.snssdk.com/videolive/lottery/check_user_right?lottery_id={}"
+                         "&version_code=730&device_platform=android".format(
+            self.ID
+        ))
+        d = p.json()
+        if d["base_resp"]["status_code"] != 0:
+            self.isActive = False
+            self.isFinished = False
+            return
+        self.isActive = int(d["lottery_info"]["status"]) > 0
+        self.isFinished = int(d["lottery_info"]["status"]) == 2
+        self.joinedUserCount = int(d["lottery_info"]["candidate_num"])
+        if self.isFinished:
+            for i in d["lottery_info"]["lucky_users"]:
+                self.luckyUsers.append(LuckyUser(i))
+
+    def __str__(self):
+        if self.isFinished:
+            ret = "恭喜以下中奖用户：\n"
+            for i in self.luckyUsers:
+                ret += "> {} {}\n".format(i,self.prizeName)
+            ret += "> 参与人数：{}".format(self.joinedUserCount)
+            return ret
+        elif self.isActive:
+            return "正在抽奖中。。。\n" \
+                   "> 参与人数：{}".format(self.joinedUserCount)
+        else:
+            return "抽奖已失效"

LuckyUser.py

@@ -0,0 +1,19 @@
+from User import User
+
+class LuckyUser:
+
+    user = None
+    count = 0
+
+    def __init__(self, json=None):
+        if json:
+            self.parse(json)
+
+    def parse(self, json):
+        self.user = User()
+        self.user.ID = json['user_id']
+        self.user.name = json['user_name']
+        self.count = int(json["grant_count"])
+
+    def __str__(self):
+        return "用户 {} 获得了 {} 个".format(self.user,self.count)

MemberMsg.py

@@ -12,11 +12,11 @@ class MemberMsg:
 
     def parse(self, json):
         self.user = User(json)
-        if "Msg" in json:
-            if "action" in json["Msg"]:
-                self.type = json["Msg"]['action']
-            elif "content" in json["Msg"]:
-                self.content = json["Msg"]['content']
+        if "extra" in json:
+            if "action" in json["extra"]:
+                self.type = json["extra"]['action']
+            elif "content" in json["extra"]:
+                self.content = json["extra"]['content']
 
     def __str__(self):
         if self.type == 3:
@@ -28,6 +28,8 @@ class MemberMsg:
         elif self.type == 1:
             return "{} 进入了房间".format(self.user)
         else:
+            if self.content == "":
+                return "未知消息{} 关于用户 {}".format(self.type, self.user)
             return self.content.format(self.user)
 
     def __unicode__(self):

README.md

@@ -1,8 +1,16 @@
 # XiguaLiveDanmakuHelper
-### 西瓜直播弹幕助手
+### 西瓜直播弹幕助手--控制台版
 
-因个人能力有限，不懂C#，无法做出界面版，只好用控制台版先顶着
+界面版：[q792602257/XiguaDanmakuHelperGUI](https://github.com/q792602257/XiguaDanmakuHelperGUI "C# ver")
 
 ### 计划更新：
-- 使用android app协议，避免出现网页版协议更改后无法使用
-- 闲的无聊的时候看一看有没有好用的GUI轮子可以用用
++ Digg消息（点亮了喜欢）实例化
++ √ ~~使用android app协议~~
+
+        已使用
+        除从用户ID获取roomID外，其他均改为Android Api
+
++ √ ~~闲的无聊的时候看一看有没有好用的GUI轮子可以用用~~
+
+        已完成
+        已基于BiliLive_dm制作出初代西瓜直播弹幕姬，api未跟进

User.py

@@ -4,25 +4,37 @@ class User:
     brand:  str = ""
     level:  int = 0
     type:   int = 0
+    block: bool = False
+    mute:  bool = False
 
     def __init__(self, json=None):
         if json:
             self.parse(json)
 
     def parse(self, json):
-        if "Msg" in json:
-            if "user" in json["Msg"]:
-                self.ID = json["Msg"]['user']['user_id']
-                self.name = json["Msg"]['user']['name']
-            if "discipulus_info" in json["Msg"]:
-                self.level = json["Msg"]["discipulus_info"]["level"]
-                self.brand = json["Msg"]["discipulus_info"]["discipulus_group_title"]
-        elif "data" in json:
-            if "anchorInfo" in json["data"]:
-                self.ID = json["data"]['anchorInfo']['id']
-                self.name = json["data"]['anchorInfo']['name']
+        if "extra" in json:
+            if "user" in json["extra"] and json["extra"]["user"] is not None:
+                self.ID = json["extra"]['user']['user_id']
+                self.name = json["extra"]['user']['name']
+            if "im_discipulus_info" in json["extra"] and json["extra"]["im_discipulus_info"] is not None:
+                self.level = json["extra"]["im_discipulus_info"]["level"]
+                self.brand = json["extra"]["im_discipulus_info"]["discipulus_group_title"]
+            if "user_room_auth_status" in json["extra"] and json["extra"]["user_room_auth_status"] is not None:
+                self.type = json["extra"]["user_room_auth_status"]["user_type"]
+                self.block = json["extra"]["user_room_auth_status"]["is_block"]
+                self.mute = json["extra"]["user_room_auth_status"]["is_silence"]
+        elif "room" in json and json["room"] is not None:
+            if "user_info" in json["room"] and json["room"]["user_info"] is not None:
+                self.ID = json["room"]['user_info']['user_id']
+                self.name = json["room"]['user_info']['name']
+        elif "anchor" in json and json["anchor"] is not None:
+            if "user_info" in json["anchor"] and json["anchor"]['user_info'] is not None:
+                self.ID = json["anchor"]['user_info']['user_id']
+                self.name = json["anchor"]['user_info']['name']
         if self.type is None:
             self.type = 0
+        if isinstance(self.level, str):
+            self.level = int(self.level)
 
     def __str__(self):
         if self.level == 0:

WinMain.py

@@ -3,9 +3,9 @@ import sys
 import time
 
 from Gift import Gift
+from Lottery import Lottery
 from MemberMsg import MemberMsg
 from User import User
-
 from Chat import Chat
 from api import XiGuaLiveApi as Api
 import msvcrt
@@ -31,7 +31,9 @@ def readInput(caption, default, timeout: int = 5):
                     msvcrt.putch(b"\b")
                 if len(input) == 0:
                     start_time = time.time()
-            elif 32 <= ord(chr) <= 126:  # space_char
+            elif 32 > ord(chr) or 255 > ord(chr) > 126:  # space_char
+                continue
+            else:
                 input += chr.decode("utf8")
         if len(input) == 0 and (time.time() - start_time) > timeout:
             break
@@ -104,17 +106,13 @@ class WinMain(Api):
         if self._tmp > 10:
             self._tmp = 0
         if self._tmp < 5 :
-            return "{} {} --弹幕助手 by JerryYan".format(self.roomLiver, "的直播间")
+            return "{} 的直播间 --弹幕助手 by JerryYan".format(self.roomLiver)
         else:
             if self.roomPopularity == 0:
                 self._tmp = 0
                 return self.getTitle()
             else:
-                if self.roomMember > 0:
-                    return "观看:{} 人气:{} --弹幕助手 by JerryYan".format(self.roomMember, self.roomPopularity)
-                else:
-                    return "观看:待刷新 人气:{} --弹幕助手 by JerryYan".format(self.roomPopularity)
-
+                return "人气:{} --弹幕助手 by JerryYan".format(self.roomPopularity)
 
     def onMessage(self, msg: str):
         set_cmd_text_color(FOREGROUND_DARKGRAY)
@@ -123,7 +121,7 @@ class WinMain(Api):
 
     def onJoin(self, user: User):
         set_cmd_text_color(BACKGROUND_WHITE | FOREGROUND_BLACK)
-        print("感谢", user, "加入了粉丝团")
+        print("欢迎", user, "加入了粉丝团")
         resetColor()
 
     def onSubscribe(self, user: User):
@@ -140,8 +138,15 @@ class WinMain(Api):
 
     def onChat(self, chat: Chat):
         if SHOW_ALL:
+            resetColor()
+            if not chat.isFiltered:
                 print(chat)
 
+    def onLottery(self, i:Lottery):
+        set_cmd_text_color(FOREGROUND_WHITE | BACKGROUND_DARKGRAY)
+        print(i)
+        resetColor()
+
     def onPresent(self, gift: Gift):
         if SHOW_ALL:
             set_cmd_text_color(FOREGROUND_DARKGRAY)
@@ -168,24 +173,14 @@ def warning(*args):
 
 
 if __name__ == "__main__":
-    room = 97621754276  # 永恒
-    # room = 75366565294
-    # room = 83940182312 #Dae
+    name = "永恒de草薙"
     resetColor()
     print("西瓜直播弹幕助手 by JerryYan")
     if len(sys.argv) > 1:
-        if sys.argv[-1] == "a":
-            SHOW_ALL = True
-        try:
-            room = int(sys.argv[1])
-        except:
-            pass
+        name = sys.argv[1]
     else:
-        try:
-            room = int(readInput("请输入用户ID号，默认为永恒的ID号", room, 3))
-        except ValueError:
-            pass
-    api = WinMain(room)
+        name = readInput("请输入主播用户名(请用拼音字母)，默认为", name, 3)
+    api = WinMain(name)
     print("进入", api.roomLiver, "的直播间")
     if not api.isValidRoom:
         input("房间不存在")
@@ -194,11 +189,11 @@ if __name__ == "__main__":
     print("=" * 30)
     while True:
         if api.isLive:
-            try:
             os.system("title {}".format(api.getTitle()))
+            try:
                 api.getDanmaku()
             except Exception as e:
-                warning(e)
+                print(e.__str__())
             time.sleep(1)
         else:
             set_cmd_text_color(FOREGROUND_RED)

api.py

@@ -4,6 +4,7 @@ from MemberMsg import MemberMsg
 from User import User
 from Gift import Gift
 from Chat import Chat
+from Lottery import Lottery
 import requests
 import time
 
@@ -16,25 +17,23 @@ class XiGuaLiveApi:
     isLive: bool = False
     isValidRoom: bool = False
     _rawRoomInfo = {}
+    name: str = ""
     roomID: int = 0
     roomTitle: str = ""
     roomLiver: User = None
     roomPopularity: int = 0
-    roomMember: int = 0
-    _cursor = ""
+    _cursor:str = "0"
+    _updRoomCount:int = 0
+    lottery:Lottery = None
 
-    def __init__(self, room: int):
-        self.room = room
+    def __init__(self, name: str = "永恒de草薙"):
+        self.name = name
         self.updRoomInfo()
-        Gift.update(self.roomID)
-        self._enterRoom()
 
     def _updateRoomInfo(self, json):
-        if "Msg" in json:
-            if "member_count" in json["Msg"]:
-                self.roomMember = json["Msg"]["member_count"]
-            if "popularity" in json["Msg"]:
-                self.roomPopularity = json["Msg"]["popularity"]
+        if "extra" in json:
+            if "member_count" in json["extra"] and json["extra"]["member_count"] > 0:
+                self.roomPopularity = json["extra"]["member_count"]
         elif "data" in json:
             if "popularity" in json["data"]:
                 self.roomPopularity = json["data"]["popularity"]
@@ -44,7 +43,7 @@ class XiGuaLiveApi:
         print(*args)
 
     def onPresent(self, gift: Gift):
-        print("礼物连击 : ", gift)
+        print("礼物连击 :", gift)
 
     def onPresentEnd(self, gift: Gift):
         print("感谢", gift)
@@ -54,118 +53,169 @@ class XiGuaLiveApi:
         pass
 
     def onChat(self, chat: Chat):
+        if not chat.isFiltered:
             print(chat)
 
     def onEnter(self, msg: MemberMsg):
-        print("提示 : ", msg)
+        print("提示 :", msg)
 
     def onSubscribe(self, user: User):
-        print("消息 : ", user, "关注了主播")
+        print("消息 :", user, "关注了主播")
 
     def onJoin(self, user: User):
-        print("感谢", user, "加入了粉丝团")
+        print("欢迎", user, "加入了粉丝团")
 
     def onMessage(self, msg: str):
-        print("消息 : ", msg)
+        print("消息 :", msg)
 
     def onLike(self, user: User):
         print("用户", user, "点了喜欢")
 
     def onLeave(self, json: any):
-        print("消息 : ", "主播离开一小会")
+        print("消息 :", "主播离开了")
 
-    def _enterRoom(self):
-        if not self.isValidRoom:
-            return
-        p = s.post("https://live.ixigua.com/api/room/enter/{roomID}".format(roomID=self.roomID))
-        if DEBUG:
-            print(p.text)
+    def onLottery(self, i:Lottery):
+        print("中奖消息 :", i)
 
     def updRoomInfo(self):
-        p = s.get("https://live.ixigua.com/api/room?anchorId={room}".format(room=self.room))
+        if self.isLive:
+            p = s.post("https://i.snssdk.com/videolive/room/enter?version_code=730"
+                       "&device_platform=android",
+                       data="room_id={roomID}&version_code=730"
+                       "&device_platform=android".format(roomID=self.roomID),
+                       headers={"Content-Type":"application/x-www-form-urlencoded"})
+            d = p.json()
+            self.isValidRoom = d["base_resp"]["status_code"] == 0
+            if d["base_resp"]["status_code"] != 0:
+                return False
+            if "room" not in d and d["room"] is None:
+                self.apiChangedError("Api发生改变，请及时联系我")
+                return False
+            self._rawRoomInfo = d["room"]
+            self.isLive = d["room"]["status"] == 2
+            self.roomLiver = User(d)
+            self.roomTitle = d["room"]["title"]
+            self.roomPopularity = d["room"]["user_count"]
+            l = Lottery(d)
+            if l.isActive:
+                self.lottery = l
+            return True
+        else:
+            p = s.get("https://security.snssdk.com/video/app/search/live/?version_code=730&device_platform=android"
+                      "&format=json&keyword={}".format(self.name))
+            d = p.json()
+            if "data" in d and d["data"] is not None:
+                for i in d["data"]:
+                    if i["block_type"] != 0:
+                        continue
+                    if len(i["cells"]) == 0:
+                        return
+                    self.isValidRoom = True
+                    self.isLive = i["cells"][0]["anchor"]["user_info"]["is_living"]
+                    self.roomID = int(i["cells"][0]["anchor"]["room_id"])
+                    self.roomLiver = User(i["cells"][0])
+            if self.isLive:
+                return self.updRoomInfo()
+            else:
+                return False
+
+    @staticmethod
+    def findRoomByUserId(userId:int):
+        p = s.get("https://live.ixigua.com/api/room?anchorId={room}".format(room=userId))
         if DEBUG:
             print(p.text)
         d = p.json()
         if "data" not in d or "title" not in d["data"] or "id" not in d["data"]:
-            self.apiChangedError("无法获取RoomID，请与我联系")
-            return
-        self.isValidRoom = True
-        self._rawRoomInfo = d["data"]
-        self.roomLiver = User(d)
-        self.roomTitle = d["data"]["title"]
-        self.roomID = d["data"]["id"]
-        self._updateRoomInfo(d)
-        if "status" in d["data"] and d["data"]["status"] == 2:
-            self.isLive = True
-        else:
-            self.isLive = False
+            XiGuaLiveApi.apiChangedError("无法获取RoomID，请与我联系")
+            return XiGuaLiveApi()
+        return XiGuaLiveApi(d["data"]["id"])
+
+    @staticmethod
+    def searchLive(keyword):
+        ret = []
+        p = s.get("https://security.snssdk.com/video/app/search/live/?version_code=730&device_platform=android"
+                  "&format=json&keyword={}".format(keyword))
+        d = p.json()
+        if "data" in d:
+            for i in d["data"]:
+                if i["block_type"] != 0:
+                    continue
+                for _i in i["cells"]:
+                    ret.append(_i["room"])
+        return ret
 
     def getDanmaku(self):
         if not self.isValidRoom:
+            self.updRoomInfo()
             return
-        p = s.get("https://live.ixigua.com/api/msg/list/{roomID}?AnchorID={room}&Cursor={cursor}".format(
+        p = s.get("https://i.snssdk.com/videolive/im/get_msg?cursor={cursor}&room_id={roomID}"
+                  "&version_code=730&device_platform=android".format(
                       roomID=self.roomID,
-            room=self.room,
                       cursor=self._cursor
                   ))
         d = p.json()
-        if "data" not in d or "Extra" not in d["data"] or "Cursor" not in d["data"]["Extra"]:
+        if "data" not in d or "extra" not in d or "cursor" not in d["extra"]:
             if DEBUG:
                 print(d)
             self.apiChangedError("数据结构改变，请与我联系")
             return
         else:
-            self._cursor = d["data"]["Extra"]["Cursor"]
+            self._cursor = d["extra"]["cursor"]
             if DEBUG:
                 print("Cursor", self._cursor)
-        if "LiveMsgs" not in d["data"]:
-            self.updRoomInfo()
-            return
-        for i in d['data']['LiveMsgs']:
+        for i in d['data']:
             if DEBUG:
                 print(i)
-            if "Method" not in i:
+            if "common" not in i and "method" not in i["common"]:
                 continue
-            if i['Method'] == "VideoLivePresentMessage":
+            if i["common"]['method'] == "VideoLivePresentMessage":
                 self.onPresent(Gift(i))
-            elif i['Method'] == "VideoLivePresentEndTipMessage":
+            elif i["common"]['method'] == "VideoLivePresentEndTipMessage":
                 self.onPresentEnd(Gift(i))
-            elif i['Method'] == "VideoLiveRoomAdMessage":
+            elif i["common"]['method'] == "VideoLiveRoomAdMessage":
                 self.onAd(i)
-            elif i['Method'] == "VideoLiveChatMessage":
-                self.onChat(Chat(i))
-            elif i['Method'] == "VideoLiveMemberMessage":
+            elif i["common"]['method'] == "VideoLiveChatMessage":
+                self.onChat(Chat(i, self.lottery))
+            elif i["common"]['method'] == "VideoLiveMemberMessage":
                 self._updateRoomInfo(i)
                 self.onEnter(MemberMsg(i))
-            elif i['Method'] == "VideoLiveSocialMessage":
+            elif i["common"]['method'] == "VideoLiveSocialMessage":
                 self.onSubscribe(User(i))
-            elif i['Method'] == "VideoLiveJoinDiscipulusMessage":
+            elif i["common"]['method'] == "VideoLiveJoinDiscipulusMessage":
                 self.onJoin(User(i))
-            elif i['Method'] == "VideoLiveControlMessage":
+            elif i["common"]['method'] == "VideoLiveControlMessage":
                 print("消息：", "主播离开一小会")
-            elif i['Method'] == "VideoLiveDiggMessage":
+            elif i["common"]['method'] == "VideoLiveDiggMessage":
                 self.onLike(User(i))
             else:
                 pass
+            if self.lottery is None or self.lottery.ID == 0:
+                self.lottery = Lottery(i)
+        self._updRoomCount += 1
+        if self.lottery is not None and self.lottery.ID != 0:
+            self.lottery.update()
+        if self.lottery.isFinished:
+            self.onLottery(self.lottery)
+            self.lottery = None
+        if self._updRoomCount > 120 or len(d['data']) == 0:
+            self.updRoomInfo()
+            self._updRoomCount = 0
+            return
 
 
 if __name__ == "__main__":
-    room = 97621754276  # 永恒
-    # room = 75366565294
-    # room = 83940182312 #Dae
-    if len(sys.argv) > 1:
+    name = "永恒de草薙"
+    if len(sys.argv) > 2:
         if sys.argv[-1] == "d":
             DEBUG = True
-        try:
-            room = int(sys.argv[1])
-        except ValueError:
-            pass
+        name = sys.argv[1]
     print("西瓜直播弹幕助手 by JerryYan")
-    api = XiGuaLiveApi(room)
-    print("进入", api.roomLiver, "的直播间")
+    api = XiGuaLiveApi(name)
     if not api.isValidRoom:
+        print(api.roomID)
         input("房间不存在")
         sys.exit()
+    print("进入", api.roomLiver, "的直播间")
     print("=" * 30)
     while True:
         if api.isLive:

bilibili.py

@@ -2,6 +2,7 @@
 
 import os
 import re
+import shutil
 from datetime import datetime
 
 import rsa
@@ -11,6 +12,8 @@ import hashlib
 import requests
 from urllib import parse
 
+from config import config
+
 
 class VideoPart:
     def __init__(self, path, title='', desc=''):
@@ -18,8 +21,10 @@ class VideoPart:
         self.title = title
         self.desc = desc
 
+
 class Bilibili:
     def __init__(self, cookie=None):
+        self.files = []
         self.videos = []
         self.session = requests.session()
         if cookie:
@@ -137,7 +142,6 @@ class Bilibili:
             )
             json = r.json()
 
-
         if json['code'] is not 0:
             return r.text
 
@@ -154,7 +158,6 @@ class Bilibili:
 
         return True
 
-
     def upload(self,
                parts,
                title,
@@ -186,38 +189,23 @@ class Bilibili:
         :type no_reprint: int
         """
         self.preUpload(parts)
-        self.finishUpload(title,tid,tag,desc,source,cover,no_reprint)
+        self.finishUpload(title, tid, tag, desc, source, cover, no_reprint)
 
-    def preUpload(self,parts):
+    def preUpload(self, parts):
         """
         :param parts: e.g. VideoPart('part path', 'part title', 'part desc'), or [VideoPart(...), VideoPart(...)]
         :type parts: VideoPart or list<VideoPart>
-        :param title: video's title
-        :type title: str
-        :param tid: video type, see: https://member.bilibili.com/x/web/archive/pre
-                                  or https://github.com/uupers/BiliSpider/wiki/%E8%A7%86%E9%A2%91%E5%88%86%E5%8C%BA%E5%AF%B9%E5%BA%94%E8%A1%A8
-        :type tid: int
-        :param tag: video's tag
-        :type tag: list<str>
-        :param desc: video's description
-        :type desc: str
-        :param source: (optional) 转载地址
-        :type source: str
-        :param cover: (optional) cover's URL, use method *cover_up* to get
-        :type cover: str
-        :param no_reprint: (optional) 0=可以转载, 1=禁止转载(default)
-        :type no_reprint: int
         """
 
         self.session.headers['Content-Type'] = 'application/json; charset=utf-8'
         if not isinstance(parts, list):
             parts = [parts]
 
-        videos = []
         for part in parts:
             filepath = part.path
             filename = os.path.basename(filepath)
             filesize = os.path.getsize(filepath)
+            self.files.append(part)
             r = self.session.get('https://member.bilibili.com/preupload?'
                                  'os=upos&upcdn=ws&name={name}&size={size}&r=upos&profile=ugcupos%2Fyb&ssl=0'
                                  .format(name=filename, size=filesize))
@@ -303,26 +291,144 @@ class Bilibili:
                      cover='',
                      no_reprint=1,
                      ):
+        """
+        :param title: video's title
+        :type title: str
+        :param tid: video type, see: https://member.bilibili.com/x/web/archive/pre
+                                  or https://github.com/uupers/BiliSpider/wiki/%E8%A7%86%E9%A2%91%E5%88%86%E5%8C%BA%E5%AF%B9%E5%BA%94%E8%A1%A8
+        :type tid: int
+        :param tag: video's tag
+        :type tag: list<str>
+        :param desc: video's description
+        :type desc: str
+        :param source: (optional) 转载地址
+        :type source: str
+        :param cover: (optional) cover's URL, use method *cover_up* to get
+        :type cover: str
+        :param no_reprint: (optional) 0=可以转载, 1=禁止转载(default)
+        :type no_reprint: int
+        """
+        self.session.headers['Content-Type'] = 'application/json; charset=utf-8'
         copyright = 2 if source else 1
         r = self.session.post('https://member.bilibili.com/x/vu/web/add?csrf=' + self.csrf,
                               json={
-                                  "copyright" : copyright,
-                                  "source"    : source,
-                                  "title"     : title,
-                                  "tid"       : tid,
-                                  "tag"       : ','.join(tag),
+                                  "copyright": copyright,
+                                  "source": source,
+                                  "title": title,
+                                  "tid": tid,
+                                  "tag": ','.join(tag),
                                   "no_reprint": no_reprint,
-                                  "desc"      : desc,
-                                  "cover"     : cover,
+                                  "desc": desc,
+                                  "cover": cover,
                                   "mission_id": 0,
-                                  "order_id"  : 0,
-                                  "videos"    : self.videos}
+                                  "order_id": 0,
+                                  "videos": self.videos}
                               )
         print(r.text)
-        for _p in self.videos:
+        if config["mv"]:
+            for _p in self.files:
+                shutil.move(_p.path, config["mtd"])
+        elif config["del"]:
+            for _p in self.files:
                 os.remove(_p.path)
 
+    def appendUpload(self,
+                     aid,
+                     parts,
+                     title="",
+                     tid="",
+                     tag="",
+                     desc="",
+                     source='',
+                     cover='',
+                     no_reprint=1,
+                     ):
+        """
+        :param aid: just aid
+        :type aid: int
+        :param parts: e.g. VideoPart('part path', 'part title', 'part desc'), or [VideoPart(...), VideoPart(...)]
+        :type parts: VideoPart or list<VideoPart>
+        :param title: video's title
+        :type title: str
+        :param tid: video type, see: https://member.bilibili.com/x/web/archive/pre
+                                  or https://github.com/uupers/BiliSpider/wiki/%E8%A7%86%E9%A2%91%E5%88%86%E5%8C%BA%E5%AF%B9%E5%BA%94%E8%A1%A8
+        :type tid: int
+        :param tag: video's tag
+        :type tag: list<str>
+        :param desc: video's description
+        :type desc: str
+        :param source: (optional) 转载地址
+        :type source: str
+        :param cover: (optional) cover's URL, use method *cover_up* to get
+        :type cover: str
+        :param no_reprint: (optional) 0=可以转载, 1=禁止转载(default)
+        :type no_reprint: int
+        """
+        self.session.headers['Content-Type'] = 'application/json; charset=utf-8'
+        p = self.session.get("https://member.bilibili.com/x/web/archive/view?aid={}&history=".format(aid))
+        j = p.json()
+        if len(self.videos) == 0:
+            for i in j['data']['videos']:
+                self.videos.append({'filename': i['filename'],
+                                    'title': i["title"],
+                                    'desc': i["desc"]})
+        if (title == ""): title = j["data"]["archive"]['title']
+        if (tag == ""): tag = j["data"]["archive"]['tag']
+        if (no_reprint == ""): no_reprint = j["data"]["archive"]['no_reprint']
+        if (desc == ""): desc = j["data"]["archive"]['desc']
+        if (source == ""): source = j["data"]["archive"]['source']
+        if (tid == ""): tid = j["data"]["archive"]['tid']
+        self.preUpload(parts)
+        self.editUpload(aid, title, tid, tag, desc, source, cover, no_reprint)
 
+    def editUpload(self,
+                   aid,
+                   title,
+                   tid,
+                   tag,
+                   desc,
+                   source='',
+                   cover='',
+                   no_reprint=1,
+                   ):
+        """
+        :param aid: just aid
+        :type aid: int
+        :param parts: e.g. VideoPart('part path', 'part title', 'part desc'), or [VideoPart(...), VideoPart(...)]
+        :type parts: VideoPart or list<VideoPart>
+        :param title: video's title
+        :type title: str
+        :param tid: video type, see: https://member.bilibili.com/x/web/archive/pre
+                                  or https://github.com/uupers/BiliSpider/wiki/%E8%A7%86%E9%A2%91%E5%88%86%E5%8C%BA%E5%AF%B9%E5%BA%94%E8%A1%A8
+        :type tid: int
+        :param tag: video's tag
+        :type tag: list<str>
+        :param desc: video's description
+        :type desc: str
+        :param source: (optional) 转载地址
+        :type source: str
+        :param cover: (optional) cover's URL, use method *cover_up* to get
+        :type cover: str
+        :param no_reprint: (optional) 0=可以转载, 1=禁止转载(default)
+        :type no_reprint: int
+        """
+        copyright = 2 if source else 1
+        r = self.session.post('https://member.bilibili.com/x/vu/web/edit?csrf=' + self.csrf,
+                              json={
+                                  "aid": aid,
+                                  "copyright": copyright,
+                                  "source": source,
+                                  "title": title,
+                                  "tid": tid,
+                                  "tag": ','.join(tag),
+                                  "no_reprint": no_reprint,
+                                  "desc": desc,
+                                  "cover": cover,
+                                  "mission_id": 0,
+                                  "order_id": 0,
+                                  "videos": self.videos}
+                              )
+        print(r.text)
 
     def addChannel(self, name, intro=''):
         """
@@ -335,10 +441,10 @@ class Bilibili:
         r = self.session.post(
             url='https://space.bilibili.com/ajax/channel/addChannel',
             data={
-                    'name' : name,
+                'name': name,
                 'intro': intro,
-                    'aids' : '',
-                    'csrf' : self.csrf,
+                'aids': '',
+                'csrf': self.csrf,
             },
             # name=123&intro=123&aids=&csrf=565d7ed17cef2cc8ad054210c4e64324&_=1497077610768
 
@@ -360,7 +466,7 @@ class Bilibili:
             url='https://space.bilibili.com/ajax/channel/addVideo',
             data={
                 'aids': '%2C'.join(aids),
-                    'cid' : cid,
+                'cid': cid,
                 'csrf': self.csrf
             }
             # aids=9953555%2C9872953&cid=15814&csrf=565d7ed17cef2cc8ad054210c4e64324&_=1497079332679
@@ -389,4 +495,3 @@ class Bilibili:
         # print(r.text)
         # {"code":0,"data":{"url":"http://i0.hdslb.com/bfs/archive/67db4a6eae398c309244e74f6e85ae8d813bd7c9.jpg"},"message":"","ttl":1}
         return r.json()['data']['url']
-

liveDownloader.py

@@ -12,7 +12,7 @@ q = queue.Queue()
 base_uri = ""
 isUpload = False
 uq = queue.Queue()
-d = datetime.strftime(datetime.now(),"%Y_%m_%d")
+
 
 class downloader(XiGuaLiveApi):
     files = []
@@ -23,33 +23,47 @@ class downloader(XiGuaLiveApi):
         self.updPlayList()
 
     def updPlayList(self):
-        if "playInfo" not in self._rawRoomInfo or "Main" not in self._rawRoomInfo["playInfo"]:
+        if self.isLive:
+            if "stream_url" in self._rawRoomInfo:
                 if self.playlist is None:
                     self.apiChangedError("无法获取直播链接")
                     self.playlist = False
                 else:
-            self.playlist = self._rawRoomInfo["playInfo"]["Main"]["1"]["Url"]["HlsUrl"]
+                    self.playlist = self._rawRoomInfo["stream_url"]["alternate_pull_url"]
+                    self.playlist = self.playlist.replace("_uhd","").replace("_sd","").replace("_ld","")
+        else:
+            print("未开播，等待开播")
 
     def onLike(self, user):
         pass
+
     def onAd(self, i):
         pass
+
     def onChat(self, chat):
         pass
+
     def onEnter(self, msg):
         pass
+
     def onJoin(self, user):
         pass
+
     def onLeave(self, json):
         self.updRoomInfo()
+
     def onMessage(self, msg):
         pass
+
     def onPresent(self, gift):
         pass
+
     def onPresentEnd(self, gift):
         pass
+
     def onSubscribe(self, user):
         pass
+
     def preDownload(self):
         global base_uri
         if self.playlist:
@@ -65,14 +79,18 @@ class downloader(XiGuaLiveApi):
                     print("{} : Add Sequence {}".format(datetime.strftime(datetime.now(), "%y%m%d %H%M"),
                                                         len(self.files)))
                     q.put(i)
+        else:
+            print("PlayList {}".format(self.playlist))
         self.genNewName()
+
+
     def genNewName(self):
         if len(self.files) > 800:
             q.put(True)
             self.files.clear()
 
 
-def download(path=datetime.strftime(datetime.now(),"%Y%m%d_%H%M.ts")):
+def download(path=datetime.strftime(datetime.now(), "%Y%m%d_%H%M.ts")):
     global isUpload
     print("{} : Download Daemon Starting".format(datetime.strftime(datetime.now(), "%y%m%d %H%M")))
     n = False
@@ -84,31 +102,31 @@ def download(path=datetime.strftime(datetime.now(),"%Y%m%d_%H%M.ts")):
             break
         print("{} : Download {}".format(datetime.strftime(datetime.now(), "%y%m%d %H%M"), i))
         try:
-            _p = requests.get("{}{}".format(base_uri,i))
+            _p = requests.get("{}{}".format(base_uri, i))
         except:
             continue
         f = open(path, "ab")
         f.write(_p.content)
         f.close()
-        n=True
+        n = True
         i = q.get()
     if n:
+        isUpload = True
         uq.put(path)
     print("{} : Download Daemon Quiting".format(datetime.strftime(datetime.now(), "%y%m%d %H%M")))
-    isUpload = True
 
 
-
-def upload(date = datetime.strftime(datetime.now(), "%Y_%m_%d")):
+def upload(date=datetime.strftime(datetime.now(), "%Y_%m_%d")):
     print("{} : Upload Daemon Starting".format(datetime.strftime(datetime.now(), "%y%m%d %H%M")))
     i = uq.get()
     while True:
         if isinstance(i, bool):
+            print("{} : Upload Daemon Receive Command {}"
+                  .format(datetime.strftime(datetime.now(), "%y%m%d %H%M"), i))
             if i is True:
                 print("自动投稿中，请稍后")
-                b.finishUpload(config["t_t"].format(date),17, config["tag"],config["des"],
-                               source= "https://live.ixigua.com/userlive/97621754276", no_reprint= 0)
-            print("{} : Upload Daemon Receive Command {}".format(datetime.strftime(datetime.now(), "%y%m%d %H%M"), i))
+                b.finishUpload(config["t_t"].format(date), 17, config["tag"], config["des"],
+                               source=config["src"], no_reprint=0)
             break
         print("{} : Upload {}".format(datetime.strftime(datetime.now(), "%y%m%d %H%M"), i))
         try:
@@ -123,23 +141,21 @@ b = Bilibili()
 b.login(config["b_u"], config["b_p"])
 
 if __name__ == "__main__":
-    room = 97621754276  # 永恒
+    name = "永恒de草薙"
     # room = 75366565294
     # room = 83940182312 #Dae
     # room = 5947850784 #⑦
     # room = 58649240617 #戏
     if len(sys.argv) > 1:
-        try:
-            room = int(sys.argv[1])
-        except ValueError:
-            pass
+        name = sys.argv[1]
     print("西瓜直播录播助手 by JerryYan")
-    api = downloader(room)
+    api = downloader(name)
     print("进入", api.roomLiver, "的直播间")
     if not api.isValidRoom:
         input("房间不存在")
         sys.exit()
     print("=" * 30)
+    d = datetime.strftime(datetime.now(), "%Y_%m_%d")
     _preT = datetime.strftime(datetime.now(), "%Y%m%d_%H%M.ts")
     t = threading.Thread(target=download, args=(_preT,))
     ut = threading.Thread(target=upload, args=(d,))
@@ -156,19 +172,18 @@ if __name__ == "__main__":
                 ut = threading.Thread(target=upload, args=(d,))
                 ut.setDaemon(True)
                 ut.start()
-            try:
             api.preDownload()
-            except:
-                pass
             time.sleep(3)
         else:
+            if d is not None:
                 q.put(False)
+                d = None
             if isUpload:
                 uq.put(True)
                 isUpload = False
             else:
-                pass
+                del config
+                from config import config
                 # print("主播未开播，等待1分钟后重试")
             time.sleep(60)
-            d=None
             api.updRoomInfo()