Changeset 2430

Timestamp:

Sep 15, 2016, 8:46:10 AM (3 years ago)

Author:

jrpelegrina

Message:

Wip in hide/show desktop

Location:

lliurex-desktops-keeper/trunk/fuentes

Files:

• debian/prerm (modified) (1 diff)
• install/usr/sbin/lliurex-desktops-db (modified) (5 diffs)

lliurex-desktops-keeper/trunk/fuentes/debian/prerm

@@ -21 +21 @@
     remove)
         lliurex-desktops-db PURGE
+    lliurex-desktops-db SHOW
         update-desktop-database /usr/share/applications/ >/dev/null 2>/dev/null || true
         update-mime >/dev/null 2>/dev/null || true

lliurex-desktops-keeper/trunk/fuentes/install/usr/sbin/lliurex-desktops-db

@@ -154 +154 @@
                 todel.append(tmp[len(tmp)-1])
                 
-
+                
+                
         for file in todel:
                 if os.path.exists(destination_path+file+".diverted"):
@@ -166 +167 @@
         #print "* Removing db file"
         os.remove(diversion_db)
-        
-
+
+
+        
+# hide command
 def hide(path):
         global db_hide
@@ -183 +186 @@
                         
                                 if os.path.exists(xfile):
-                                        print "True"
+                                        
                                         must_save=True
-                                        print  xfile
                                         db_hide.append(xfile)
-                                        print subprocess.call(["dpkg-divert","--package","lliurex-desktops-keeper","--rename","--quiet","--add", "--divert",str(xfile+".diverted"),str(xfile)])
+                                        subprocess.call(["dpkg-divert","--package","lliurex-desktops-keeper","--rename","--quiet","--add", "--divert",str(xfile+".diverted"),str(xfile)])
 
                                 if must_save:
@@ -199 +201 @@
                 hide_desktop_file.close()
 
+#show command
+def show():
+        global db_hide
+
+        initdb_hide()
+
+        toshow=[]
+
+        for c in db_hide:
+                tmp=c.strip()
+                toshow.append(tmp)
+                
+        for line in toshow:
+                xfile=line.strip()
+                if os.path.exists(line+".diverted"):
+                        subprocess.call(["dpkg-divert","--package","lliurex-desktops-keeper","--rename","--quiet","--remove",str(line)])
+        
+        #print "* Removing db file"
+        os.remove(diversion_db_hide)
+
+
 def initdb():
         global db
@@ -266 +289 @@
                 hide(path)              
         
+        if order=="SHOW":
+                show()  
+        
         exit(0)