Updating error messages and path fixes

Author: skdaccess

skdaccess/astro/kepler/data_fetcher.py

@@ -32,18 +32,19 @@
 from skdaccess.astro.kepler.data_wrapper import DataWrapper
 from skdaccess.utilities import data_util
 
-# 3rd party package imports
-import pandas as pd
-import numpy as np
+# Standard library imports
 from collections import OrderedDict
 import re
 import glob
 import os
+
+# 3rd party package imports
+import pandas as pd
+import numpy as np
 from astropy.table import Table
 from astropy.io import fits
 
 
-
 class DataFetcher(DataFetcherBase):
     ''' Data Fetcher for Kepler light curve data '''
     def __init__(self, ap_paramList, normalize=False, drop_on_quality=False, filter_window=None, quarter_list=None, wrapper_type = 'series'):
@@ -71,7 +72,8 @@ def output(self):
 
         @return DataWrapper
         '''
-        data_location = data_util.getDataLocation('kepler')
+
+        data_location = data_util.getDataLocation('kepler', raise_exception = False)
 
         if data_location == None:
             data_location = os.path.join(os.path.expanduser('~'), '.skdaccess', 'kepler')

skdaccess/geo/grace/data_fetcher.py

@@ -63,9 +63,6 @@ def output(self):
         '''
 
         data_file = getDataLocation('grace')
-        if data_file is None:
-            print("No data available")
-            return None
 
         geo_point = self.ap_paramList[0]()
         store = pd.HDFStore(data_file, 'r')

skdaccess/geo/groundwater/data_fetcher.py

@@ -67,10 +67,8 @@ def output(self):
         @return Groundwater Data Wrapper
         '''
 
-        data_file    = getDataLocation('groundwater')
-        if data_file is None:
-            print("No data available")
-            return None
+        
+        data_file = getDataLocation('groundwater')
 
 
         if self.ap_paramList == []:
@@ -127,9 +125,6 @@ def __str__(self):
 
     def getStationMetadata():
         data_file = getDataLocation('groundwater')
-        if data_file is None:
-            print('Dataset not available')
-            return None
 
         store = pd.HDFStore(data_file,'r')
         meta_data = store['meta_data']

skdaccess/geo/pbo/data_fetcher.py

@@ -31,7 +31,7 @@
 from skdaccess.utilities import pbo_util
 from skdaccess.utilities import data_util
 
-#IGNORE THIS LINE
+# Import datawrapper
 from skdaccess.geo.pbo.data_wrapper import DataWrapper
 
 # 3rd party package imports
@@ -82,6 +82,7 @@ def __init__(self, start_time, end_time, lat_range, lon_range, ap_paramList, mdy
 
     def setStationList(self, station_list):
         self.station_list = station_list
+
 
     def stationCheck(self):
         '''
@@ -115,10 +116,7 @@ def stabilize(self):
 
         storeName = self.meta_data
 
-        storeData_fn = data_util.getDataLocation('pbo')
-        if storeData_fn is None:
-            print('Dataset not available')
-            return None
+        storeData_fn = data_util.getDataLocation('pbo')        
 
         storeData = pd.HDFStore(storeData_fn)
 
@@ -147,10 +145,7 @@ def rawData(self):
         storeName = self.meta_data
 
         storeData_fn = data_util.getDataLocation('pbo')
-        if storeData_fn is None:
-            print('Dataset not available')
-            return None
-
+            
         storeData = pd.HDFStore(storeData_fn)
 
         mdyratio = self._mdyratio
@@ -243,9 +238,6 @@ def getStationMetadata():
         '''
 
         storeData_fn = data_util.getDataLocation('pbo')
-        if storeData_fn is None:
-            print('Dataset not available')
-            return None
 
         store = pd.HDFStore(storeData_fn, 'r')
         meta_frame = store['meta_data']

skdaccess/utilities/data_util.py

@@ -47,6 +47,7 @@
 from io import BytesIO
 
 import configparser
+from configparser import NoSectionError, NoOptionError
 import os
 
 def getConfig():
@@ -55,7 +56,7 @@ def getConfig():
 
     @return configParser.ConfigParser object of configuration
     '''
-    config_location = os.path.expanduser('~') + '/.skdaccess.conf'
+    config_location = os.path.join(os.path.expanduser('~'), '.skdaccess.conf')
 
     conf = configparser.ConfigParser()
     conf.read(config_location)
@@ -68,13 +69,13 @@ def writeConfig(conf):
 
     @param configparser.ConfigParser object
     '''
-    config_location = os.path.expanduser('~') + '/.skdaccess.conf'
+    config_location = os.path.join(os.path.expanduser('~'), '.skdaccess.conf')
     config_handle = open(config_location, "w")
     conf.write(config_handle)
     config_handle.close()
 
 
-def getDataLocation(data_name):
+def getDataLocation(data_name, raise_exception = True):
     ''' 
     Get the location of data set
 
@@ -85,7 +86,17 @@ def getDataLocation(data_name):
     data_name = str.lower(data_name)
 
     conf = getConfig()
-    return conf.get(data_name, 'data_location', fallback=None)
+
+    try:
+        return conf.get(data_name, 'data_location')
+    except (NoOptionError, NoSectionError) as e:
+        print("Data unavailable. In a terminal, please run: skdaccess", data_name)
+
+        if raise_exception:
+            raise e
+        else:
+            return None
+    
 
 def setDataLocation(data_name, location):
     '''