Commit graph

958 commits

Author SHA1 Message Date
Gregory Danielson
303c2d2ab7
Observe two possible names for United States when checking us_ip 2020-11-15 11:13:15 -06:00
Gregory Danielson
bdcb24742d
Rework ipcache write to include new data from all sources 2020-11-15 11:10:19 -06:00
Gregory Danielson
c349dc2f17
Break from IPLOCATION method loop if one method produces non-null result 2020-11-15 11:02:12 -06:00
Gregory Danielson
34313eb162
Rework get_location to handle additions to location tuple; same return 2020-11-15 10:58:51 -06:00
Gregory Danielson
e8cc9adc7f
Rework geoip to include ccode, lat, long for cache purposes 2020-11-15 10:57:53 -06:00
Gregory Danielson
88cd84b5d2
Rework ipinfo to include ccode, lat, long for cache purposes 2020-11-15 10:57:22 -06:00
Gregory Danielson
b7517bce65
Rework ip2location to include ccode, lat, long for cache purposes 2020-11-15 10:56:43 -06:00
Gregory Danielson
66802657a5
Add COUNTRY_MAP dict for workaround function cleanliness 2020-11-15 10:54:51 -06:00
Gregory Danielson
117727bc2b
Add pycountry dependency for converting ISO code to country name 2020-11-15 10:53:59 -06:00
Gregory Danielson
bd7dd05cca
Observe region in geolocator 2020-11-01 20:04:14 -06:00
Gregory Danielson
953284d3d1
Check US IP out of 2nd element of query_source_location, due to added region 2020-11-01 17:18:04 -06:00
Gregory Danielson
afde91211c
Check and observe region and country in building formatted location 2020-11-01 17:00:09 -06:00
Gregory Danielson
deb2a5d01f
Adjust ipcache to observe new region
THIS WILL INVALIDATE THE EXISTING CACHE!
The new cache now pulls data from all three of geoip, ip2location, and
ipinfo, and stores it in the relatively simple city;region;country
format.

The old format would either store city;country or store
countrycode;country;region;city directly from ip2location, so it is much
more consistent with this change.
2020-11-01 16:37:45 -06:00
Gregory Danielson
2ebdb15398
Adjust ipcachewrite to account for region addition 2020-11-01 16:37:26 -06:00
Gregory Danielson
c7d3b32d53
Remove cache operation from ip2location; shortcut where possible
This comes with something of a refactor.

- IP2LOCATION_KEY is now checked with `if not` to reduce indention
- ConnectionError is increased to RequestException to catch all requests
  errors
  - On that note, now raising for status too
2020-11-01 16:35:17 -06:00
Gregory Danielson
628a860d6d
Remove cache operation from ipinfo; shortcut where possible
This comes with something of a refactor.

- IPINFO_TOKEN is now checked with `if not` to reduce indention
- ConnectionError is increased to RequestException to catch all requests
  errors
  - On that note, now raising for status too
- Now catching ValueError in case of json parsing failure
2020-11-01 16:32:13 -06:00
Gregory Danielson
996485adf1
Remove cache operation from geoip; shortcut where possible 2020-11-01 16:31:46 -06:00
Gregory Danielson
e4ac3f266f
Do cache read and write in get_location instead of duplicated in each IPLOCATION_ORDER method 2020-11-01 16:31:15 -06:00
Gregory Danielson
7af4aaa8ec
Correct docstring for get_location 2020-11-01 16:30:00 -06:00
Gregory Danielson
e1adca3bf0
Add region into location formatting 2020-11-01 16:28:24 -06:00
Gregory Danielson
f3bce5f806
Unpack region from get_location call or fail case 2020-11-01 16:27:40 -06:00
Gregory Danielson
4fa1ebd995
Add location[2] to ipcachewrite for new region part of cache 2020-11-01 15:03:14 -06:00
Gregory Danielson
08be8787b1
Observe new region var in get_location 2020-11-01 13:50:05 -06:00
Gregory Danielson
c65614d230
Enable ipcache writes from geoip lookup 2020-11-01 13:45:32 -06:00
Gregory Danielson
ef477822ae
Coalesce location into 3-tuple in geoip lookup 2020-11-01 13:45:08 -06:00
Gregory Danielson
4996c5a553
Pass region through workaround for consistency 2020-11-01 13:42:31 -06:00
Gregory Danielson
511b13bdcb
Capture and return region from ipinfo lookup 2020-11-01 13:41:52 -06:00
Gregory Danielson
35a35a56e2
Capture region from ip2location lookup 2020-11-01 13:40:20 -06:00
Gregory Danielson
af9658f63b
Check ipcache before fetching from geoip 2020-11-01 13:19:45 -06:00
Gregory Danielson
0056a97386
Capture and return region from geoip lookup 2020-11-01 13:05:03 -06:00
Igor Chubin
859756cd8b
Merge pull request #541 from amekare/master
added spanish translation corrections
2020-11-01 13:14:02 +01:00
Andrea Torres
280675775d added spanish translation corrections 2020-10-31 13:55:51 -06:00
Igor Chubin
df4e145ffb Add link to doc/terminal-images.md to README 2020-10-29 20:36:25 +01:00
Igor Chubin
3ecc3a8273 Add doc/ 2020-10-29 20:34:44 +01:00
Igor Chubin
848f50574f Add v3.wttr.in description 2020-10-29 19:22:44 +01:00
Igor Chubin
5529a4f2f0
Merge pull request #537 from oersen/typo-fix-tr
Fix a typo and alignments in Turkish translations
2020-10-18 18:41:11 +02:00
Oğuz Ersen
c0327757d4 Fix a typo and alignments in Turkish translations 2020-10-18 16:55:14 +03:00
Igor Chubin
32d0a4b61f
Merge pull request #534 from amadeogarcia/patch-1 (#533)
Patch 1 - Spanish translation
2020-10-15 06:21:17 +02:00
Igor Chubin
3717e30837
Merge branch 'master' into patch-1 2020-10-15 06:20:14 +02:00
Amadeo García Torrano
54f0b6ec48
Small mistake v2
I don't know why I put 'reporte'... Weird word.
2020-10-14 18:49:35 -03:00
Amadeo García Torrano
5bc944e464
Small mistake
Forgot a preposition in the 'FOLLOW' message.
2020-10-14 18:37:47 -03:00
Amadeo García Torrano
ad57cf96ea
Spanish translation
- Fixed minor grammar issues.
- Translated Oymyakon in 'NOT_FOUND_MESSAGE'
2020-10-14 18:35:42 -03:00
Igor Chubin
9e62a8cdcb Basque translation, v2 view (#438) 2020-10-14 08:22:24 +02:00
Igor Chubin
91a5f77d2e JSON output mimetype (fixes #514) 2020-10-14 07:32:43 +02:00
Igor Chubin
a35a0f678c
Merge pull request #532 from elerch/metno
initial metno implementation
2020-10-14 07:08:35 +02:00
Igor Chubin
8e87bcc731
Remove "Prob. of prep" (#485) 2020-10-14 06:54:30 +02:00
Igor Chubin
d76d2b1314 use pip --no-cache-dir in Dockerfile (#504) 2020-10-12 13:59:10 +02:00
Emil Lerch
17e6e6c218
initial metno implementation 2020-10-08 16:24:19 -07:00
Igor Chubin
54d71beea2
Merge pull request #524 from SuperSandro2000/docker-review
Docker review
2020-09-23 09:18:43 +02:00
Sandro Jäckel
399c4d25ef
Document files that should be mounted in Docker 2020-09-23 07:46:22 +02:00