Fixed dictionary sorting issue and resolved double parsing

Author: Michael Skelton

RansomwareOverview.xlsx

@@ -2,9 +2,6 @@
 import xlrd
 from collections import OrderedDict
 
-def formatJson(input):
-    return json.dumps(json.loads(input), indent=4)
-
 def excel_to_json(filename):
     wb = xlrd.open_workbook(filename)
     sh = wb.sheet_by_index(0)
@@ -14,21 +11,21 @@ def excel_to_json(filename):
 
     # Iterate through each row in worksheet and fetch values into dict
     for rownum in range(1, sh.nrows):
-        cars = OrderedDict()
+        wares = OrderedDict()
         row_values = sh.row_values(rownum)
-        cars['Name'] = row_values[0]
-        cars['Extensions'] = row_values[1]
-        cars['Patterns'] = row_values[2]
-        cars['RansomNoteFilenames'] = row_values[3]
-        cars['Comment'] = row_values[4]
-        cars['EncryptionAlgorithm'] = row_values[5]
-        cars['AlternateNames'] = row_values[6]
-        cars['Decryptor'] = row_values[7]
-        cars['AdditionalInfo1'] = row_values[8]
-        cars['AdditionalInfo2'] = row_values[9]
-        cars['Screenshots'] = row_values[10]
+        wares['Name'] = row_values[0]
+        wares['AlternateNames'] = row_values[6]
+        wares['Extensions'] = row_values[1]
+        wares['Patterns'] = row_values[2]
+        wares['RansomNoteFilenames'] = row_values[3]
+        wares['Comment'] = row_values[4]
+        wares['EncryptionAlgorithm'] = row_values[5]
+        wares['Decryptor'] = row_values[7]
+        wares['AdditionalInfo1'] = row_values[8]
+        wares['AdditionalInfo2'] = row_values[9]
+        wares['Screenshots'] = row_values[10]
 
-        c_list.append(cars)
+        c_list.append(wares)
 
     # Serialize the list of dicts to JSON
-    return formatJson(json.dumps(c_list))
+    return json.dumps(c_list, indent=4)