LibreQoS.py - code optymalisation, if first test is ok, dont next bec…

…ause its useless (the device is marked as deviceChanged allready)
LibreQoE · Jul 17, 2024 · ae35516 · ae35516
1 parent 2f6a392
commit ae35516
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/src/LibreQoS.py b/src/LibreQoS.py
@@ -1089,18 +1089,13 @@ def refreshShapersUpdateOnly():
 
 		for circuitID, circuit in lastLoadedSubscriberCircuitsByID.items():
 			if (circuitID in newlyUpdatedSubscriberCircuitsByID) and (circuitID in lastLoadedSubscriberCircuitsByID):
-				if newlyUpdatedSubscriberCircuitsByID[circuitID]['maxDownload'] != lastLoadedSubscriberCircuitsByID[circuitID]['maxDownload']:
-					devicesChanged = True
-				if newlyUpdatedSubscriberCircuitsByID[circuitID]['maxUpload'] != lastLoadedSubscriberCircuitsByID[circuitID]['maxUpload']:
-					devicesChanged = True
-				if newlyUpdatedSubscriberCircuitsByID[circuitID]['minDownload'] != lastLoadedSubscriberCircuitsByID[circuitID]['minDownload']:
-					devicesChanged = True
-				if newlyUpdatedSubscriberCircuitsByID[circuitID]['minUpload'] != lastLoadedSubscriberCircuitsByID[circuitID]['minUpload']:
-					devicesChanged = True					
-				if newlyUpdatedSubscriberCircuitsByID[circuitID]['devices'] != lastLoadedSubscriberCircuitsByID[circuitID]['devices']:
-					devicesChanged = True
-				if newlyUpdatedSubscriberCircuitsByID[circuitID]['ParentNode'] != lastLoadedSubscriberCircuitsByID[circuitID]['ParentNode']:
-					devicesChanged = True
+                                if ((newlyUpdatedSubscriberCircuitsByID[circuitID]['maxDownload'] != lastLoadedSubscriberCircuitsByID[circuitID]['maxDownload'])
+                                        or (newlyUpdatedSubscriberCircuitsByID[circuitID]['maxUpload'] != lastLoadedSubscriberCircuitsByID[circuitID]['maxUpload'])
+                                        or (newlyUpdatedSubscriberCircuitsByID[circuitID]['minDownload'] != lastLoadedSubscriberCircuitsByID[circuitID]['minDownload'])
+                                        or (newlyUpdatedSubscriberCircuitsByID[circuitID]['minUpload'] != lastLoadedSubscriberCircuitsByID[circuitID]['minUpload'])
+                                        or (newlyUpdatedSubscriberCircuitsByID[circuitID]['devices'] != lastLoadedSubscriberCircuitsByID[circuitID]['devices'])
+                                        or (newlyUpdatedSubscriberCircuitsByID[circuitID]['ParentNode'] != lastLoadedSubscriberCircuitsByID[circuitID]['ParentNode'])):
+                                                devicesChanged = True
 			else:
 				devicesChanged = True
 		for circuitID, circuit in newlyUpdatedSubscriberCircuitsByID.items():