@@ -1167,44 +1167,27 @@ def on_exec(self, args: argparse.Namespace):
11671167 # classify
11681168 result_maps = {}
11691169 for item in result_list :
1170- uid = item ['uid' ]
1171- if uid not in result_maps :
1172- result_maps [uid ] = {}
1173- block = item ['block' ]
1174- if block not in result_maps [uid ]:
1175- result_maps [uid ][block ] = {}
1176- type = item ['type' ]
1177- if type not in result_maps [uid ][block ]:
1178- result_maps [uid ][block ][type ] = []
1179-
1180- result_maps [uid ][block ][type ].append (item )
1181-
1182- for uid in result_maps .keys ():
1170+ (
1171+ result_maps .setdefault (item ["uid" ], {})
1172+ .setdefault (item ["block" ], {})
1173+ .setdefault (item ["type" ], [])
1174+ .append (item )
1175+ )
1176+
1177+ for uid , result_maps_for_uid in result_maps .items ():
11831178 print (f" - Detection log for uid [{ uid .upper ()} ]" )
1184- result_maps_for_uid = result_maps [uid ]
1185- for block in result_maps_for_uid :
1179+ for block , result_for_block in result_maps_for_uid .items ():
11861180 print (f" > Block { block } detect log decrypting..." )
1187- if 'A' in result_maps_for_uid [block ]:
1188- # print(f" - A record: { result_maps[block]['A'] }")
1189- records = result_maps_for_uid [block ]['A' ]
1190- if len (records ) > 1 :
1191- result_maps [uid ][block ]['A' ] = self .decrypt_by_list (records )
1192- else :
1193- print (f" > { len (records )} record" )
1194- if 'B' in result_maps_for_uid [block ]:
1195- # print(f" - B record: { result_maps[block]['B'] }")
1196- records = result_maps_for_uid [block ]['B' ]
1181+ for type_ , records in result_for_block .items ():
1182+ # print(f" - {type_} record: { records }")
11971183 if len (records ) > 1 :
1198- result_maps [ uid ][ block ][ 'B' ] = self .decrypt_by_list (records )
1184+ result_for_block [ type_ ] = self .decrypt_by_list (records )
11991185 else :
12001186 print (f" > { len (records )} record" )
12011187 print (" > Result ---------------------------" )
1202- for block in result_maps_for_uid .keys ():
1203- if 'A' in result_maps_for_uid [block ]:
1204- print (f" > Block { block } , A key result: { result_maps_for_uid [block ]['A' ]} " )
1205- if 'B' in result_maps_for_uid [block ]:
1206- print (f" > Block { block } , B key result: { result_maps_for_uid [block ]['B' ]} " )
1207- return
1188+ for block , result_for_block in result_maps_for_uid .items ():
1189+ for type_ , results in result_for_block .items ():
1190+ print (f" > Block { block } , { type_ } key result: { results } " )
12081191
12091192
12101193@hf_mf .command ('eload' )
0 commit comments