Integrate network module into "Computer" class and console application.

console.py

@@ -43,10 +43,9 @@ def start(computer):
     for _ in range(16):
         clear()
         # Display general information about computer
-        print('Hostname: ' + str(computer.hostname))
         print('OS: ' + str(computer.os))
-        print('Boot time: ' + str(computer.boot_time))
-        print('Uptime: ' + str(computer.uptime))
+        print('Boot time: {0}; Uptime: {1}'.format(computer.boot_time, computer.uptime))
+        print('')
         # Display CPU info
         print('CPU name: ' + str(computer.processor.name))
         print('Amount of CPU cores: ' + str(computer.processor.count))
@@ -55,12 +54,29 @@ def start(computer):
         if computer.processor.temperature is not None:
             cpu_temperature = Format.temperature(computer.processor.temperature)
         print('CPU temperature: ' + cpu_temperature)
+        print('')
+        # Display network info
+        print('Hostname: ' + str(computer.hostname))
+        print('Network interface: ' + str(computer.network_interface.name))
+        print('MAC address: ' + str(computer.network_interface.hardware_address))
+        print('IP: {0}; Mask: {2}; Gateway: {3}'.format(
+            computer.network_interface.ip_address,
+            computer.network_interface.broadcast_address,
+            computer.network_interface.subnet_mask,
+            computer.network_interface.default_route
+        ))
+        print('Sent data: {0}; Received data: {1}'.format(
+            Format.byte_value(computer.network_interface.bytes_sent),
+            Format.byte_value(computer.network_interface.bytes_recv)
+        ))
+        print('')
         # Display virtual memory info
         print('Virtual memory: use {0} from {1}, {2}'.format(
             Format.byte_value(computer.virtual_memory.available),
             Format.byte_value(computer.virtual_memory.total),
             Format.percent(computer.virtual_memory.percent)
         ))
+        print('')
         # Display nonvolatile memory info
         output_format1 = '{0:_^16}{1:_^16}{2:_^16}{3:_^16}{4:_^16}'
         output_format2 = '{0: ^16}{1: ^16}{2: ^16}{3: ^16}{4: ^16}'

pyspectator/computer.py

@@ -1,9 +1,10 @@
 import psutil
 import platform
 from datetime import datetime
+from pyspectator.monitoring import AbcMonitor
 from pyspectator.memory import NonvolatileMemory, VirtualMemory, SwapMemory
 from pyspectator.processor import Processor
-from pyspectator.monitoring import AbcMonitor
+from pyspectator.network import NetworkInterface
 
 
 class Computer(AbcMonitor):
@@ -22,6 +23,7 @@ def __init__(self):
         self.__nonvolatile_memory_devices = set([dev_info.device for dev_info in self.__nonvolatile_memory])
         self.__virtual_memory = VirtualMemory(monitoring_latency=1)
         self.__swap_memory = SwapMemory(monitoring_latency=1)
+        self.__network_interface = NetworkInterface(monitoring_latency=3)
         super().__init__(monitoring_latency=3)
 
     # endregion
@@ -72,6 +74,10 @@ def virtual_memory(self):
     def swap_memory(self):
         return self.__swap_memory
 
+    @property
+    def network_interface(self):
+        return self.__network_interface
+
     # endregion
 
     def _monitoring_action(self):

start.py

@@ -2,14 +2,16 @@
 from console import start as start_console
 from pyspectator.computer import Computer
 
+# Initialize computer instance
+computer = Computer()
 try:
-    # Initialize computer instance
-    computer = Computer()
+    # Start monitoring
     computer.start_monitoring()
     computer.processor.start_monitoring()
     for mem in computer.nonvolatile_memory:
         mem.start_monitoring()
     computer.virtual_memory.start_monitoring()
+    computer.network_interface.start_monitoring()
 
     # Start console interface
     start_console(computer)
@@ -21,5 +23,6 @@
     for mem in computer.nonvolatile_memory:
         mem.stop_monitoring()
     computer.virtual_memory.stop_monitoring()
+    computer.network_interface.stop_monitoring()
     computer.stop_monitoring()
     sleep(1)