Merge pull request AlessandroZ#424 from plonibarploni/wifi-order

fix wifi output order
zlgxzswjy · Sep 16, 2019 · a9ab9f0 · a9ab9f0
2 parents 8283508 + 04de187
commit a9ab9f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Linux/lazagne/config/write_output.py b/Linux/lazagne/config/write_output.py
@@ -11,6 +11,8 @@
 from platform import uname
 from time import gmtime, strftime
 
+from collections import OrderedDict
+
 
 class Bcolors():
     HEADER = '\033[95m'
@@ -143,7 +145,7 @@ def print_output(self, software_name, pwd_found):
             to_write = []
 
             # Remove duplicated password
-            pwd_found = [dict(t) for t in set([tuple(d.items()) for d in pwd_found])]
+            pwd_found = [OrderedDict(t) for t in set([tuple(d.items()) for d in pwd_found])]
 
             for pwd in pwd_found:
                 password_category = False

diff --git a/Linux/lazagne/softwares/wifi/wifi.py b/Linux/lazagne/softwares/wifi/wifi.py
@@ -11,6 +11,8 @@
 except ImportError:
     from configparser import RawConfigParser  # Python 3
 
+from collections import OrderedDict
+
 
 class Wifi(ModuleInfo):
     def __init__(self):
@@ -27,7 +29,7 @@ def run(self):
                 for w in wireless_ssid:
                     cp = RawConfigParser()
                     cp.read(os.path.join(directory, w))
-                    values = {}
+                    values = OrderedDict()
                     try:
                         values['SSID'] = cp.get('wifi', 'ssid')
                         values['Password'] = cp.get('wifi-security', 'psk')