diff --git a/daily_report/dreport.py b/daily_report/dreport.py index 67ee154..4efc8c3 100644 --- a/daily_report/dreport.py +++ b/daily_report/dreport.py @@ -297,10 +297,15 @@ class Report: data = dict() data['day'] = self.day + for item in parms: args = {} args['gameid'], args['channelid'] = item key = f"{args['gameid']}#{args['channelid']}" + data[key]={} + data[key]['gameid']=args['gameid'] + data[key]['channelid'] = args['channelid'] + data[key]['all']=self.get_all_data(**args) g = GetTgaConfig() item = g.get_api_key(args['gameid']) url = item['url'] @@ -311,21 +316,16 @@ class Report: args['tga'] = tga mp = MpInterface() fromappids = mp.get_fromappid_cn(args['gameid'], args['channelid']) - - - keys = fromappids.keys() - pdb.set_trace() - if not keys: + f_keys = fromappids.keys() + if not f_keys: break - for key in keys: - data[key] = {} - data[key]['all'] = self.get_all_data(**args) + for f_key in f_keys: data[key]['input'] = defaultdict(list) data[key]['output'] = defaultdict(list) data[key]['input'] = [] data[key]['output'] = [] - args['fromappid'] = key - args['fromappid_cn'] = fromappids.get(key, None) or "未知" + args['fromappid'] = f_key + args['fromappid_cn'] = fromappids.get(f_key, None) or "未知" data[key]['input'].append(self.get_input_fromappid(**args)) data[key]['output'].append(self.get_output_fromappid(**args)) print(data)