Changeset 8182

Timestamp:

Oct 23, 2018, 2:24:29 PM (2 years ago)

Author:

Juanma

Message:

cli improvements

Location:

lliurex-store/trunk/fuentes

Files:

• lliurex-store-cli/usr/share/lliurex-store/lliurex-store-cli.py (modified) (9 diffs)
• python3-lliurex-store.install/usr/share/lliurexstore/plugins/searchManager.py (modified) (3 diffs)
• python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py (modified) (1 diff)

lliurex-store/trunk/fuentes/lliurex-store-cli/usr/share/lliurex-store/lliurex-store-cli.py

@@ -1 +1 @@
 #!/usr/bin/python3
-import sys
+import sys,os,signal
 import argparse
 #sys.path.append('/usr/share/lliurex-store')
@@ -8 +8 @@
 import html2text
 import gettext
+import threading
 gettext.textdomain('python3-lliurex-store')
 _=gettext.gettext
@@ -23 +24 @@
    END = '\033[0m'
 
+def signal_handler(*args):
+        if args[0]==17:
+                return
+        os.system('setterm -cursor on')
+        sys.exit(0)
+        
+
 def main():
         def print_results(action=None):
@@ -28 +36 @@
                 results=store.get_result(action)
                 status=store.get_status(action)
-                print("ST: %s"%status)
                 if not 'status' in status.keys():
                         status['status']=1
@@ -72 +79 @@
                                                 elif action=='search':
                                                         #Only print name and summary
+                                                        data_id=''
                                                         printcolor=color.DARKCYAN
-                                                        data_id=''
-                                                        if data['bundle']!='':
+                                                        if data['bundle']:
                                                                 printcolor=color.PURPLE
                                                         elif (data['package'] not in data['id'] or data['package'] in processed):
@@ -98 +105 @@
                                                                 pass
                                                 elif action=='install':
-                                                                print(data['package']+" "+ _(u"installed")+" "+color.BOLD+ _(u"succesfully")+color.END)
+                                                                print(color.DARKCYAN+data['package']+color.END+" "+ _(u"installed")+" "+color.BOLD+ _(u"succesfully")+color.END)
                                                 elif action=='remove':
-                                                                print(data['package']+" "+ _(u"removed")+" "+color.BOLD+ _(u"succesfully")+color.END)
+                                                                print(color.DARKCYAN+data['package']+color.END+" "+ _(u"removed")+" "+color.BOLD+ _(u"succesfully")+color.END)
                                                 else:
                                                         print("RESULT:\n%s"%data)
@@ -145 +152 @@
 #               actions.append('random')
 #               parms['random']=args.random
-#       if args.list:
-#               actions.append('list')
-#               parms['list']=args.list
+        if args.list:
+                actions.append('list')
+                parms['list']=args.list
 
         actionList={'search':False,'info':False,'pkgInfo':False,'install':False,'remove':False,'list':False,'list-sections':False,'random':False}
@@ -153 +160 @@
         store=storeManager.StoreManager(appimage=appimage,snap=snap,dbg=dbg,cli=True)
         for action in actions:
-                store.execute_action(action,parms[action])
+                th=threading.Thread(target=store.execute_action, args = (action,parms[action]))
+                th.start()
                 actionList[action]=False
                 
+        inc=0
+        banner=' '.join(actions)
+        banner='LliureX Store'
+        numchar=len(banner)
+        os.system('setterm -cursor off')
         while store.is_action_running():
-                progressDic=store.get_progress()
-                progressArray=[]
-                for progress in progressDic:
-                        if progress!='load':
-                                progressArray.append(_(progress)+': '+str(int(progressDic[progress]))+'%')
-                print(','.join(progressArray),end="\r")
-                time.sleep(0.1)
-                for key in actionList:
-                        progressDic=store.get_progress(key)
-                        if key in progressDic:
+                ini=banner[0:numchar]
+                end=banner[numchar:inc]
+                text=ini+' '+end
+                print(text+'                 ',end='\r')
+                numchar-=1
+                inc+=1
+                time.sleep(0.2)
+                if numchar<0:
+                        numchar=len(banner)
+                        inc=0
+        print("")
+        print (CURSOR_UP + ERASE_LINE)
+        for key in actionList:
+                progressDic=store.get_progress(key)
+                if key in progressDic:
                                 if progressDic[key]==100 and not actionList[key]:
-                                        progressDic=store.get_progress(key)
-                                        progressArray=[]
-                                        for progress in progressDic:
-                                                if progress!='load':
-                                                        progressArray.append(_(progress)+': '+str(progressDic[progress])+'%')
-                                        print(','.join(progressArray))
-                                        print (CURSOR_UP + ERASE_LINE)
                                         actionList[key]=print_results(key)
-#       print_results('random')
+        print_results()
+        os.system('setterm -cursor on')
 
 def process_Args(args):
@@ -188 +200 @@
         parser.add_argument('--appimage',action='store_true',help=(_(u"Load appimage catalog")))
         parser.add_argument('--snap',action='store_true',help=(_(u"Load snap catalog")))
-#       parser.add_argument('--list',metavar='list',nargs='?',help=(_(u"List category")))
+        parser.add_argument('--list',metavar='list',nargs='?',help=(_(u"List category")))
 
         args=parser.parse_args()
         return args
 
+#Cause the cli hides the cursor we must assure that the cursor is showing when the program ends
+sigs=set(signal.Signals) - {signal.SIGKILL, signal.SIGSTOP}
+for sig in sigs:
+        signal.signal(sig,signal_handler)
 main()

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/searchManager.py

@@ -130 +130 @@
                         categories_set=set(tokens)
                         apps_in_store=self.store.get_apps()
-                        if max_results:
-                                apps_in_store=apps_in_store[0:max_results]
                         count_apps=len(apps_in_store)
                         self.progress=0
@@ -146 +144 @@
                                                 self._debug("Found "+app.get_id())
                                                 applist.append(app)
+                                                if max_results and len(applist)==max_results:
+                                                        break
                 else:
                         self._debug("Loading all apps in store")
@@ -165 +165 @@
 #                       for app in applist:
 #                               self._debug("Added "+app.get_id())
-#               if max_results:
-#                       applist=applist[0:max_results]
+                        if max_results:
+                                applist=applist[0:max_results]
                 #List only valid categories
 

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py

@@ -227 +227 @@
                         exe_function=eval(self.plugins_registered[action][package_type]+"("+','.join(args)+")")
                         if self._propagate_dbg:
-                                exe_function.set_debug()
+                                exe_function.set_debug(self.dbg)
                         if self.plugins_registered[action][package_type] in self.cli_mode:
                                 exe_function.cli_mode=True