@@ -1358,44 +1358,27 @@ def on_exec(self, args: argparse.Namespace):
13581358 # classify
13591359 result_maps = {}
13601360 for item in result_list :
1361- uid = item ['uid' ]
1362- if uid not in result_maps :
1363- result_maps [uid ] = {}
1364- block = item ['block' ]
1365- if block not in result_maps [uid ]:
1366- result_maps [uid ][block ] = {}
1367- type = item ['type' ]
1368- if type not in result_maps [uid ][block ]:
1369- result_maps [uid ][block ][type ] = []
1370-
1371- result_maps [uid ][block ][type ].append (item )
1372-
1373- for uid in result_maps .keys ():
1361+ (
1362+ result_maps .setdefault (item ["uid" ], {})
1363+ .setdefault (item ["block" ], {})
1364+ .setdefault (item ["type" ], [])
1365+ .append (item )
1366+ )
1367+
1368+ for uid , result_maps_for_uid in result_maps .items ():
13741369 print (f" - Detection log for uid [{ uid .upper ()} ]" )
1375- result_maps_for_uid = result_maps [uid ]
1376- for block in result_maps_for_uid :
1370+ for block , result_for_block in result_maps_for_uid .items ():
13771371 print (f" > Block { block } detect log decrypting..." )
1378- if 'A' in result_maps_for_uid [block ]:
1379- # print(f" - A record: { result_maps[block]['A'] }")
1380- records = result_maps_for_uid [block ]['A' ]
1381- if len (records ) > 1 :
1382- result_maps [uid ][block ]['A' ] = self .decrypt_by_list (records )
1383- else :
1384- print (f" > { len (records )} record" )
1385- if 'B' in result_maps_for_uid [block ]:
1386- # print(f" - B record: { result_maps[block]['B'] }")
1387- records = result_maps_for_uid [block ]['B' ]
1372+ for type_ , records in result_for_block .items ():
1373+ # print(f" - {type_} record: { records }")
13881374 if len (records ) > 1 :
1389- result_maps [ uid ][ block ][ 'B' ] = self .decrypt_by_list (records )
1375+ result_for_block [ type_ ] = self .decrypt_by_list (records )
13901376 else :
13911377 print (f" > { len (records )} record" )
13921378 print (" > Result ---------------------------" )
1393- for block in result_maps_for_uid .keys ():
1394- if 'A' in result_maps_for_uid [block ]:
1395- print (f" > Block { block } , A key result: { result_maps_for_uid [block ]['A' ]} " )
1396- if 'B' in result_maps_for_uid [block ]:
1397- print (f" > Block { block } , B key result: { result_maps_for_uid [block ]['B' ]} " )
1398- return
1379+ for block , result_for_block in result_maps_for_uid .items ():
1380+ for type_ , results in result_for_block .items ():
1381+ print (f" > Block { block } , { type_ } key result: { results } " )
13991382
14001383
14011384@hf_mf .command ('eload' )
0 commit comments