Merge lp:~amith/unity/unity-reset-fix into lp:unity

[amith kk]

Restores unity --reset and fixes unity --reset-icons

== Problem ==
unity --reset depreciated in Unity 5. unity --reset_icons used to use subprocess

== Fix ==
Added def to reset unity when unity --reset is called. Replace bad subprocess calls with gsettings API

== Test ==
Run unity --reset and unity --reset-icons

Thanks to Barneedhar<email address hidden> and Mahesh<email address hidden>

[Didier Roche (didrocks)]

Thanks for the patch!

As discussed on IRC, I think we will need some automated tests and stop relying on manual one. Please ping thomi and other people on #ubuntu-unity for the having an autopilot test for it (some unit one is possible as we already discussed on IRC).

Thanks again ;)

[Timo Jyrinki (timo-jyrinki)]

Needs fixing, to have automated test included.

review: Needs Fixing

[Christopher Townsend (townsend)]

This is a rather old MP now and no additional work has been done on it in years. Rejecting...

Unmerged revisions

2866. By amith kk on 2012-10-22

modified:
  tools/unity.cmake

=== modified file 'tools/unity.cmake'
--- tools/unity.cmake	2012-09-19 07:19:37 +0000
+++ tools/unity.cmake	2012-10-22 14:41:47 +0000
@@ -27,6 +27,8 @@
 import subprocess
 import sys
 import time
+from gi.repository import Gio
+import re
 
 home_dir = os.path.expanduser("~%s" % os.getenv("SUDO_USER"))
 supported_prefix = "/usr/local"
@@ -65,7 +67,52 @@
 
 def reset_launcher_icons ():
     '''Reset the default launcher icon and restart it.'''
-    subprocess.Popen(["gsettings", "reset" ,"com.canonical.Unity.Launcher" , "favorites"]) 
+    
+    gsettings=Gio.Settings("com.canonical.Unity.Launcher")
+    if "favorites" in gsettings.list_keys():
+		gsettings.reset("favorites")
+    else:
+		print "ERROR: Unable to reset Launcher icons"
+		print "key 'favourites' in Schema 'com.canonical.Unity.Launcher' is missing"
+def reset_unity ():
+
+    subprocess.Popen(["killall", "unity-panel-service"])
+    subprocess.Popen(["killall", "compiz"])
+    allSchemas=Gio.Settings.list_schemas()
+    allRelocatableSchemas=Gio.Settings.list_relocatable_schemas()
+
+    def resetAllKeys(schema,path=None):
+        """Reset all keys in given Schema."""
+        if (schema not in allSchemas) and (schema not in allRelocatableSchemas):
+            print "Ignoring missing Schema %s"%schema
+            return
+        gsettings=Gio.Settings(schema=schema,path=path)
+        for key in gsettings.list_keys():
+            gsettings.reset(key)
+        print "Schema %s successfully reset"%schema
+
+    def resetPlugins():
+        """Reset Compiz Plugins"""
+        compizPluginRe=re.compile(r'(?P<plugin>org.compiz.)')
+        for schema in allRelocatableSchemas:
+            if compizPluginRe.match(schema):
+                plugin=compizPluginRe.sub('',schema)
+                schema='org.compiz.'+plugin
+                path="/org/compiz/profiles/unity/plugins/"+plugin+"/"
+                resetAllKeys(schema=schema,path=path)
+
+    def resetUnityChildren():
+        """Reset keys in child schemas of Unity"""
+        unitySchema='com.canonical.Unity'
+        blacklists=['com.canonical.Unity.Launcher','com.canonical.Unity.webapps','com.canonical.Unity.Lenses']
+        unityChildRe=re.compile(unitySchema)
+        for schema in allSchemas:
+            if (schema not in blacklists) and (unityChildRe.match(schema)):
+                resetAllKeys(schema)
+
+    resetPlugins()
+    resetUnityChildren()
+
 
 def process_and_start_unity (verbose, debug_mode, compiz_args, log_file):
     '''launch unity under compiz (replace the current shell in any case)'''
@@ -121,31 +168,31 @@
     sys.exit(unity_instance.returncode)
 
 def reset_to_distro():
-	''' remove all known default local installation path '''
-	
-	# check if we are root, we need to be root
-	if os.getuid() != 0:
-		print "Error: You need to be root to remove your local unity installation"
-		return 1
-	error = False
-	
-	for filedir in well_known_local_path:
-		for elem in glob.glob(filedir):
-			try:
-				shutil.rmtree(elem)
-			except OSError, e:
-				if os.path.isfile(elem) or os.path.islink(elem):
-					os.remove(elem)
-				else:
-					print "ERROR: Cannot remove %s: %s" % (elem, e)
-					error = True
-	
-	if error:
-		print "See above: some error happened and you should clean them before trying to restart unity"
-		return 1
-	else:
-		print "Unity local install cleaned, you can now restart unity"
-		return 0
+    ''' remove all known default local installation path '''
+    
+    # check if we are root, we need to be root
+    if os.getuid() != 0:
+        print "Error: You need to be root to remove your local unity installation"
+        return 1
+    error = False
+    
+    for filedir in well_known_local_path:
+        for elem in glob.glob(filedir):
+            try:
+                shutil.rmtree(elem)
+            except OSError, e:
+                if os.path.isfile(elem) or os.path.islink(elem):
+                    os.remove(elem)
+                else:
+                    print "ERROR: Cannot remove %s: %s" % (elem, e)
+                    error = True
+    
+    if error:
+        print "See above: some error happened and you should clean them before trying to restart unity"
+        return 1
+    else:
+        print "Unity local install cleaned, you can now restart unity"
+        return 0
 
 if __name__ == '__main__':
     usage = "usage: %prog [options]"
@@ -162,7 +209,7 @@
     parser.add_option("--replace", action="store_true",
                       help="Run unity /!\ This is for compatibility with other desktop interfaces and acts the same as running unity without --replace")
     parser.add_option("--reset", action="store_true",
-                      help="Reset is not supported anymore. Deprecated option")
+                      help="Reset all the settings of Unity except Launcher icons, webapps and remote lens")
     parser.add_option("--reset-icons", action="store_true",
                       help="Reset the default launcher icon.")  
     parser.add_option("-v", "--verbose", action="store_true",
@@ -172,16 +219,15 @@
     set_unity_env()
 
     if options.distro:
-		sys.exit(reset_to_distro())
+        sys.exit(reset_to_distro())
 
     if options.reset:
-        print ("ERROR: the reset option is now deprecated")
-        sys.exit(1)
- 
+        reset_unity ()
+        
     if options.reset_icons:
         reset_launcher_icons ()
-	
-	if options.replace:
-		print ("WARNING: This is for compatibility with other desktop interfaces please use unity without --replace")
-			
+    
+    if options.replace:
+        print ("WARNING: This is for compatibility with other desktop interfaces please use unity without --replace")
+            
     run_unity (options.verbose, options.debug, options.advanced_debug, args, options.log)