Fix a python3 bug and allow additional CLI options

.gitignore

@@ -1,3 +1,4 @@
 *.pyc
 .*
 *~
+scanpdf.egg-info

scanpdf/scanpdf.py

@@ -30,15 +30,16 @@
     --keep-blanks               Don't check for and remove blank pages
     --blank-threshold=<ths>     Percentage of white to be marked as blank [default: 0.97] 
     --post-process              Run unpaper to deskew/clean up
-
+    --device=<scandevice>       Set the device [default: the SCANBD_DEVICE environment variable]
+    --sanedir=<sanedir>         Set the SANE configuration directory [default: /etc/scanbd]
 """
 
 import sys, os
 import logging
 import shutil
 import re
 
-from version import __version__
+from .version import __version__
 import docopt
 
 import subprocess
@@ -74,9 +75,9 @@ def cmd(self, cmd_list):
 
 
     def run_scan(self):
-        device = os.environ['SCANBD_DEVICE']
+        device = os.environ['SCANBD_DEVICE'] if self.scandevice is None else self.scandevice
         self.cmd('logger -t "scanbd: " "Begin of scan "')
-        c = ['SANE_CONFIG_DIR=/etc/scanbd', 
+        c = ['SANE_CONFIG_DIR="%s"' % self.sanedir, 
                 'scanadf',
                 '-d "%s"' % device,
                 '--source "ADF Duplex"',
@@ -443,6 +444,16 @@ def get_options(self, argv):
         if self.args['pdf']:
             self.pdf_filename = os.path.abspath(self.args['<pdffile>'])
 
+        if argv["--sanedir"]:
+            self.sanedir = argv["--sanedir"]
+        else:
+            self.sanedir = "/etc/scanbd"
+
+        if argv["--device"] and argv["--device"] != "the SCANBD_DEVICE environment variable":
+            self.scandevice = argv["--device"]
+        else:
+            self.scandevice = None
+
         self.dpi = int(self.args['--dpi'])
 
         output_dir = time.strftime('%Y%m%d_%H%M%S', time.localtime())