ENH: use logging in dicomfs + optparse to provide control over logging etc

Author: yarikoptic

bin/dicomfs

@@ -15,15 +15,21 @@ import stat
 import errno
 import time
 import locale
+import logging
 import fuse
+import nibabel as nib
 import nibabel.dft as dft
 
+from optparse import OptionParser, Option
+
 uid = os.getuid()
 gid = os.getgid()
 encoding = locale.getdefaultlocale()[1]
 
 fuse.fuse_python_api = (0, 2)
 
+logger = logging.getLogger('nibabel.dft')
+
 class FileHandle:
 
     def __init__(self, fno):
@@ -78,33 +84,31 @@ class DICOMFS(fuse.Fuse):
     def match_path(self, path):
         wd = self.get_paths()
         if path == '/':
-            print 'return root'
+            logger.debug('return root')
             return wd
         for part in path.lstrip('/').split('/'):
-            print path, part
+            logger.debug("path:%s part:%s" % (path, part))
             if part not in wd:
                 return None
             wd = wd[part]
-        print 'return'
+        logger.debug('return')
         return wd
 
     def readdir(self, path, fh):
-        print 'readdir'
-        print path
+        logger.info('readdir %s' % (path,))
         matched_path = self.match_path(path)
         if matched_path is None:
             return -errno.ENOENT
-        print 'match', matched_path
+        logger.debug('matched %s' % (matched_path,))
         fnames = [ k.encode('ascii', 'replace') for k in matched_path.keys() ]
         fnames.append('.')
         fnames.append('..')
         return [ fuse.Direntry(f) for f in fnames ]
-    
+
     def getattr(self, path):
-        print 'getattr'
-        print 'path:', path
+        logger.debug('getattr %s' % path)
         matched_path = self.match_path(path)
-        print matched_path
+        logger.debug('matched: %s' % (matched_path,))
         now = time.time()
         st = fuse.Stat()
         if isinstance(matched_path, dict):
@@ -137,10 +141,9 @@ class DICOMFS(fuse.Fuse):
             st.st_nlink = 1
             return st
         return -errno.ENOENT
-    
+
     def open(self, path, flags):
-        print 'open'
-        print path
+        logger.debug('open %s' % (path,))
         matched_path = self.match_path(path)
         if matched_path is None:
             return -errno.ENOENT
@@ -157,34 +160,56 @@ class DICOMFS(fuse.Fuse):
 
     # not done
     def read(self, path, size, offset, fh):
-        print 'read'
-        print path
-        print size
-        print offset
-        print fh
+        logger.debug('read')
+        logger.debug(path)
+        logger.debug(size)
+        logger.debug(offset)
+        logger.debug(fh)
         return self.fhs[fh.fno][offset:offset+size]
 
     def release(self, path, flags, fh):
-        print 'release'
-        print path
-        print fh
+        logger.debug('release')
+        logger.debug(path)
+        logger.debug(fh)
         del self.fhs[fh.fno]
         return
-    
-progname = os.path.basename(sys.argv[0])
-if len(sys.argv) != 3:
-    sys.stderr.write('usage: %s <directory containing DICOMs> <mount point>\n' % progname)
-    sys.exit(1)
-
-fs = DICOMFS(dash_s_do='setsingle')
-fs.parse(['-f', '-s', sys.argv[2]])
-fs.dicom_path = sys.argv[1].decode(encoding)
-try:
-    fs.main()
-except fuse.FuseError:
-    # fuse prints the error message
-    sys.exit(1)
-
-sys.exit(0)
+
+def get_opt_parser():
+    # use module docstring for help output
+    p = OptionParser(
+                usage="%s [OPTIONS] <DIRECTORY CONTAINING DICOMSs> <mount point>"
+                      % os.path.basename(sys.argv[0]),
+                version="%prog " + nib.__version__)
+
+    p.add_options([
+        Option("-v", "--verbose", action="count",
+               dest="verbose", default=0,
+               help="make noise.  Could be specified multiple times"),
+        ])
+
+    return p
+
+if __name__ == '__main__':
+    parser = get_opt_parser()
+    (opts, files) = parser.parse_args()
+
+    if opts.verbose:
+        logger.addHandler(logging.StreamHandler(sys.stdout))
+        logger.setLevel(opts.verbose > 1 and logging.DEBUG or logging.INFO)
+
+    if len(files) != 2:
+        sys.stderr.write("Please provide two arguments:\n%s\n"  % parser.usage)
+        sys.exit(1)
+
+    fs = DICOMFS(dash_s_do='setsingle')
+    fs.parse(['-f', '-s', files[1]])
+    fs.dicom_path = files[0].decode(encoding)
+    try:
+        fs.main()
+    except fuse.FuseError:
+        # fuse prints the error message
+        sys.exit(1)
+
+    sys.exit(0)
 
 # eof