[tracker/sam/sandbox-fixes: 1/5] utils/sandbox: Use PEP8 code style

[Sam Thursfield <sthursfield src gnome org>]

commit 2cd98af80b97726d3e47541eec5151d10e19d3cd
Author: Sam Thursfield <sam afuera me uk>
Date:   Wed May 22 12:39:39 2019 +0200

    utils/sandbox: Use PEP8 code style
    
    This commit was created using the `autopep8` tool.

 utils/sandbox/tracker-sandbox.py | 746 ++++++++++++++++++++-------------------
 1 file changed, 391 insertions(+), 355 deletions(-)
---
diff --git a/utils/sandbox/tracker-sandbox.py b/utils/sandbox/tracker-sandbox.py
index b49e74e60..e316a89d5 100755
--- a/utils/sandbox/tracker-sandbox.py
+++ b/utils/sandbox/tracker-sandbox.py
@@ -111,434 +111,470 @@ enable-writeback=false
 """
 
 # Utilities
+
+
 def mkdir_p(path):
-       try:
-               os.makedirs(path)
-       except OSError as exc: # Python >2.5
-               if exc.errno == errno.EEXIST:
-                       pass
-               else:
-                       raise
+    try:
+        os.makedirs(path)
+    except OSError as exc:  # Python >2.5
+        if exc.errno == errno.EEXIST:
+            pass
+        else:
+            raise
+
 
 def debug(message):
-       if opts.debug:
-               print(message)
+    if opts.debug:
+        print(message)
 
 # DB functions (sync for now)
+
+
 def db_query_have_files():
-       # Set this here in case we used 'bus' for an update() before this.
-       # os.environ['TRACKER_SPARQL_BACKEND'] = 'direct'
+    # Set this here in case we used 'bus' for an update() before this.
+    # os.environ['TRACKER_SPARQL_BACKEND'] = 'direct'
 
-       print('Using query to check index has data in it...')
+    print('Using query to check index has data in it...')
 
-       conn = Tracker.SparqlConnection.get(None)
-       cursor = conn.query('select count(?urn) where { ?urn a nfo:FileDataObject }', None)
+    conn = Tracker.SparqlConnection.get(None)
+    cursor = conn.query(
+        'select count(?urn) where { ?urn a nfo:FileDataObject }', None)
+
+    # Only expect one result here...
+    while (cursor.next(None)):
+        print('  Currently %d file(s) exist in our index' %
+              (cursor.get_integer(0)))
 
-       # Only expect one result here...
-       while (cursor.next(None)):
-               print('  Currently %d file(s) exist in our index' % (cursor.get_integer(0)))
 
 def db_query_list_files():
-       # Set this here in case we used 'bus' for an update() before this.
-       # os.environ['TRACKER_SPARQL_BACKEND'] = 'direct'
+    # Set this here in case we used 'bus' for an update() before this.
+    # os.environ['TRACKER_SPARQL_BACKEND'] = 'direct'
+
+    print('Using query to list files indexed...')
 
-       print('Using query to list files indexed...')
+    conn = Tracker.SparqlConnection.get(None)
+    cursor = conn.query(
+        'select nie:url(?urn) where { ?urn a nfo:FileDataObject }', None)
 
-       conn = Tracker.SparqlConnection.get(None)
-       cursor = conn.query('select nie:url(?urn) where { ?urn a nfo:FileDataObject }', None)
+    # Only expect one result here...
+    while (cursor.next(None)):
+        print('  ' + cursor.get_string(0)[0])
 
-       # Only expect one result here...
-       while (cursor.next(None)):
-               print('  ' + cursor.get_string(0)[0])
 
 def db_query_files_that_match():
-       conn = Tracker.SparqlConnection.get(None)
-       cursor = conn.query('select nie:url(?urn) where { ?urn a nfo:FileDataObject . ?urn fts:match "%s" }' 
% (opts.query), None)
+    conn = Tracker.SparqlConnection.get(None)
+    cursor = conn.query(
+        'select nie:url(?urn) where { ?urn a nfo:FileDataObject . ?urn fts:match "%s" }' % (opts.query), 
None)
 
-       print('Found:')
+    print('Found:')
 
-       # Only expect one result here...
-       while (cursor.next(None)):
-               print('  ' + cursor.get_string(0)[0])
+    # Only expect one result here...
+    while (cursor.next(None)):
+        print('  ' + cursor.get_string(0)[0])
 
 # Index functions
+
+
 def index_clean():
-       #tracker reset --hard
-       debug ('Cleaning index, FIXME: Does nothing.')
+    # tracker reset --hard
+    debug('Cleaning index, FIXME: Does nothing.')
+
 
 def find_libexec_binaries(command):
-       binary = os.path.join(opts.prefix, 'libexec', command)
-       if not os.path.exists(binary):
-               binary = os.path.join(opts.prefix, 'libexec', command)
-               if not os.path.exists(binary):
-                       return None
+    binary = os.path.join(opts.prefix, 'libexec', command)
+    if not os.path.exists(binary):
+        binary = os.path.join(opts.prefix, 'libexec', command)
+        if not os.path.exists(binary):
+            return None
+
+    return binary
 
-       return binary
 
 def index_update():
-       debug('Updating index ...')
-       debug('--')
-
-       # FIXME: Need to start tracker-extract to make sure extended
-       # metadata is created, but the problem is, after miner-fs
-       # stops, we return to the prompt, so how do we handle that?
-       #
-       # We need to listen to signals from tracker-extract and then
-       # quit after some inactivity I think ... OR listen to
-       # GraphUpdated and when there are no more objects without a
-       # data-source, we know all data was indexed.
-
-       # Start tracker-miner-fs
-       binary = find_libexec_binaries ('tracker-miner-fs')
-       if binary == None:
-               print('Could not find "tracker-miner-fs" in $prefix/lib{exec} directories')
-               print('Is Tracker installed properly?')
-               sys.exit(1)
-
-       try:
-               # Mine data WITHOUT being a daemon, exit when done. Ignore desktop files
-               subprocess.check_output([binary, "--no-daemon"]).decode('utf-8')
-       except subprocess.CalledProcessError as e:
-               print('Could not run %s, %s' % (binary, e.output))
-               sys.exit(1)
-
-       debug('--')
-
-       # We've now finished updating the index now OR we completely failed
-       print('Index now up to date!')
-
-       # Check we have data in our index...
-       db_query_have_files()
+    debug('Updating index ...')
+    debug('--')
+
+    # FIXME: Need to start tracker-extract to make sure extended
+    # metadata is created, but the problem is, after miner-fs
+    # stops, we return to the prompt, so how do we handle that?
+    #
+    # We need to listen to signals from tracker-extract and then
+    # quit after some inactivity I think ... OR listen to
+    # GraphUpdated and when there are no more objects without a
+    # data-source, we know all data was indexed.
+
+    # Start tracker-miner-fs
+    binary = find_libexec_binaries('tracker-miner-fs')
+    if binary == None:
+        print(
+            'Could not find "tracker-miner-fs" in $prefix/lib{exec} directories')
+        print('Is Tracker installed properly?')
+        sys.exit(1)
+
+    try:
+        # Mine data WITHOUT being a daemon, exit when done. Ignore desktop
+        # files
+        subprocess.check_output([binary, "--no-daemon"]).decode('utf-8')
+    except subprocess.CalledProcessError as e:
+        print('Could not run %s, %s' % (binary, e.output))
+        sys.exit(1)
+
+    debug('--')
+
+    # We've now finished updating the index now OR we completely failed
+    print('Index now up to date!')
+
+    # Check we have data in our index...
+    db_query_have_files()
+
 
 def index_shell():
-       print('Starting shell... (type "exit" to finish)')
-       print()
+    print('Starting shell... (type "exit" to finish)')
+    print()
 
-       os.system("/bin/bash")
+    os.system("/bin/bash")
 
 # Environment / Clean up
+
+
 def dbus_session_get_from_content(content):
-       global dbus_session_address
-       global dbus_session_pid
+    global dbus_session_address
+    global dbus_session_pid
+
+    if len(content) < 1:
+        print(
+            'Content was empty ... can not get DBus session information from empty string')
+        return False
 
-       if len(content) < 1:
-               print('Content was empty ... can not get DBus session information from empty string')
-               return False
-       
-       dbus_session_address = content.splitlines()[0]
-       dbus_session_pid = int(content.splitlines()[1])
+    dbus_session_address = content.splitlines()[0]
+    dbus_session_pid = int(content.splitlines()[1])
 
-       if dbus_session_address == '':
-               print('DBus session file was corrupt (no address), please remove "%s"' % (dbus_session_file))
-               sys.exit(1)
-       if dbus_session_pid < 0:
-               print('DBus session file was corrupt (no PID), please remove "%s"' % (dbus_session_file))
-               sys.exit(1)
+    if dbus_session_address == '':
+        print('DBus session file was corrupt (no address), please remove "%s"' % (
+            dbus_session_file))
+        sys.exit(1)
+    if dbus_session_pid < 0:
+        print('DBus session file was corrupt (no PID), please remove "%s"' %
+              (dbus_session_file))
+        sys.exit(1)
+
+    return True
 
-       return True
 
 def dbus_session_file_get():
-       try:
-               f = open(dbus_session_file, 'r')
-               content = f.read()
-               f.close()
-       except IOError as e:
-               # Expect this if we have a new session to set up
-               return False
-       except:
-               print("Unexpected error:", sys.exc_info()[0])
-               raise
-
-       return dbus_session_get_from_content(content)
+    try:
+        f = open(dbus_session_file, 'r')
+        content = f.read()
+        f.close()
+    except IOError as e:
+        # Expect this if we have a new session to set up
+        return False
+    except:
+        print("Unexpected error:", sys.exc_info()[0])
+        raise
+
+    return dbus_session_get_from_content(content)
+
 
 def dbus_session_file_set():
-       mkdir_p(os.environ['XDG_RUNTIME_DIR'])
+    mkdir_p(os.environ['XDG_RUNTIME_DIR'])
+
+    content = '%s\n%s' % (dbus_session_address, dbus_session_pid)
+    f = open(dbus_session_file, 'w')
+    f.write(content)
+    f.close()
 
-       content = '%s\n%s' % (dbus_session_address, dbus_session_pid)
-       f = open(dbus_session_file, 'w')
-       f.write(content)
-       f.close()
 
 def environment_unset():
-       debug('Cleaning up files ...')
+    debug('Cleaning up files ...')
 
-       if not dbus_session_file == '':
-               debug('  Removing DBus session file')
-               os.unlink(dbus_session_file)
+    if not dbus_session_file == '':
+        debug('  Removing DBus session file')
+        os.unlink(dbus_session_file)
 
-       debug('Cleaning up processes ...')
+    debug('Cleaning up processes ...')
 
-       if dbus_session_pid > 0:
-               debug('  Killing DBus session')
-               try:
-                       os.kill(dbus_session_pid, signal.SIGTERM)
-               except (SystemError, OSError): # (3, 'No such process') old python-schedutils incorrectly 
raised SystemError
-                       debug('    Process %d not found', dbus_session_pid)
+    if dbus_session_pid > 0:
+        debug('  Killing DBus session')
+        try:
+            os.kill(dbus_session_pid, signal.SIGTERM)
+        # (3, 'No such process') old python-schedutils incorrectly raised SystemError
+        except (SystemError, OSError):
+            debug('    Process %d not found', dbus_session_pid)
 
+    if not opts.update:
+        return
 
-       if not opts.update:
-               return
+    # FIXME: clean up tracker-store, can't use 'tracker daemon ...' for this,
+    #        that kills everything it finds in /proc sadly.
+    if store_pid > 0:
+        debug('  Killing Tracker store')
+        os.kill(store_pid, signal.SIGTERM)
 
-       # FIXME: clean up tracker-store, can't use 'tracker daemon ...' for this,
-       #        that kills everything it finds in /proc sadly.
-       if store_pid > 0:
-               debug('  Killing Tracker store')
-               os.kill(store_pid, signal.SIGTERM)
 
 def environment_set_and_add_path(env, prefix, suffix):
-       new = os.path.join(prefix, suffix)
+    new = os.path.join(prefix, suffix)
+
+    if env in os.environ:
+        existing = os.environ[env]
+        full = '%s:%s' % (new, existing)
+    else:
+        full = new
 
-       if env in os.environ:
-               existing = os.environ[env]
-               full = '%s:%s' % (new, existing)
-       else:
-               full = new
+    os.environ[env] = full
 
-       os.environ[env] = full
 
 def environment_set():
-       # Environment
-       global dbus_session_address
-       global dbus_session_pid
-       global dbus_session_file
-       global index_location_abs
-       global default_debug_verbosity
-
-       index_location_abs = os.path.abspath (opts.index_location)
-
-       # Data
-       os.environ['XDG_DATA_HOME'] = '%s/data/' % index_location_abs
-       os.environ['XDG_CONFIG_HOME'] = '%s/config/' % index_location_abs
-       os.environ['XDG_CACHE_HOME'] = '%s/cache/' % index_location_abs
-       os.environ['XDG_RUNTIME_DIR'] = '%s/run/' % index_location_abs
-
-       # Prefix - only set if non-standard
-       if opts.prefix != default_prefix:
-               environment_set_and_add_path ('PATH', opts.prefix, 'bin')
-               environment_set_and_add_path ('LD_LIBRARY_PATH', opts.prefix, 'lib')
-               environment_set_and_add_path ('XDG_DATA_DIRS', opts.prefix, 'share')
-
-               os.environ['TRACKER_DB_ONTOLOGIES_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 
'ontologies')
-               os.environ['TRACKER_EXTRACTOR_RULES_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 
'extract-rules')
-               os.environ['TRACKER_LANGUAGE_STOPWORDS_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 
'stop-words')
-
-       # Preferences
-       os.environ['TRACKER_USE_CONFIG_FILES'] = 'yes'
-
-       #if opts.debug:
-       #       os.environ['TRACKER_USE_LOG_FILES'] = 'yes'
-
-       if opts.debug:
-               os.environ['G_MESSAGES_DEBUG'] = 'all'
-               os.environ['TRACKER_VERBOSITY'] = '%d' % default_debug_verbosity
-               os.environ['DBUS_VERBOSE'] = '1'
-       else:
-               os.environ['TRACKER_VERBOSITY'] = '0'
-
-       debug('Using prefix location "%s"' % opts.prefix)
-       debug('Using index location "%s"' % index_location_abs)
-
-       # Ensure directory exists
-       # DBus specific instance
-       dbus_session_file = os.path.join(os.environ['XDG_RUNTIME_DIR'], 'dbus-session')
-
-       if dbus_session_file_get() == False:
-               output = subprocess.check_output(["dbus-daemon",
-                                                 "--session",
-                                                 "--print-address=1",
-                                                 "--print-pid=1",
-                                                 "--fork"]).decode('utf-8')
-
-               dbus_session_get_from_content(output)
-               dbus_session_file_set()
-               debug('Using new D-Bus session with address "%s" with PID %d' % (dbus_session_address, 
dbus_session_pid))
-       else:
-               debug('Using existing D-Bus session with address "%s" with PID %d' % (dbus_session_address, 
dbus_session_pid))
-
-       # Important, other subprocesses must use our new bus
-       os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_session_address
+    # Environment
+    global dbus_session_address
+    global dbus_session_pid
+    global dbus_session_file
+    global index_location_abs
+    global default_debug_verbosity
+
+    index_location_abs = os.path.abspath(opts.index_location)
+
+    # Data
+    os.environ['XDG_DATA_HOME'] = '%s/data/' % index_location_abs
+    os.environ['XDG_CONFIG_HOME'] = '%s/config/' % index_location_abs
+    os.environ['XDG_CACHE_HOME'] = '%s/cache/' % index_location_abs
+    os.environ['XDG_RUNTIME_DIR'] = '%s/run/' % index_location_abs
+
+    # Prefix - only set if non-standard
+    if opts.prefix != default_prefix:
+        environment_set_and_add_path('PATH', opts.prefix, 'bin')
+        environment_set_and_add_path('LD_LIBRARY_PATH', opts.prefix, 'lib')
+        environment_set_and_add_path('XDG_DATA_DIRS', opts.prefix, 'share')
+
+        os.environ['TRACKER_DB_ONTOLOGIES_DIR'] = os.path.join(
+            opts.prefix, 'share', 'tracker', 'ontologies')
+        os.environ['TRACKER_EXTRACTOR_RULES_DIR'] = os.path.join(
+            opts.prefix, 'share', 'tracker', 'extract-rules')
+        os.environ['TRACKER_LANGUAGE_STOPWORDS_DIR'] = os.path.join(
+            opts.prefix, 'share', 'tracker', 'stop-words')
+
+    # Preferences
+    os.environ['TRACKER_USE_CONFIG_FILES'] = 'yes'
+
+    # if opts.debug:
+    #  os.environ['TRACKER_USE_LOG_FILES'] = 'yes'
+
+    if opts.debug:
+        os.environ['G_MESSAGES_DEBUG'] = 'all'
+        os.environ['TRACKER_VERBOSITY'] = '%d' % default_debug_verbosity
+        os.environ['DBUS_VERBOSE'] = '1'
+    else:
+        os.environ['TRACKER_VERBOSITY'] = '0'
+
+    debug('Using prefix location "%s"' % opts.prefix)
+    debug('Using index location "%s"' % index_location_abs)
+
+    # Ensure directory exists
+    # DBus specific instance
+    dbus_session_file = os.path.join(
+        os.environ['XDG_RUNTIME_DIR'], 'dbus-session')
+
+    if dbus_session_file_get() == False:
+        output = subprocess.check_output(["dbus-daemon",
+                                          "--session",
+                                          "--print-address=1",
+                                          "--print-pid=1",
+                                          "--fork"]).decode('utf-8')
+
+        dbus_session_get_from_content(output)
+        dbus_session_file_set()
+        debug('Using new D-Bus session with address "%s" with PID %d' %
+              (dbus_session_address, dbus_session_pid))
+    else:
+        debug('Using existing D-Bus session with address "%s" with PID %d' %
+              (dbus_session_address, dbus_session_pid))
+
+    # Important, other subprocesses must use our new bus
+    os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_session_address
 
 
 def config_set():
-       # Make sure File System miner is configured correctly
-       config_dir = os.path.join(os.environ['XDG_CONFIG_HOME'], 'tracker')
-       config_filename = os.path.join(config_dir, 'tracker-miner-fs.cfg')
+    # Make sure File System miner is configured correctly
+    config_dir = os.path.join(os.environ['XDG_CONFIG_HOME'], 'tracker')
+    config_filename = os.path.join(config_dir, 'tracker-miner-fs.cfg')
 
-       debug('Using config file "%s"' % config_filename)
+    debug('Using config file "%s"' % config_filename)
 
-       # Only update config if we're updating the database
-       mkdir_p(config_dir)
+    # Only update config if we're updating the database
+    mkdir_p(config_dir)
 
-       if not os.path.exists(config_filename):
-               f = open(config_filename, 'w')
-               f.write(config_template)
-               f.close()
+    if not os.path.exists(config_filename):
+        f = open(config_filename, 'w')
+        f.write(config_template)
+        f.close()
 
-               debug('  Miner config file written')
+        debug('  Miner config file written')
 
-       # Set content path
-       config = configparser.ConfigParser()
-       config.optionxform = str
-       config.read(config_filename)
+    # Set content path
+    config = configparser.ConfigParser()
+    config.optionxform = str
+    config.read(config_filename)
 
-       if opts.content_locations_recursive:
-               debug("Using content locations: %s" %
-                     opts.content_locations_recursive)
-       if opts.content_locations_single:
-               debug("Using non-recursive content locations: %s" %
-                     opts.content_locations_single)
+    if opts.content_locations_recursive:
+        debug("Using content locations: %s" %
+              opts.content_locations_recursive)
+    if opts.content_locations_single:
+        debug("Using non-recursive content locations: %s" %
+              opts.content_locations_single)
 
-       def locations_gsetting(locations):
-               locations = [dir if dir.startswith('&') else os.path.abspath(dir)
-                            for dir in locations]
-               return GLib.Variant('as', locations).print_(False)
+    def locations_gsetting(locations):
+        locations = [dir if dir.startswith('&') else os.path.abspath(dir)
+                     for dir in locations]
+        return GLib.Variant('as', locations).print_(False)
 
-       if not config.has_section('General'):
-               config.add_section('General')
+    if not config.has_section('General'):
+        config.add_section('General')
 
-       config.set('General', 'index-recursive-directories',
-                  locations_gsetting(opts.content_locations_recursive or []))
-       config.set('General', 'index-single-directories',
-                  locations_gsetting(opts.content_locations_single or []))
+    config.set('General', 'index-recursive-directories',
+               locations_gsetting(opts.content_locations_recursive or []))
+    config.set('General', 'index-single-directories',
+               locations_gsetting(opts.content_locations_single or []))
 
-       with open(config_filename, 'w') as f:
-               config.write(f)
+    with open(config_filename, 'w') as f:
+        config.write(f)
 
 
 def link_to_mime_data():
-       '''Create symlink to $XDG_DATA_HOME/mime in our custom data home dir.
+    '''Create symlink to $XDG_DATA_HOME/mime in our custom data home dir.
 
-       Mimetype detection seems to break horribly if the $XDG_DATA_HOME/mime
-       directory is missing. Since we have to override the normal XDG_DATA_HOME
-       path, we need to work around this by linking back to the real mime data.
+    Mimetype detection seems to break horribly if the $XDG_DATA_HOME/mime
+    directory is missing. Since we have to override the normal XDG_DATA_HOME
+    path, we need to work around this by linking back to the real mime data.
 
-       '''
-       new_xdg_data_home = os.environ['XDG_DATA_HOME']
-       old_mime_dir = os.path.join(original_xdg_data_home, 'mime')
-       if os.path.exists(old_mime_dir):
-               new_mime_dir = os.path.join(new_xdg_data_home, 'mime')
-               if not os.path.exists(new_mime_dir) and not os.path.islink(new_mime_dir):
-                       mkdir_p(new_xdg_data_home)
-                       os.symlink(
-                               os.path.join(original_xdg_data_home, 'mime'), new_mime_dir)
+    '''
+    new_xdg_data_home = os.environ['XDG_DATA_HOME']
+    old_mime_dir = os.path.join(original_xdg_data_home, 'mime')
+    if os.path.exists(old_mime_dir):
+        new_mime_dir = os.path.join(new_xdg_data_home, 'mime')
+        if not os.path.exists(new_mime_dir) and not os.path.islink(new_mime_dir):
+            mkdir_p(new_xdg_data_home)
+            os.symlink(
+                os.path.join(original_xdg_data_home, 'mime'), new_mime_dir)
 
 
 # Entry point/start
 if __name__ == "__main__":
-       locale.setlocale(locale.LC_ALL, '')
-
-       # Parse command line
-       usage_oneline  = '%s -i <DIR> -c <DIR> [OPTION...]' % (os.path.basename(sys.argv[0]))
-       usage = '\n  %s - %s' % (usage_oneline, script_about)
-       usage_invalid = 'Usage:\n  %s' % (usage_oneline)
-
-       popt = optparse.OptionParser(usage)
-       popt.add_option('-v', '--version',
-                       action = 'count',
-                       dest = 'version',
-                       help = 'show version information')
-       popt.add_option('-d', '--debug',
-                       action = 'count',
-                       dest = 'debug',
-                       help = 'show additional debugging')
-       popt.add_option('-p', '--prefix',
-                       action = 'store',
-                       metavar = 'PATH',
-                       dest = 'prefix',
-                       default = default_prefix,
-                       help = 'use a non-standard prefix (default="%s")' % default_prefix)
-       popt.add_option('-i', '--index',
-                       action = 'store',
-                       metavar = 'DIR',
-                       dest = 'index_location',
-                       help = 'directory storing the index')
-       popt.add_option('-c', '--content',
-                       action = 'append',
-                       metavar = 'DIR',
-                       dest = 'content_locations_recursive',
-                       help = 'directory storing the content which is indexed (can be '
-                              'specified multiple times)')
-       popt.add_option('-C', '--content-non-recursive',
-                       action = 'append',
-                       metavar = 'DIR',
-                       dest = 'content_locations_single',
-                       help = 'directory storing the content which is indexed, '
-                              'non-recursive variant (can be specified multiple times)')
-       popt.add_option('-u', '--update',
-                       action = 'count',
-                       dest = 'update',
-                       help = 'update index/database from content')
-       popt.add_option('-l', '--list-files',
-                       action = 'count',
-                       dest = 'list_files',
-                       help = 'list files indexed')
-       popt.add_option('-s', '--shell',
-                       action = 'count',
-                       dest = 'shell',
-                       help = 'start a shell with the environment set up')
-       popt.add_option('-q', '--query',
-                       action = 'store',
-                       metavar = 'CRITERIA',
-                       dest = 'query',
-                       help = 'what content to look for in files')
-
-       (opts, args) = popt.parse_args()
-
-       if opts.version:
-               print('%s %s\n%s\n' % (script_name, script_version, script_about))
-               sys.exit(0)
-
-       if not opts.index_location:
-               if not opts.content_locations_recursive and not \
-                       opts.content_locations_single:
-                       print('Expected index (-i) or content (-c) locations to be specified')
-                       print(usage_invalid)
-                       sys.exit(1)
-
-       if opts.update:
-               if not opts.index_location or not (opts.content_locations_recursive or \
-                       opts.content_locations_single):
-                       print('Expected index (-i) and content (-c) locations to be specified')
-                       print('These arguments are required to update the index databases')
-                       sys.exit(1)
-
-       if (opts.query or opts.query or opts.list_files or opts.shell) and not opts.index_location:
-               print('Expected index location (-i) to be specified')
-               print('This arguments is required to use the content that has been indexed')
-               sys.exit(1)
-
-       if not opts.update and not opts.query and not opts.list_files and not opts.shell:
-               print('No action specified (e.g. update (-u), shell (-s), list files (-l), etc)\n')
-               print('%s %s\n%s\n' % (script_name, script_version, script_about))
-               print(usage_invalid)
-               sys.exit(1)
-
-       # Set up environment variables and foo needed to get started.
-       environment_set()
-       config_set()
-
-       link_to_mime_data()
-
-       try:
-               if opts.update:
-                       index_update()
-
-               if opts.list_files:
-                       db_query_list_files()
-
-               if opts.shell:
-                       index_shell()
-                       sys.exit(0)
-
-               if opts.query:
-                       if not os.path.exists(index_location_abs):
-                               print('Can not query yet, index has not been created, see --update or -u')
-                               print(usage_invalid)
-                               sys.exit(1)
-
-                       db_query_files_that_match()
-
-       except KeyboardInterrupt:
-               print('Handling Ctrl+C')
-
-       environment_unset()
+    locale.setlocale(locale.LC_ALL, '')
+
+    # Parse command line
+    usage_oneline = '%s -i <DIR> -c <DIR> [OPTION...]' % (
+        os.path.basename(sys.argv[0]))
+    usage = '\n  %s - %s' % (usage_oneline, script_about)
+    usage_invalid = 'Usage:\n  %s' % (usage_oneline)
+
+    popt = optparse.OptionParser(usage)
+    popt.add_option('-v', '--version',
+                    action='count',
+                    dest='version',
+                    help='show version information')
+    popt.add_option('-d', '--debug',
+                    action='count',
+                    dest='debug',
+                    help='show additional debugging')
+    popt.add_option('-p', '--prefix',
+                    action='store',
+                    metavar='PATH',
+                    dest='prefix',
+                    default=default_prefix,
+                    help='use a non-standard prefix (default="%s")' % default_prefix)
+    popt.add_option('-i', '--index',
+                    action='store',
+                    metavar='DIR',
+                    dest='index_location',
+                    help='directory storing the index')
+    popt.add_option('-c', '--content',
+                    action='append',
+                    metavar='DIR',
+                    dest='content_locations_recursive',
+                    help='directory storing the content which is indexed (can be '
+                    'specified multiple times)')
+    popt.add_option('-C', '--content-non-recursive',
+                    action='append',
+                    metavar='DIR',
+                    dest='content_locations_single',
+                    help='directory storing the content which is indexed, '
+                    'non-recursive variant (can be specified multiple times)')
+    popt.add_option('-u', '--update',
+                    action='count',
+                    dest='update',
+                    help='update index/database from content')
+    popt.add_option('-l', '--list-files',
+                    action='count',
+                    dest='list_files',
+                    help='list files indexed')
+    popt.add_option('-s', '--shell',
+                    action='count',
+                    dest='shell',
+                    help='start a shell with the environment set up')
+    popt.add_option('-q', '--query',
+                    action='store',
+                    metavar='CRITERIA',
+                    dest='query',
+                    help='what content to look for in files')
+
+    (opts, args) = popt.parse_args()
+
+    if opts.version:
+        print('%s %s\n%s\n' % (script_name, script_version, script_about))
+        sys.exit(0)
+
+    if not opts.index_location:
+        if not opts.content_locations_recursive and not \
+                opts.content_locations_single:
+            print('Expected index (-i) or content (-c) locations to be specified')
+            print(usage_invalid)
+            sys.exit(1)
+
+    if opts.update:
+        if not opts.index_location or not (opts.content_locations_recursive or
+                                           opts.content_locations_single):
+            print('Expected index (-i) and content (-c) locations to be specified')
+            print('These arguments are required to update the index databases')
+            sys.exit(1)
+
+    if (opts.query or opts.query or opts.list_files or opts.shell) and not opts.index_location:
+        print('Expected index location (-i) to be specified')
+        print('This arguments is required to use the content that has been indexed')
+        sys.exit(1)
+
+    if not opts.update and not opts.query and not opts.list_files and not opts.shell:
+        print('No action specified (e.g. update (-u), shell (-s), list files (-l), etc)\n')
+        print('%s %s\n%s\n' % (script_name, script_version, script_about))
+        print(usage_invalid)
+        sys.exit(1)
+
+    # Set up environment variables and foo needed to get started.
+    environment_set()
+    config_set()
+
+    link_to_mime_data()
+
+    try:
+        if opts.update:
+            index_update()
+
+        if opts.list_files:
+            db_query_list_files()
+
+        if opts.shell:
+            index_shell()
+            sys.exit(0)
+
+        if opts.query:
+            if not os.path.exists(index_location_abs):
+                print(
+                    'Can not query yet, index has not been created, see --update or -u')
+                print(usage_invalid)
+                sys.exit(1)
+
+            db_query_files_that_match()
+
+    except KeyboardInterrupt:
+        print('Handling Ctrl+C')
+
+    environment_unset()