update config method. ref #20

Author: tompollard

wfdb/_rdsamp.py

@@ -2,9 +2,9 @@
 import re
 import os
 import sys
-import configparser
 import requests
-
+from ConfigParser import ConfigParser
+# from distutils.sysconfig import get_python_lib
 
 def checkrecordfiles(recordname, filedirectory):
     """Check a local directory along with the database cache directory specified in 
@@ -38,14 +38,9 @@ def checkrecordfiles(recordname, filedirectory):
     - downloadedfiles:  The list of files downloaded from PhysioBank.
     """
 
-    config = configparser.ConfigParser()
-    config.read(
-        os.path.join(
-            os.path.abspath(
-                os.path.dirname(__file__)),
-            "config.ini"))
-    # Base directory to store downloaded physiobank files, read from config.ini
-    dbcachedir = config['PBDOWNLOAD']['dbcachedir']
+    # Base directory to store downloaded physiobank files
+    config = loadconfig('wfdb.config')
+    dbcachedir = config.get('pbdownload','dbcachedir')
     basedir, baserecname = os.path.split(recordname)
 
     # At this point we do not know whether basedir is a local directory, a
@@ -845,6 +840,18 @@ def processwfdbbytes(fp, fmt, siglen, nsig, sampsperframe, floorsamp=0):
     "initvalue",
     "signame"]
 
+def loadconfig(fn):
+    """
+    Search for a configuration file. Load the first version found.
+    """
+    config = ConfigParser()
+    for loc in [os.curdir,os.path.expanduser("~"),os.path.dirname(__file__)]:
+        try: 
+            with open(os.path.join(loc,fn)) as source:
+                config.readfp(source)
+        except IOError:
+            pass
+    return config
 
 def rdsamp(
         recordname,
@@ -883,23 +890,12 @@ def rdsamp(
     """
 
     filestoremove = []
-    if os.path.isfile(
-        os.path.join(
-            os.path.abspath(
-            os.path.dirname(__file__)),
-            "config.ini")):  # Read the configuration file if any.
-        config = configparser.ConfigParser()
-        config.read(
-            os.path.join(
-                os.path.abspath(
-                    os.path.dirname(__file__)),
-                "config.ini"))
-        if int(config['PBDOWNLOAD'][
-               'getPBfiles']):  # Flag specifying whether to allow downloading from physiobank
-            recordname, dledfiles = checkrecordfiles(recordname, os.getcwd())
-            if not int(config['PBDOWNLOAD'][
-                       'keepdledfiles']):  # Flag specifying whether to keep downloaded physiobank files
-                filestoremove = dledfiles
+    config = loadconfig('wfdb.config')
+
+    if config.get('pbdownload','getpbfiles'):  # Flag specifying whether to allow downloading from physiobank
+        recordname, dledfiles = checkrecordfiles(recordname, os.getcwd())
+        if not int(config.get('pbdownload','keepdledfiles')):  # Flag specifying whether to keep downloaded physiobank files
+            filestoremove = dledfiles
 
     fields = readheader(recordname)  # Get the info from the header file
 

wfdb/config.ini wfdb/wfdb.configwfdb/config.ini renamed to wfdb/wfdb.config

@@ -1,12 +1,13 @@
 # Options for downloading physiobank data when file is not already on local machine. 
-[PBDOWNLOAD]
 
+[pbdownload]
 # Flag that specifies whether to search and download missing files from physiobank 
-getPBfiles=1
+getpbfiles: 1
 
 # Flag that specifies whether to keep automatically downloaded physiobank files  
-keepdledfiles=1
-
-# Base cache directory in which data files are searched for (after searching the current working directory), and missing files are downloaded. The full download directory is cachedir/pbsubdir where pbsubdir is the . Default value: /usr/local/database/. 
-dbcachedir=/usr/local/database/
+keepdledfiles: 1
 
+# Base cache directory in which data files are searched for (after searching the current working directory) 
+# and missing files are downloaded. The full download directory is cachedir/pbsubdir where pbsubdir is the . 
+# Default value: /usr/local/database/. 
+dbcachedir: '/usr/local/database/'