Merge pull request #42 from kbrose/windows-compatibility

Windows compatibility

Author: cx1111

wfdb/downloads.py

@@ -1,32 +1,33 @@
 import numpy as np
 import re
 import os
+import posixpath
 import requests
-        
+
 # Read a header file from physiobank
 def streamheader(recordname, pbdir):
 
     # Full url of header location
-    url = os.path.join(dbindexurl, pbdir, recordname+'.hea')
+    url = posixpath.join(dbindexurl, pbdir, recordname+'.hea')
     r = requests.get(url)
-    
+
     # Raise HTTPError if invalid url
     r.raise_for_status()
-    
+
     # Get each line as a string
     filelines = r.content.decode('ascii').splitlines()
-    
+
     # Separate content into header and comment lines
     headerlines = []
     commentlines = []
-    
+
     for line in filelines:
         line = line.strip()
         # Comment line
         if line.startswith('#'):
             commentlines.append(line)
         # Non-empty non-comment line = header line.
-        elif line:  
+        elif line:
             # Look for a comment in the line
             ci = line.find('#')
             if ci > 0:
@@ -35,25 +36,25 @@ def streamheader(recordname, pbdir):
                 commentlines.append(line[ci:])
             else:
                 headerlines.append(line)
-    
-    return (headerlines, commentlines) 
+
+    return (headerlines, commentlines)
 
 # Read certain bytes from a dat file from physiobank
 def streamdat(filename, pbdir, fmt, bytecount, startbyte, datatypes):
-    
+
     # Full url of dat file
-    url = os.path.join(dbindexurl, pbdir, filename)
+    url = posixpath.join(dbindexurl, pbdir, filename)
 
     # Specify the byte range
-    endbyte = startbyte + bytecount-1 
-    headers = {"Range": "bytes="+str(startbyte)+"-"+str(endbyte), 'Accept-Encoding': '*/*'} 
-    
+    endbyte = startbyte + bytecount-1
+    headers = {"Range": "bytes="+str(startbyte)+"-"+str(endbyte), 'Accept-Encoding': '*/*'}
+
     # Get the content
     r = requests.get(url, headers=headers, stream=True)
-    
+
     # Raise HTTPError if invalid url
     r.raise_for_status()
-    
+
     sigbytes = r.content
 
     # Convert to numpy array
@@ -70,13 +71,13 @@ def streamdat(filename, pbdir, fmt, bytecount, startbyte, datatypes):
 def streamannotation(filename, pbdir):
 
     # Full url of annotation file
-    url = os.path.join(dbindexurl, pbdir, filename)
+    url = posixpath.join(dbindexurl, pbdir, filename)
 
     # Get the content
     r = requests.get(url)
     # Raise HTTPError if invalid url
     r.raise_for_status()
-    
+
     annbytes = r.content
 
     # Convert to numpy array
@@ -88,11 +89,11 @@ def streamannotation(filename, pbdir):
 
 def getdblist():
     """Return a list of all the physiobank databases available.
-    
+
     Usage:
     dblist = getdblist()
     """
-    url = os.path.join(dbindexurl, 'DBS')
+    url = posixpath.join(dbindexurl, 'DBS')
     r = requests.get(url)
 
     dblist = r.content.decode('ascii').splitlines()
@@ -107,7 +108,7 @@ def getdblist():
 def getrecordlist(dburl, records):
     # Check for a RECORDS file
     if records == 'all':
-        r = requests.get(os.path.join(dburl, 'RECORDS'))
+        r = requests.get(posixpath.join(dburl, 'RECORDS'))
         if r.status_code == 404:
             raise ValueError('The database '+dburl+' has no WFDB files to download')
 
@@ -120,10 +121,10 @@ def getrecordlist(dburl, records):
     return recordlist
 
 def getannotators(dburl, annotators):
-    
+
     if annotators is not None:
         # Check for an ANNOTATORS file
-        r = requests.get(os.path.join(dburl, 'ANNOTATORS'))
+        r = requests.get(posixpath.join(dburl, 'ANNOTATORS'))
         if r.status_code == 404:
             if annotators == 'all':
                 return
@@ -141,7 +142,7 @@ def getannotators(dburl, annotators):
             # In case they didn't input a list
             if type(annotators) == str:
                 annotators = [annotators]
-            # user input ones. Check validity. 
+            # user input ones. Check validity.
             for a in annotators:
                 if a not in annlist:
                     raise ValueError('The database contains no annotators with extension: '+a)
@@ -173,25 +174,25 @@ def dlpbfile(inputs):
     basefile, subdir, pbdb, dlbasedir, keepsubdirs, overwrite = inputs
 
     # Full url of file
-    url = os.path.join(dbindexurl, pbdb, subdir, basefile)
-    
+    url = posixpath.join(dbindexurl, pbdb, subdir, basefile)
+
     # Get the request header
     rh = requests.head(url, headers={'Accept-Encoding': 'identity'})
     # Raise HTTPError if invalid url
     rh.raise_for_status()
 
     # Supposed size of the file
     onlinefilesize = int(rh.headers['content-length'])
-    
+
     # Figure out where the file should be locally
     if keepsubdirs:
         dldir = os.path.join(dlbasedir, subdir)
     else:
         dldir = dlbasedir
-    
+
     localfile = os.path.join(dldir, basefile)
-    
-    # The file exists locally. 
+
+    # The file exists locally.
     if os.path.isfile(localfile):
         # Redownload regardless
         if overwrite:
@@ -202,33 +203,33 @@ def dlpbfile(inputs):
             # Local file is smaller than it should be. Append it.
             if localfilesize < onlinefilesize:
                 print('Detected partially downloaded file: '+localfile+' Appending file...')
-                headers = {"Range": "bytes="+str(localfilesize)+"-", 'Accept-Encoding': '*/*'} 
+                headers = {"Range": "bytes="+str(localfilesize)+"-", 'Accept-Encoding': '*/*'}
                 r = requests.get(url, headers=headers, stream=True)
                 print('headers: ', headers)
                 print('r content length: ', len(r.content))
                 with open(localfile, "ba") as writefile:
                     writefile.write(r.content)
                 print('Done appending.')
-            # Local file is larger than it should be. Redownload. 
+            # Local file is larger than it should be. Redownload.
             elif localfilesize > onlinefilesize:
                 dlfullfile(url, localfile)
-            # If they're the same size, do nothing. 
-        
-    # The file doesn't exist. Download it. 
+            # If they're the same size, do nothing.
+
+    # The file doesn't exist. Download it.
     else:
         dlfullfile(url, localfile)
-        
+
     return
 
-# Download a file. No checks. 
+# Download a file. No checks.
 def dlfullfile(url, localfile):
     r = requests.get(url)
     with open(localfile, "wb") as writefile:
         writefile.write(r.content)
-    
+
     return
 
 
 
 
-dbindexurl = 'http://physionet.org/physiobank/database/'
+dbindexurl = 'http://physionet.org/physiobank/database/'