Adding fancier version checks to allow to the cache to be preserved longer

[theonering] / src / gvoice / session.py

diff --git a/src/gvoice/session.py b/src/gvoice/session.py
index 270cac4..3a7de00 100644 (file)
--- a/src/gvoice/session.py
+++ b/src/gvoice/session.py
@@ -10,15 +10,15 @@ import conversations
 import state_machine
 
 
-_moduleLogger = logging.getLogger("gvoice.session")
+_moduleLogger = logging.getLogger(__name__)
 
 
 class Session(object):
 
        _DEFAULTS = {
-               "contacts": (3, "hours"),
-               "voicemail": (30, "minutes"),
-               "texts": (5, "minutes"),
+               "contacts": (12, "hours"),
+               "voicemail": (120, "minutes"),
+               "texts": (10, "minutes"),
        }
 
        _MINIMUM_MESSAGE_PERIOD = state_machine.to_seconds(minutes=30)
@@ -29,17 +29,20 @@ class Session(object):
                else:
                        for key, (quant, unit) in defaults.iteritems():
                                if quant == 0:
-                                       defaults[key] = self._DEFAULTS[key]
+                                       defaults[key] = (self._DEFAULTS[key], unit)
                                elif quant < 0:
-                                       defaults[key] = state_machine.INFINITE_PERIOD
+                                       defaults[key] = (state_machine.UpdateStateMachine.INFINITE_PERIOD, unit)
                self._username = None
                self._password = None
 
                self._backend = backend.GVoiceBackend(cookiePath)
 
-               contactsPeriodInSeconds = state_machine.to_seconds(
-                       **{defaults["contacts"][1]: defaults["contacts"][0],}
-               )
+               if defaults["contacts"][0] == state_machine.UpdateStateMachine.INFINITE_PERIOD:
+                       contactsPeriodInSeconds = state_machine.UpdateStateMachine.INFINITE_PERIOD
+               else:
+                       contactsPeriodInSeconds = state_machine.to_seconds(
+                               **{defaults["contacts"][1]: defaults["contacts"][0],}
+                       )
                self._addressbook = addressbook.Addressbook(self._backend)
                self._addressbookStateMachine = state_machine.UpdateStateMachine([self.addressbook], "Addressbook")
                self._addressbookStateMachine.set_state_strategy(
@@ -55,9 +58,14 @@ class Session(object):
                        state_machine.ConstantStateStrategy(contactsPeriodInSeconds)
                )
 
-               voicemailPeriodInSeconds = state_machine.to_seconds(
-                       **{defaults["voicemail"][1]: defaults["voicemail"][0],}
-               )
+               if defaults["voicemail"][0] == state_machine.UpdateStateMachine.INFINITE_PERIOD:
+                       voicemailPeriodInSeconds = state_machine.UpdateStateMachine.INFINITE_PERIOD
+                       idleVoicemailPeriodInSeconds = state_machine.UpdateStateMachine.INFINITE_PERIOD
+               else:
+                       voicemailPeriodInSeconds = state_machine.to_seconds(
+                               **{defaults["voicemail"][1]: defaults["voicemail"][0],}
+                       )
+                       idleVoicemailPeriodInSeconds = max(voicemailPeriodInSeconds * 4, self._MINIMUM_MESSAGE_PERIOD)
                self._voicemails = conversations.Conversations(self._backend.get_voicemails)
                self._voicemailsStateMachine = state_machine.UpdateStateMachine([self.voicemails], "Voicemail")
                self._voicemailsStateMachine.set_state_strategy(
@@ -66,21 +74,30 @@ class Session(object):
                )
                self._voicemailsStateMachine.set_state_strategy(
                        state_machine.StateMachine.STATE_IDLE,
-                       state_machine.ConstantStateStrategy(
-                               min(voicemailPeriodInSeconds * 4, self._MINIMUM_MESSAGE_PERIOD)
-                       )
+                       state_machine.ConstantStateStrategy(idleVoicemailPeriodInSeconds)
                )
                self._voicemailsStateMachine.set_state_strategy(
                        state_machine.StateMachine.STATE_ACTIVE,
-                       state_machine.ConstantStateStrategy(voicemailPeriodInSeconds)
+                       state_machine.NTimesStateStrategy(
+                               3 * [state_machine.to_seconds(minutes=1)], voicemailPeriodInSeconds
+                       )
                )
                self._voicemails.updateSignalHandler.register_sink(
                        self._voicemailsStateMachine.request_reset_timers
                )
 
-               textsPeriodInSeconds = state_machine.to_seconds(
-                       **{defaults["texts"][1]: defaults["texts"][0],}
-               )
+               if defaults["texts"][0] == state_machine.UpdateStateMachine.INFINITE_PERIOD:
+                       initTextsPeriodInSeconds = state_machine.UpdateStateMachine.INFINITE_PERIOD
+                       minTextsPeriodInSeconds = state_machine.UpdateStateMachine.INFINITE_PERIOD
+                       textsPeriodInSeconds = state_machine.UpdateStateMachine.INFINITE_PERIOD
+                       idleTextsPeriodInSeconds = state_machine.UpdateStateMachine.INFINITE_PERIOD
+               else:
+                       initTextsPeriodInSeconds = state_machine.to_seconds(seconds=20)
+                       minTextsPeriodInSeconds = state_machine.to_seconds(seconds=1)
+                       textsPeriodInSeconds = state_machine.to_seconds(
+                               **{defaults["texts"][1]: defaults["texts"][0],}
+                       )
+                       idleTextsPeriodInSeconds = max(textsPeriodInSeconds * 4, self._MINIMUM_MESSAGE_PERIOD)
                self._texts = conversations.Conversations(self._backend.get_texts)
                self._textsStateMachine = state_machine.UpdateStateMachine([self.texts], "Texting")
                self._textsStateMachine.set_state_strategy(
@@ -89,15 +106,13 @@ class Session(object):
                )
                self._textsStateMachine.set_state_strategy(
                        state_machine.StateMachine.STATE_IDLE,
-                       state_machine.ConstantStateStrategy(
-                               min(textsPeriodInSeconds * 4, self._MINIMUM_MESSAGE_PERIOD)
-                       )
+                       state_machine.ConstantStateStrategy(idleTextsPeriodInSeconds)
                )
                self._textsStateMachine.set_state_strategy(
                        state_machine.StateMachine.STATE_ACTIVE,
                        state_machine.GeometricStateStrategy(
-                               state_machine.to_seconds(seconds=20),
-                               state_machine.to_seconds(seconds=1),
+                               initTextsPeriodInSeconds,
+                               minTextsPeriodInSeconds,
                                textsPeriodInSeconds,
                        )
                )
@@ -171,7 +186,7 @@ class Session(object):
                # To throttle checking with the server, use a 30s cache
                newTime = time.time()
                if self._lastDndCheck + 30 < newTime:
-                       self._lasDndCheck = newTime
+                       self._lastDndCheck = newTime
                        self._cachedIsDnd = self._backend.is_dnd()
                return self._cachedIsDnd