From a8dd886c14f3e953c9b6fcbcb0f8cb6a03a18cd9 Mon Sep 17 00:00:00 2001
From: ipapi-co <hello@ipapi.co>
Date: Tue, 3 Jan 2017 15:23:30 +0530
Subject: [PATCH] combine field & location functions

---
 ipapi/ipapi.py | 64 +++++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/ipapi/ipapi.py b/ipapi/ipapi.py
index 406c9bc..476e352 100644
--- a/ipapi/ipapi.py
+++ b/ipapi/ipapi.py
@@ -6,55 +6,59 @@
 import argparse
 from requests import get
 
-headers = {'user-agent': 'ipapi/ipapi-python/0.4'}
+
 API_KEY = ''
 
+headers    = {'user-agent': 'ipapi/ipapi-python/0.5.1'}
 
-def location(ip=None, key=None):
-    ''' Get complete geolocation data (as JSON) for given IP address '''
-    if ip:
-        url = 'https://ipapi.co/{}/json/'.format(ip)
-    else:
-        url = 'https://ipapi.co/json/'
-    if key or API_KEY:
-        url = '{}?key={}'.format(url, (key or API_KEY))
+field_list = ['ip', 'city', 'region', 'country', 'postal',
+              'latitude', 'longitude', 'timezone', 'latlong']
 
-    response = get(url, headers=headers)
-    return response.json()
 
 
-def field(field, ip=None, key=None):
-    ''' Get specific geolocation field (as text) for given IP address '''
-    if ip:
-        url = 'https://ipapi.co/{}/{}/'.format(ip, field)
+def location(ip=None, key=None, field=None):
+    ''' Get geolocation data for a given IP address
+        If field is specified, get specific field as text 
+        Else get complete location data as JSON 
+    '''
+
+    if field and (field not in field_list):
+        return 'Invalid field'
+
+    if field:
+        if ip:
+            url = 'https://ipapi.co/{}/{}/'.format(ip, field)
+        else:
+            url = 'https://ipapi.co/{}/'.format(field)
     else:
-        url = 'https://ipapi.co/{}/'.format(field)
+        if ip:
+            url = 'https://ipapi.co/{}/json/'.format(ip)
+        else:
+            url = 'https://ipapi.co/json/'
+
     if key or API_KEY:
         url = '{}?key={}'.format(url, (key or API_KEY))
 
     response = get(url, headers=headers)
-    return response.text
+
+    if field:
+        return response.text
+    else:
+        return response.json()
+
 
 
-def main(argv=None):
-    field_list = ['ip', 'city', 'region', 'country', 'postal', 'latitude', 'longitude', 'timezone', 'latlong']
-    
+def main(argv=None):    
     argv = argv or sys.argv[1:]
     parser = argparse.ArgumentParser(description='IP address location API : https://ipapi.co')
-    parser.add_argument('-i', '--ip', dest='ip', help='IP address') 
-    parser.add_argument('-f', '--field', dest='field', help='specific field e.g. {}'.format(', '.join(field_list)), default=None) 
+    parser.add_argument('-i', '--ip', dest='ip', help='IP address', default=None) 
+    parser.add_argument('-f', '--field', dest='field', help='specific field e.g. {}'.format(', '.join(field_list))) 
     parser.add_argument('-k', '--key', dest='key', help='API key', default=None) 
     args = parser.parse_args(argv)
 
-    if args.field and (args.field not in field_list):
-        print 'Invalid field : {}'.format(args.field)
-        return
-
-    if args.field:
-        print field(args.field, args.ip, args.key)
-    else:
-        print location(args.ip, args.key)
+    print location(args.ip, args.key, args.field)
 
 
 if __name__ == "__main__":       
     sys.exit(main())   
+