only check cache and add for lookup if not bogon

ipinfo · Jan 31, 2024 · 2de1c2c · 2de1c2c
1 parent e595a4b
commit 2de1c2c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/ipinfo/handler.py b/ipinfo/handler.py
@@ -201,13 +201,11 @@ def getBatchDetails(
                 details["bogon"] = True
                 result[ip_address] = Details(details)
             else:
-                lookup_addresses.append(ip_address)
-
-            try:
-                cached_ipaddr = self.cache[cache_key(ip_address)]
-                result[ip_address] = cached_ipaddr
-            except KeyError:
-                lookup_addresses.append(ip_address)
+                try:
+                    cached_ipaddr = self.cache[cache_key(ip_address)]
+                    result[ip_address] = cached_ipaddr
+                except KeyError:
+                    lookup_addresses.append(ip_address)
 
         # all in cache - return early.
         if len(lookup_addresses) == 0:
@@ -322,13 +320,11 @@ def getBatchDetailsIter(
                 details["bogon"] = True
                 yield Details(details)
             else:
-                lookup_addresses.append(ip_address)
-
-            try:
-                cached_ipaddr = self.cache[cache_key(ip_address)]
-                result[ip_address] = cached_ipaddr
-            except KeyError:
-                lookup_addresses.append(ip_address)
+                try:
+                    cached_ipaddr = self.cache[cache_key(ip_address)]
+                    result[ip_address] = cached_ipaddr
+                except KeyError:
+                    lookup_addresses.append(ip_address)
 
         # all in cache - exit early.
         if len(lookup_addresses) == 0:

diff --git a/ipinfo/handler_async.py b/ipinfo/handler_async.py
@@ -353,13 +353,11 @@ async def getBatchDetailsIter(
                 details = {"ip": ip_address, "bogon": True}
                 yield Details(details)
             else:
-                lookup_addresses.append(ip_address)
-
-            try:
-                cached_ipaddr = self.cache[cache_key(ip_address)]
-                results[ip_address] = cached_ipaddr
-            except KeyError:
-                lookup_addresses.append(ip_address)
+                try:
+                    cached_ipaddr = self.cache[cache_key(ip_address)]
+                    results[ip_address] = cached_ipaddr
+                except KeyError:
+                    lookup_addresses.append(ip_address)
 
         if not lookup_addresses:
             yield results.items()