star-inc/yuuki
1
1
Fork 0
mirror of https://github.com/star-inc/yuuki.git synced 2024-09-20 07:16:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try fix Data System

Browse source
This commit is contained in:
SuperSonic 2019-08-27 19:12:40 +08:00
parent bb1c0afc70
commit 69eb01cac7
2 changed files with 39 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
libs/data.py
View file

@ -11,37 +11,38 @@ class Yuuki_Data:
self.Data = {}
self.DataType = {
"Global":{
"LastResetLimitTime":None,
},
"Group": {},
"LimitInfo":{},
"BlackList":[]
self.GlobalType = {
"LastResetLimitTime": None
}
self.GroupType = {
"SEGroup":None,
"Ext_Admin":[],
"GroupTicket":{}
"SEGroup": None,
"Ext_Admin": [],
"GroupTicket": {}
}
self.LimitType = {
"KickLimit":{},
"CancelLimit":{}
"KickLimit": {},
"CancelLimit": {}
}
self.SEGrouptype = {
OpType.NOTIFIED_UPDATE_GROUP:False,
OpType.NOTIFIED_INVITE_INTO_GROUP:False,
OpType.NOTIFIED_ACCEPT_GROUP_INVITATION:False,
OpType.NOTIFIED_KICKOUT_FROM_GROUP:False
self.SEGroupType = {
OpType.NOTIFIED_UPDATE_GROUP: False,
OpType.NOTIFIED_INVITE_INTO_GROUP: False,
OpType.NOTIFIED_ACCEPT_GROUP_INVITATION: False,
OpType.NOTIFIED_KICKOUT_FROM_GROUP: False
}
self.initType = {
"Group":self.GroupType,
"LimitInfo":self.LimitType,
"SEGroup":self.SEGrouptype
self.DataType = {
"Global": self.GlobalType,
"Group": {},
"LimitInfo": {},
"BlackList": []
}
self.customData = {
"Group": self.GroupType,
"LimitInfo": self.LimitType
}
self.DataPath = "data/"
@ -131,45 +132,22 @@ class Yuuki_Data:
return time.strftime(format, Time)
def getData(self, Type, Query=None):
if Query != None:
if type(Query) == str:
if Query not in self.Data[Type]:
if Type in self.initType:
self.Data[Type] = self.initType[Type]
else:
assert "Unknown DataType"
return self.Data[Type][Query]
elif type(Query) == list and len(Query) > 1:
# Level 2
if Query[0] not in self.Data[Type]:
if Type in self.initType:
self.Data[Type] = self.initType[Type]
else:
assert "Unknown DataType"
if Query[1] not in self.Data[Type][Query[0]]:
if Query[0] in self.initType:
self.Data[Type][Query[0]] = self.initType[Query[0]]
elif Query[0] in self.DataType:
self.Data[Type][Query[0]] = self.DataType[Query[0]]
else:
assert "Unknown DataType"
if len(Query) == 2:
return self.Data[Type][Query[0]][Query[1]]
# Level 3
if len(Query) >= 3:
if Query[2] not in self.Data[Type][Query[0]][Query[1]]:
if Query[1] in self.initType:
self.Data[Type][Query[0]][Query[1]] = self.initType[Query[1]]
elif Query[1] in self.DataType:
self.Data[Type][Query[0]][Query[1]] = self.DataType[Query[0]][Query[1]]
else:
assert "Unknown DataType"
if len(Query) == 3:
return self.Data[Type][Query[0]][Query[1]][Query[2]]
else:
assert "Error Query"
else:
if Query == None:
return self.Data[Type]
else:
lastkey = None
QueryData = self.Data[Type]
for key in Query:
if type(QueryData) == dict:
Catch = QueryData.get(key)
if lastkey in self.customData:
if type(self.customData[lastkey]) == dict:
QueryData[key] = self.customData[lastkey]
return QueryData[key]
elif key in Query:
lastkey = key
QueryData = Catch
return QueryData
def getLimit(self, Type):
if Type == "Kick":

4
libs/yuuki.py
View file

@ -116,7 +116,7 @@ class Yuuki:
self.client.updateGroup(self.Seq, group)
def enableSecurityStatus(self, groupId, status):
group_status = self.data.SEGrouptype
group_status = self.data.SEGroupType
if 0 in status:
group_status[OpType.NOTIFIED_UPDATE_GROUP] = True
if 1 in status:
@ -129,7 +129,7 @@ class Yuuki:
self.data.updateData(self.data.getData("Group", groupId), "SEGroup", group_status)
def disableSecurityStatus(self, groupId, status):
group_status = self.data.SEGrouptype
group_status = self.data.SEGroupType
if 0 in status:
group_status[OpType.NOTIFIED_UPDATE_GROUP] = False
if 1 in status: