From 5ec97ad008fd93533e940926e3ef7ed68f324175 Mon Sep 17 00:00:00 2001 From: pablomartincalvo Date: Mon, 7 Jan 2019 18:09:52 +0100 Subject: [PATCH] =?UTF-8?q?Peque=C3=B1os=20refactorings.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- capturer/capturer.py | 8 +++++--- geocoder/geocoder.py | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/capturer/capturer.py b/capturer/capturer.py index d7bd3ff..3faba41 100644 --- a/capturer/capturer.py +++ b/capturer/capturer.py @@ -22,13 +22,15 @@ class Capturer: while True: - if (capturing_interface.get_pending_task() is None - or self.seconds_since_last_try() < minimum_seconds_between_tries + if (self.seconds_since_last_try() < minimum_seconds_between_tries or not self.in_working_hours()): sleep(Capturer.sleep_time_no_work) continue - task = CapturingTask(capturing_interface.get_pending_task()) + pending_task = capturing_interface.get_pending_task() + if not pending_task: + continue + task = CapturingTask(pending_task) self.last_try_datetime = datetime.datetime.now() task.capture() diff --git a/geocoder/geocoder.py b/geocoder/geocoder.py index 86baf5b..9156ae2 100644 --- a/geocoder/geocoder.py +++ b/geocoder/geocoder.py @@ -5,6 +5,7 @@ from time import sleep from db_layer.capturas_interface import capturas_interface from core.config import google_api_key, geocoder_delay + class Geocoder: def __init__(self): @@ -74,7 +75,7 @@ class Geocoder: class GeocodingCache: - cache_max_size = 1000 + cache_max_size = 2000 def __init__(self): self.geocoded_addresses = []