From 0511402708a37bb5db8fe7bd7fadf827b3a195d0 Mon Sep 17 00:00:00 2001
From: somas95 <manuel.genoves@gmail.com>
Date: Tue, 27 Mar 2018 20:49:13 +0200
Subject: [PATCH] Parsing of command line options

Signed-off-by: somas95 <manuel.genoves@gmail.com>
---
 uberwriter/__init__.py      | 40 ++++++++-----------------------------
 uberwriter_lib/AppWindow.py | 32 +++++++++++++++++++----------
 2 files changed, 29 insertions(+), 43 deletions(-)

diff --git a/uberwriter/__init__.py b/uberwriter/__init__.py
index a79d38d..c0e8571 100644
--- a/uberwriter/__init__.py
+++ b/uberwriter/__init__.py
@@ -14,7 +14,6 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 import sys
-import optparse
 
 import locale
 import os
@@ -28,43 +27,20 @@ from gi.repository import Gtk # pylint: disable=E0611
 from . import UberwriterWindow
 from uberwriter_lib import AppWindow
 
-from uberwriter_lib import set_up_logging, get_version
-
-def parse_options():
-    """Support for command line options"""
-    parser = optparse.OptionParser(version="%%prog %s" % get_version())
-    parser.add_option(
-        "-v", "--verbose", action="count", dest="verbose",
-        help=_("Show debug messages (-vv debugs uberwriter_lib also)"))
-    parser.add_option(
-        "-e", "--experimental-features", help="Use experimental features",
-        action='store_true'
-        )
-    (options, args) = parser.parse_args()
-
-    set_up_logging(options)
-
-    # print args
-
-    return options, args
-
 def main():
     'constructor for your class instances'
-    (options, args) = parse_options()
+    # (options, args) = parse_options()
     
-    # TODO: all the parsing is unused. 
-    # We want to allow multiple windows
-
     # Run the application.
     app = AppWindow.Application()
     
-    if args:
-        for arg in args:
-            pass 
-    else:
-        pass
-    if options.experimental_features:
-        window.use_experimental_features(True)
+    # ~ if args:
+        # ~ for arg in args:
+            # ~ pass 
+    # ~ else:
+        # ~ pass
+    # ~ if options.experimental_features:
+        # ~ window.use_experimental_features(True)
         
     app.run(sys.argv)
     
diff --git a/uberwriter_lib/AppWindow.py b/uberwriter_lib/AppWindow.py
index 74cb5d2..f20ee11 100644
--- a/uberwriter_lib/AppWindow.py
+++ b/uberwriter_lib/AppWindow.py
@@ -11,6 +11,7 @@
 # with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.
 
 import sys
+import argparse
 
 import locale
 import os
@@ -23,6 +24,7 @@ from gi.repository import GLib, Gio, Gtk, GdkPixbuf
 
 from . helpers import get_builder, show_uri, get_help_uri, get_media_path
 from uberwriter import UberwriterWindow
+from uberwriter_lib import set_up_logging
 
 class Window(Gtk.ApplicationWindow):
 
@@ -102,10 +104,7 @@ class Application(Gtk.Application):
                          flags=Gio.ApplicationFlags.HANDLES_COMMAND_LINE,
                          **kwargs)
         self.window = None
-
-        self.add_main_option("test", ord("t"), GLib.OptionFlags.NONE,
-                             GLib.OptionArg.NONE, "Command line test", None)
-
+        
     def do_startup(self):
         Gtk.Application.do_startup(self)
 
@@ -136,18 +135,29 @@ class Application(Gtk.Application):
             # when the last one is closed the application shuts down
             # self.window = Window(application=self, title="UberWriter")
             self.window = UberwriterWindow.UberwriterWindow(application=self, title="UberWriter")
-            if len(sys.argv) > 1:
-              self.window.load_file(sys.argv[1])
+            if len(self.args) > 0:
+              self.window.load_file(self.args[0])
+            if self.options.experimental_features:
+                self.window.use_experimental_features(True)
+        
 
         self.window.present()
 
     def do_command_line(self, command_line):
-        options = command_line.get_options_dict()
-
-        if options.contains("test"):
-            # This is printed on the main instance
-            print("Test argument recieved")
+      
+        """Support for command line options"""
+        parser = argparse.ArgumentParser()
+        parser.add_argument(
+            "-v", "--verbose", action="count", dest="verbose",
+            help=_("Show debug messages (-vv debugs uberwriter_lib also)"))
+        parser.add_argument(
+            "-e", "--experimental-features", help=_("Use experimental features"),
+            action='store_true'
+            )
+        (self.options, self.args) = parser.parse_known_args()
 
+        set_up_logging(self.options)
+        
         self.activate()
         return 0