Merge lp:~jibel/magomatic/magomatic-xprop into lp:magomatic

[Jean-Baptiste Lallement]

This avoids searching for the command and window name to introspect.

[Nagappan Alagappan (nagappan)]

Changes looks fine to me. Thanks

review: Approve

=== modified file 'bin/magomatic'
--- bin/magomatic	2010-10-22 12:05:31 +0000
+++ bin/magomatic	2010-11-04 13:47:45 +0000
@@ -8,7 +8,8 @@
 import logging
 import optparse
 import os
-import sys
+import sys, subprocess
+from re import search
 
 import gettext
 from gettext import gettext as _
@@ -32,6 +33,51 @@
             logging.DEBUG,
             )
 
+def xprop():
+    (command, appname) = (None, None)
+    (wmname, wmtype) = (None, None)
+    print "\
+Please select the window about which you would like information \n\
+by clicking the mouse in that window."
+
+    try:
+        sp = subprocess.Popen(['xprop','_NET_WM_PID', 'WM_NAME',
+                               '_NET_WM_WINDOW_TYPE'], stdin=None,
+                              stdout=subprocess.PIPE, stderr=None)
+    except OSError, e:
+        return [127, str(e)]
+    out = sp.communicate()[0]
+    for line in out.split('\n'):
+        m = search('([^\(]+).* = (.+)', line)
+        if m:
+            wmprop = m.group(1)
+            wmvalue = m.group(2)
+
+            if wmprop.startswith('_NET_WM_PID'):
+                try:
+                    f = open('/proc/%d/comm' % int(wmvalue), 'rb')
+                    command = f.read().strip()
+                    f.close()
+                except IOError, e:
+                    # Parent process may not exists anymore when it forks
+                    if e.errno == 2: # File does not exist
+                        return (None, None)
+                    else:
+                        raise IOError,e
+            elif wmprop.startswith('WM_NAME'):
+                # Remove quotes and spaces to match naming conventions of ldtp
+                wmname = wmvalue[1:-1].replace(' ','') 
+            elif wmprop.startswith('_NET_WM_WINDOW_TYPE'):
+                if 'NORMAL' in wmvalue:
+                    wmtype = 'frm'
+                elif 'DIALOG' in wmvalue:
+                    wmtype = 'dlg'
+
+    if wmname and wmtype:
+        appname = wmtype + wmname
+
+    return (command, appname)
+
 if __name__ == "__main__":
 
     version = magomaticconfig.__magomatic_data_directory__
@@ -46,11 +92,15 @@
     (options, args) = parser.parse_args()
     
     if len(args) != 2:
-        parser.error("Incorrect number of arguments")
+        # Run xprop to guess the window name and binary
+        (app_launcher, main_window) = xprop()
+        if not app_launcher or not main_window:
+            print "E: Unable to find information about that window."
+            sys.exit(1)
+    else:
+        app_launcher = args[0]
+        main_window = args[1]
 
-    app_launcher = args[0]
-    main_window = args[1]
-    
     # set the verbosity
     if options.debug_mode:
         options.logging_level = 3
@@ -61,4 +111,4 @@
     magomatic.create_app_folder()
     magomatic.discover_application()
 
-    logging.debug(_('end of prog'))
\ No newline at end of file
+    logging.debug(_('end of prog'))

=== modified file 'magomatic/magomatic.py'
--- magomatic/magomatic.py	2010-11-03 21:44:45 +0000
+++ magomatic/magomatic.py	2010-11-04 13:47:45 +0000
@@ -15,7 +15,7 @@
     """
     """
     
-    def __init__(self, launcher, main_window, white_list=["menu_item", "push_button"]):
+    def __init__(self, launcher, main_window, white_list=["menu_item", "push_button", "text"]):
         self.launcher = launcher
         self.appname = re.sub('\W', '_', self.launcher)
         self.main_window = main_window
@@ -64,7 +64,8 @@
                     
     def discover_application(self):
         
-        ldtp.launchapp(self.launcher)
+        if not ldtp.guiexist(self.main_window):
+            ldtp.launchapp(self.launcher)
         ldtp.waittillguiexist(self.main_window)
         app = ooldtp.context(self.main_window)
         
@@ -81,6 +82,7 @@
             
             if role in self.white_list:
                 constant = re.sub('\W', '_', component.upper())
+                constant = constant[:3] + "_" + constant[3:] # Split prefix for clarity
                 constants += "    " + constant +" = _('" + component + "')\n"
 
         app_file = os.path.join(self.app_folder, "application/" + self.appname + ".py")