change: simplify logic

dzgui/util/ip.py

@@ -42,43 +42,14 @@ def is_usable(ip: str) -> bool:
     return True
 
 
-def get_coords(ips: "Path", ip: str) -> Coords:
+def get_coords(db_path: "Path", ip: str) -> Coords:
-    split = ip2list(ip)
+    if not is_usable(ip):
-
-    if is_reserved(split):
         raise ReservedIPError(f"{ip} is a reserved IP address.")
-
+    try:
-    prefix = f"^{split[0]}.{split[1]}."
+        lat, lon = read_from_table(db_path, ip)
-
+        return Coords(lat, lon)
-    if shutil.which("rg") is not None:
+    except Exception:
-        args = ["/usr/bin/rg", prefix, str(ips)]
+        raise GeolocationError("No matching records found")
-    else:
-        args = ["/usr/bin/grep", "-E", prefix, str(ips)]
-    proc = subprocess.run(args, capture_output=True, text=True)
-
-    if proc.returncode != 0:
-        raise GeolocationError("Failed to split records")
-
-    ip_list = proc.stdout.splitlines()
-
-    for address in ip_list:
-        fields = address.split(",")
-        upper = fields[1]
-
-        upper_digits = ip2list(upper)
-        if ip == upper:
-            return Coords(float(fields[-2]), float(fields[-1]))
-
-        if split[2] > upper_digits[2]:
-            continue
-
-        if split[2] == upper_digits[2]:
-            if split[3] > upper_digits[3]:
-                continue
-
-        if split[2] <= upper_digits[2]:
-            return Coords(float(fields[-2]), float(fields[-1]))
-    raise GeolocationError("No matching records found")
 
 
 def get_local_ip() -> str: