Migrate to libloc

[ipfire.org.git] / src / web / location.py

diff --git a/src/web/location.py b/src/web/location.py
index 5807542a8fa0550392adb3cbd7eb27f05c17c986..9d874e3f79053498efb6d5e2f91dfb797eaf8df1 100644 (file)
--- a/src/web/location.py
+++ b/src/web/location.py
@@ -4,35 +4,31 @@
 import logging
 import tornado.web
 
+from .. import util
+
 from . import base
 
 class IndexHandler(base.BaseHandler):
        def get(self):
-               self.render("location/index.html")
+               self.render("location/index.html", address=self.current_address)
 
 
 class LookupHandler(base.BaseHandler):
        async def get(self, address):
-               peer = self.geoip.get_all(address)
-               if peer:
-                       peer["country_name"] = self.geoip.get_country_name(peer.country)
-
                # Lookup address
-               address = self.geoip.lookup(address)
+               address = util.Address(self.backend, address)
 
                # Lookup blacklists
                is_blacklisted = await address.is_blacklisted()
 
                self.render("location/lookup.html",
-                       address=address, is_blacklisted=is_blacklisted, peer=peer)
+                       address=address, is_blacklisted=is_blacklisted)
 
 
 class BlacklistsHandler(base.BaseHandler):
        async def get(self, address):
-               peer = self.geoip.get_all(address)
-
                # Lookup address
-               address = self.geoip.lookup(address)
+               address = util.Address(self.backend, address)
 
                # Lookup blacklists
                blacklists = await address.get_blacklists()