river_tao/OneForAll-mirror
1
0
Fork 0
mirror of https://github.com/shmilylty/OneForAll.git synced 2026-08-26 04:47:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	common/ipasn.py
This commit is contained in:
Jing Ling
2020-07-23 14:16:18 +08:00
parent e5b0783d34 b003bcf90f
commit 3a935c201d
2 changed files with 136 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/ipasn.py
+4 -4
View File
@@ -14,8 +14,8 @@ class Entry(object):
class IPAsnData(object):
def __init__(self):
zip_path = data_storage_dir.joinpath("IP2LOCATION-LITE-ASN.CSV.ZIP")
csv_path = data_storage_dir.joinpath("IP2LOCATION-LITE-ASN.CSV")
zip_path = data_storage_dir.joinpath('IP2LOCATION-LITE-ASN.CSV.ZIP')
csv_path = data_storage_dir.joinpath('IP2LOCATION-LITE-ASN.CSV')
if csv_path.exists():
asn_fp = open(csv_path)
else:
@@ -63,10 +63,10 @@ class IPAsnInfo(object):
def find(self, ip):
asn = self.asn.find(ip)
if asn:
result = {"cidr": asn[2], "asn": f'AS{asn[3]} {asn[4]}'}
result = {'cidr': asn[2], 'asn': f'AS{asn[3]} {asn[4]}'}
return result
else:
return {"cidr": "", "asn": ""}
return {'cidr': '', 'asn': ''}
if __name__ == "__main__":