extern/wttr.in
1
0
Fork 0
mirror of https://github.com/chubin/wttr.in.git synced 2025-08-15 16:22:51 +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

15
lib/location.py
View File

@ -163,10 +163,16 @@ 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
@ -198,8 +204,6 @@ def location_processing():
if location is None or location == 'MyLocation': if location is None or location == 'MyLocation':
location, country = query_source_location location, country = query_source_location
if is_ip(location): if is_ip(location):
location, country = get_location(location) location, country = get_location(location)
if location.startswith('@'): if location.startswith('@'):
@ -210,3 +214,8 @@ def location_processing():
location = location_canonical_name(location) location = location_canonical_name(location)
return location, \
override_location_name, \
full_address, \
country, \
query_source_location