fixed web interface, optimized location db

Author: DevAlone

models.py

@@ -12,6 +12,18 @@
     **settings.DATABASE_CONNECTION_KWARGS,
 )
 
+location_database_reader = None
+
+def init_location_db_reader():
+    global location_database_reader
+    if os.path.isfile(settings.GEOLITE2_CITY_FILE_LOCATION):
+        location_database_reader = geoip2.database.Reader(settings.GEOLITE2_CITY_FILE_LOCATION)
+    else:
+        # DB doesn`t exists
+        log.warning("Public IP Database is not found. See GEOLITE2_CITY_FILE_LOCATION in settings.py")
+
+init_location_db_reader()
+
 class Proxy(peewee.Model):
     class Meta:
         database = raw_db
@@ -63,23 +75,18 @@ def get_raw_protocol(self):
 
     @property
     def location(self):
-        if os.path.isfile(settings.GEOLITE2_CITY_FILE_LOCATION):
-            reader = geoip2.database.Reader(settings.GEOLITE2_CITY_FILE_LOCATION)
-            response = reader.city(self.domain)
-            
-            return {
-                'latitude': response.location.latitude,
-                'longitude': response.location.longitude,
-                'country_code': response.country.iso_code,
-                'country': response.country.name,
-                'city': response.city.name,            
-            }
-        else:
-            '''
-            DB doesn`t exists
-            '''
-            log.warning("Public IP Database has been absent")
+        if location_database_reader is None:
             return None
+
+        response = location_database_reader.city(self.domain)
+        
+        return {
+            'latitude': response.location.latitude,
+            'longitude': response.location.longitude,
+            'country_code': response.country.iso_code,
+            'country': response.country.name,
+            'city': response.city.name,            
+        }
 
     @property    
     def address(self):

server/frontend/app.py

@@ -110,9 +110,7 @@ async def get_proxies_html(self, request):
                 "number_of_bad_checks": proxy.number_of_bad_checks,
                 "bad_proxy": proxy.bad_proxy,
                 "white_ipv4": proxy.white_ipv4,
-                "city": proxy.city,
-                "region": proxy.region,
-                "country_code": proxy.country_code,
+                "location": proxy.location,
             } for proxy in proxies]
         }
 

server/templates/proxies.html

@@ -1,43 +1,41 @@
 {% extends "base.html" %}
 {% block body %}
 <table id=proxies>
-    <thead>
-        <tr>
-            <td>address</td>
-            <td>response_time</td>
-            <td>uptime</td>
-            <td>bad_uptime</td>
-            <td>last_check_time</td>
-            <td>checking_period</td>
-            <td>number_of_bad_checks</td>
-            <td>bad_proxy</td>
-            <td>ip</td>
-            <td>city</td>
-            <td>region</td>
-            <td>country</td>
-        </tr>
-    </thead>
-    <tbody>
+	<thead>
+		<tr>
+			<td>address</td>
+			<td>response_time</td>
+			<td>uptime</td>
+			<td>bad_uptime</td>
+			<td>last_check_time</td>
+			<td>checking_period</td>
+			<td>number_of_bad_checks</td>
+			<td>bad_proxy</td>
+			<td>ip</td>
+			<td>city</td>
+			<td>country</td>
+		</tr>
+	</thead>
+	<tbody>
 
-    {% for proxy in proxies %}
-        <tr>
-            <td>{{ proxy.address }}</td>
-            <td>{{ proxy.response_time }} ms</td>
-            <td>{{ proxy.uptime }}</td>
-            <td>{{ proxy.bad_uptime }}</td>
-            <td id="proxy_{{ loop.index }}_last_check_time">{{ proxy.last_check_time }}</td>
-            <td>{{ proxy.checking_period }}</td>
-            <td>{{ proxy.number_of_bad_checks }}</td>
-            <td>{{ proxy.bad_proxy }}</td>
-            <td>{{ proxy.white_ipv4 }}</td>
-            <td>{{ proxy.city }}</td>
-            <td>{{ proxy.region }}</td>
-            <td>{{ proxy.country_code }}</td>
-        </tr>
-        <script>
-            proxy_{{ loop.index }}_last_check_time.textContent = new Date({{ proxy.last_check_time }} * 1000);
-        </script>
-    {% endfor %}
-    </tbody>
+		{% for proxy in proxies %}
+		<tr>
+			<td>{{ proxy.address }}</td>
+			<td>{{ proxy.response_time }} ms</td>
+			<td>{{ proxy.uptime }}</td>
+			<td>{{ proxy.bad_uptime }}</td>
+			<td id="proxy_{{ loop.index }}_last_check_time">{{ proxy.last_check_time }}</td>
+			<td>{{ proxy.checking_period }}</td>
+			<td>{{ proxy.number_of_bad_checks }}</td>
+			<td>{{ proxy.bad_proxy }}</td>
+			<td>{{ proxy.white_ipv4 }}</td>
+			<td>{{ proxy.location['city'] }}</td>
+			<td>{{ proxy.location['country_code'] }}</td>
+		</tr>
+		<script>
+			proxy_{{ loop.index }}_last_check_time.textContent = new Date({{ proxy.last_check_time }} * 1000);
+		</script>
+		{% endfor %}
+	</tbody>
 </table>
 {% endblock %}