[ocrfeeder] Replace the usage of cliutils by OptParse in studioBuilder

[Joaquim Manuel Pereira Rocha <jrocha src gnome org>]

commit 445e1093a80f20aa4b766a3d74367e5f36ec8317
Author: Joaquim Rocha <jrocha igalia com>
Date:   Mon Nov 8 22:05:19 2010 +0100

    Replace the usage of cliutils by OptParse in studioBuilder
    
    Also removed the cliutils module and adds the help and version
    command line options.

 po/POTFILES.in                        |    1 -
 src/ocrfeeder/studio/studioBuilder.py |   21 ++++++++---
 src/ocrfeeder/util/cliutils.py        |   62 ---------------------------------
 3 files changed, 15 insertions(+), 69 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4d8ae18..8327457 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,7 +12,6 @@ src/ocrfeeder/studio/dataHolder.py
 src/ocrfeeder/studio/studioBuilder.py
 src/ocrfeeder/studio/widgetModeler.py
 src/ocrfeeder/studio/widgetPresenter.py
-src/ocrfeeder/util/cliutils.py
 src/ocrfeeder/util/constants.py
 src/ocrfeeder/util/graphics.py
 src/ocrfeeder/util/lib.py
diff --git a/src/ocrfeeder/studio/studioBuilder.py b/src/ocrfeeder/studio/studioBuilder.py
index 74926b9..51e6ca2 100644
--- a/src/ocrfeeder/studio/studioBuilder.py
+++ b/src/ocrfeeder/studio/studioBuilder.py
@@ -20,7 +20,6 @@
 
 from ocrfeeder.util import lib
 from ocrfeeder.util.constants import *
-from ocrfeeder.util.cliutils import ArgsRetriever
 import sys
 import os.path
 import urllib
@@ -32,6 +31,7 @@ from customWidgets import SelectableBoxesArea
 from ocrfeeder.feeder.ocrEngines import Engine, OcrEnginesManager
 from configuration import ConfigurationManager
 from ocrfeeder.util.asyncworker import AsyncItem
+from optparse import OptionParser
 import gettext
 import locale
 _ = gettext.gettext
@@ -107,13 +107,22 @@ class Studio:
         self.main_window.setHeader(menubar_callback_dict, toolbar_callback_dict)
         self.main_window.setDestroyEvent(self.quit)
 
-        cli_command_retriever = ArgsRetriever(sys.argv)
-        imgs = cli_command_retriever.getParams('--images')
+        parser = OptionParser(version = '%prog ' + OCRFEEDER_STUDIO_VERSION)
+        parser.add_option('-i', '--images', dest = 'images',
+                          action = 'append', type = 'string',
+                          metavar = 'IMAGE1 [IMAGE2, ...]', default = [],
+                          help = 'images to be automatically added on start-up')
+        parser.add_option('-d', '--dir', dest = 'directory',
+                          action = 'store', type = 'string',
+                          help = 'directory with images to be added'
+                          ' automatically on start-up')
+        options, args = parser.parse_args()
+        imgs = options.images
         if imgs:
             self.__addImagesToReviewer(imgs)
-        dirs = cli_command_retriever.getParams('--dir')
-        if dirs:
-            self.__addImagesToReviewer(lib.getImagesFromFolder(dirs[0]))
+        if options.directory:
+            self.__addImagesToReviewer(
+                lib.getImagesFromFolder(options.directory))
 
         self.main_window.setHasSelectedBoxes(False)
         self.main_window.setHasContentBoxes(False)