Skip to content

Commit 300a31b

Browse files
committed
fix: avoid infite recursivity
1 parent a5ef1f1 commit 300a31b

File tree

1 file changed

+18
-2
lines changed
  • gestionatr/input/messages

1 file changed

+18
-2
lines changed

gestionatr/input/messages/F1.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1691,6 +1691,22 @@ def get_lectures(self, tipus=None, force_no_transforma_no_td_a_td=False, force_n
16911691
lectures = sorted(lectures, key=lambda x: x.lectura_desde.fecha)
16921692
return lectures
16931693

1694+
def get_lectures_base(self, tipus=None):
1695+
"""Retorna totes les lectures tal com venen informades al F1, sense manipular"""
1696+
lectures = []
1697+
try:
1698+
for integrador in self.integradores:
1699+
# If we don't have any type requirements or the current
1700+
# reading is in them
1701+
if not tipus or (integrador.tipus and integrador.tipus in tipus):
1702+
integrador.comptador = self
1703+
lectures.append(integrador)
1704+
except AttributeError:
1705+
pass
1706+
1707+
lectures = sorted(lectures, key=lambda x: x.lectura_desde.fecha)
1708+
return lectures
1709+
16941710
def get_fake_lectures(self, lectures, tipus=None):
16951711
"""
16961712
Aquest mètode contempla les diferents casuistiques que es poden donar perque l'ERP hagi de crear lectures
@@ -2391,7 +2407,7 @@ def get_comptador_amb_lectures(self, comptador=None, tipus=None):
23912407
# Comprova primer el comptador passat
23922408
if comptador:
23932409
for t in tipus:
2394-
if comptador.get_lectures(tipus=t):
2410+
if comptador.get_lectures_base(tipus=t):
23952411
return comptador
23962412

23972413
# Comprova la resta de comptadors
@@ -2401,7 +2417,7 @@ def get_comptador_amb_lectures(self, comptador=None, tipus=None):
24012417
# Evita tornar a comprovar el comptador passat
24022418
if comptador and c is comptador:
24032419
continue
2404-
if c.get_lectures(tipus=t):
2420+
if c.get_lectures_base(tipus=t):
24052421
return c
24062422

24072423
return None

0 commit comments

Comments
 (0)