From a67e8fad60d78717a29a52e1db6fe8be2dbd8dd0 Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Sun, 31 Jan 2021 14:04:50 +0800
Subject: [PATCH] bugfix

---
 appPublic/iplocation.py | 63 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 appPublic/iplocation.py

diff --git a/appPublic/iplocation.py b/appPublic/iplocation.py
new file mode 100644
index 0000000..b3c852d
--- /dev/null
+++ b/appPublic/iplocation.py
@@ -0,0 +1,63 @@
+import os
+import sys
+from bs4 import BeautifulSoup
+from appPublic.http_client import Http_Client
+from appPublic.sockPackage import get_free_local_addr
+public_headers = {
+	"User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3100.0 Safari/537.36"
+}
+def ipip(ip):
+	# ipip.net
+	api= f"http://freeapi.ipip.net/{ip}"
+	hc = Http_Client()
+	r= hc.get(api, headers=public_headers)
+	return {
+		'country':r[0],
+		'city':r[2]
+	}
+
+def iplocation(ip):
+	# apikey come from
+	# https://app.apiary.io/globaliptv/tests/runs
+	# using my github accout
+	apikey='c675f89c4a0e9315437a1a5edca9b92c'
+	api = f"https://www.iplocate.io/api/lookup/{ip}?apikey={apikey}",
+	hc = Http_Client()
+	r= hc.get(api, headers=public_headers)
+	return r
+
+def ipaddress_com(ip):
+	url = f'https://www.ipaddress.com/ipv4/{ip}'
+	hc = Http_Client()
+	r = hc.get(url, headers=public_headers)
+	bs = BeautifulSoup(r, 'html.parser')
+	section = bs.find_all('section')[0]
+	tds = section.find_all('td')
+	d = {
+		"country":tds[6].contents[1].split(' ')[0],
+		"city":tds[8].contents[0],
+		"lat":float(tds[10].contents[0].split(' ')[0]),
+		"lon":float(tds[11].contents[0].split(' ')[0])
+	}
+	return d
+
+def get_ip_location(ip):
+	apis = {
+		"ipaddress":ipaddress_com,
+		"ipip.net":ipip,
+		"iplocation":iplocation,
+	}
+	hc = Http_Client()
+	for k,v in apis.items():
+		try:
+			r = v(ip)
+			return r
+		except:
+			pass
+		
+if __name__ == '__main__':
+	print(get_free_local_addr())
+	if len(sys.argv) > 1:
+		info = get_ip_location(sys.argv[1])
+		print(info)
+