fix #270

xgi/readwrite/xgi_data.py

@@ -53,6 +53,13 @@ def load_xgi_data(
        The specified dataset does not exist.
     """
 
+    if dataset is None:
+        index_url = "https://gitlab.com/complexgroupinteractions/xgi-data/-/raw/main/index.json?inline=false"
+        index_data = _request_json_from_url(index_url)
+        print("Available datasets are the following:")
+        print(*index_data, sep="\n")
+        return
+
     if read:
         cfp = os.path.join(path, dataset + ".json")
         if os.path.exists(cfp):
@@ -113,37 +120,23 @@ def _request_from_xgi_data(dataset=None):
     Raises
     ------
     XGIError
-        If HTTP request is not successful of the dataset does not exist.
+        If the HTTP request is not successful or the dataset does not exist.
 
     See also
     ---------
     load_xgi_data
     """
 
     index_url = "https://gitlab.com/complexgroupinteractions/xgi-data/-/raw/main/index.json?inline=false"
-    r = requests.get(index_url)
-
-    if r.ok:
-        index_data = r.json()
-
-        if dataset is None:
-            print("Available datasets are the following:")
-            print(*index_data, sep="\n")
-            return
-    else:
-        raise XGIError(f"Error: HTTP response {r.status_code}")
+    index_data = _request_json_from_url(index_url)
 
     key = dataset.lower()
     if key not in index_data:
         print("Valid dataset names:")
         print(*index_data, sep="\n")
         raise XGIError("Must choose a valid dataset name!")
 
-    r = requests.get(index_data[key]["url"])
-    if r.ok:
-        return r.json()
-    else:
-        raise XGIError(f"Error: HTTP response {r.status_code}")
+    return _request_json_from_url(index_data[key]["url"])
 
 
 @lru_cache(maxsize=None)
@@ -169,3 +162,33 @@ def _request_from_xgi_data_cached(dataset):
     """
 
     return _request_from_xgi_data(dataset)
+
+
+def _request_json_from_url(url):
+    """HTTP request json file and return as dict.
+
+    Parameters
+    ----------
+    url : str
+        The url where the json file is located.
+
+    Returns
+    -------
+    dict
+        A dictionary of the JSON requested.
+
+    Raises
+    ------
+    XGIError
+        If the connection fails or if there is a bad HTTP request.
+    """
+
+    try:
+        r = requests.get(url)
+    except requests.ConnectionError:
+        raise XGIError("Connection Error!")
+
+    if r.ok:
+        return r.json()
+    else:
+        raise XGIError(f"Error: HTTP response {r.status_code}")