Merge pull request #137 from sehaas/dns_loc_record

Support DNS LOC record for @<domain> queries

bin/srv.py

@@ -14,6 +14,9 @@ from gevent.monkey import patch_all
 from gevent.subprocess import Popen, PIPE
 patch_all()
 
+import dns.resolver
+from dns.exception import DNSException
+
 from flask import Flask, request, render_template, send_from_directory
 app = Flask(__name__)
 
@@ -257,6 +260,10 @@ def wttr(location = None):
         if is_ip( location ):
             location = get_location( location )
         if location.startswith('@'):
+            try:
+                loc = dns.resolver.query( location[1:], 'LOC' )
+                location = str("%.7f,%.7f" % (loc[0].float_latitude, loc[0].float_longitude))
+            except DNSException, e:
                 location = get_location( socket.gethostbyname( location[1:] ) )
 
         location = location_canonical_name( location )

requirements.txt

@@ -3,3 +3,4 @@ geoip2
 geopy
 requests
 gevent
+dnspython