extern/wttr.in
1
0
Fork 0
mirror of https://github.com/chubin/wttr.in.git synced 2025-08-15 08:12:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

location.py refactoring

Browse Source
This commit is contained in:
Igor Chubin
2018-10-07 12:34:36 +02:00
parent af621947d9
commit 218acd8b9d
1 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
lib/location.py
View File

@ -163,50 +163,59 @@ LOCATION_BLACK_LIST = [x.strip() for x in open(BLACKLIST, 'r').readlines()]
IATA_CODES = load_iata_codes(IATA_CODES_FILE) IATA_CODES = load_iata_codes(IATA_CODES_FILE)
def is_location_blocked(location): def is_location_blocked(location):
"""
Return True if this location is blocked
or False if it is allowed
"""
return location is not None and location.lower() in LOCATION_BLACK_LIST return location is not None and location.lower() in LOCATION_BLACK_LIST
def location_processing(): def location_processing(location, ip_addr):
"""
"""
# if location is starting with ~ # if location is starting with ~
# or has non ascii symbols # or has non ascii symbols
# it should be handled like a search term (for geolocator) # it should be handled like a search term (for geolocator)
override_location_name = None override_location_name = None
full_address = None full_address = None
if location is not None and not ascii_only(location): if location is not None and not ascii_only(location):
location = "~" + location location = "~" + location
if location is not None and location.upper() in IATA_CODES: if location is not None and location.upper() in IATA_CODES:
location = '~%s' % location location = '~%s' % location
if location is not None and location.startswith('~'): if location is not None and location.startswith('~'):
geolocation = geolocator(location_canonical_name(location[1:])) geolocation = geolocator(location_canonical_name(location[1:]))
if geolocation is not None: if geolocation is not None:
override_location_name = location[1:].replace('+', ' ') override_location_name = location[1:].replace('+', ' ')
location = "%s,%s" % (geolocation['latitude'], geolocation['longitude']) location = "%s,%s" % (geolocation['latitude'], geolocation['longitude'])
full_address = geolocation['address'] full_address = geolocation['address']
print full_address print full_address
else: else:
location = NOT_FOUND_LOCATION #location[1:] location = NOT_FOUND_LOCATION #location[1:]
try:
query_source_location = get_location(ip_addr)
except:
query_source_location = NOT_FOUND_LOCATION, None
country = None
if location is None or location == 'MyLocation':
location, country = query_source_location
if is_ip(location):
location, country = get_location(location)
if location.startswith('@'):
try: try:
query_source_location = get_location(ip_addr) location, country = get_location(socket.gethostbyname(location[1:]))
except: except:
query_source_location = NOT_FOUND_LOCATION, None query_source_location = NOT_FOUND_LOCATION, None
country = None location = location_canonical_name(location)
if location is None or location == 'MyLocation':
location, country = query_source_location
if is_ip(location):
location, country = get_location(location)
if location.startswith('@'):
try:
location, country = get_location(socket.gethostbyname(location[1:]))
except:
query_source_location = NOT_FOUND_LOCATION, None
location = location_canonical_name(location)
return location, \
override_location_name, \
full_address, \
country, \
query_source_location