From b905e0139c015cda66459aae68b3c69cdf6df599 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Sat, 28 May 2022 08:51:10 -0700
Subject: [PATCH] Add continent to geoip lookup

---
 data/interfaces/default/ip_address_modal.html |  2 ++
 plexpy/plextv.py                              | 12 ++++++------
 plexpy/webserve.py                            | 13 +++++++------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/data/interfaces/default/ip_address_modal.html b/data/interfaces/default/ip_address_modal.html
index 7b831eeb..239b95e2 100644
--- a/data/interfaces/default/ip_address_modal.html
+++ b/data/interfaces/default/ip_address_modal.html
@@ -40,6 +40,7 @@
             <div id="ip_error" class="col-sm-12 text-muted"></div>
             <div class="col-sm-6">
                 <ul class="list-unstyled">
+                    <li>Continent: <strong><span id="continent"></span></strong></li>
                     <li>Country: <strong><span id="country"></span></strong></li>
                     <li>Region: <strong><span id="region"></span></strong></li>
                     <li>City: <strong><span id="city"></span></strong></li>
@@ -103,6 +104,7 @@
                     $('#ip_error').html('<i class="fa fa-exclamation-circle"></i> ' + result.message).show();
                 } else {
                     var data = result.data;
+                    $('#continent').html(data.continent);
                     $('#country').html(data.country);
                     $('#region').html(data.region);
                     $('#city').html(data.city);
diff --git a/plexpy/plextv.py b/plexpy/plextv.py
index 1cb53dd5..ebfa0bc6 100644
--- a/plexpy/plextv.py
+++ b/plexpy/plextv.py
@@ -930,15 +930,15 @@ class PlexTV(object):
             if len(coordinates) == 2:
                 latitude, longitude = [helpers.cast_to_float(c) for c in coordinates]
 
-            geo_info = {"code": helpers.get_xml_attr(a, 'code') or None,
+            geo_info = {"city": helpers.get_xml_attr(a, 'city') or None,
+                        "code": helpers.get_xml_attr(a, 'code') or None,
+                        "continent": helpers.get_xml_attr(a, 'continent_code') or None,
                         "country": helpers.get_xml_attr(a, 'country') or None,
-                        "region": helpers.get_xml_attr(a, 'subdivisions') or None,
-                        "city": helpers.get_xml_attr(a, 'city') or None,
-                        "postal_code": helpers.get_xml_attr(a, 'postal_code') or None,
-                        "timezone": helpers.get_xml_attr(a, 'time_zone') or None,
                         "latitude": latitude,
                         "longitude": longitude,
-                        "continent": None,  # keep for backwards compatibility with GeoLite2
+                        "postal_code": helpers.get_xml_attr(a, 'postal_code') or None,
+                        "region": helpers.get_xml_attr(a, 'subdivisions') or None,
+                        "timezone": helpers.get_xml_attr(a, 'time_zone') or None,
                         "accuracy": None   # keep for backwards compatibility with GeoLite2
                         }
 
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 495f5286..83532098 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -6402,15 +6402,16 @@ class WebInterface(object):
 
             Returns:
                 json:
-                    {"code": 'US",
+                    {"city": "Mountain View",
+                     "code": "US",
+                     "continent": "NA",
                      "country": "United States",
-                     "region": "California",
-                     "city": "Mountain View",
-                     "postal_code": "94035",
-                     "timezone": "America/Los_Angeles",
                      "latitude": 37.386,
                      "longitude": -122.0838,
-                     "accuracy": 1000
+                     "postal_code": "94035",
+                     "region": "California",
+                     "timezone": "America/Los_Angeles",
+                     "accuracy": null
                      }
             ```
         """