Changeset 3646 for lliurex-store/trunk/fuentes/lliurex-appstore.install/usr

Timestamp:

Feb 15, 2017, 6:27:03 PM (4 years ago)

Author:

Juanma

Message:

WIP on CLI

File:

• lliurex-store/trunk/fuentes/lliurex-appstore.install/usr/share/lliurex-store/lliurex-store-cli.py (modified) (5 diffs)

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

@@ -11 +11 @@
                 printed=False
                 results=store.get_result(action)
-                print(store.get_progress())
+                print ("")
                 for action in results:
                         if action in actions and not actionList[action]:
-                                print("")
-                                print ("#####################")
-                                print ("RESULT FOR "+action+ " executed in " + str((time.time() - start_time)))
-                                print(store.get_progress())
+                                print (u"Results for "+action) 
                                 for result in results[action]:
-                                        print(result)
-                                        print ("---------------")
+                                        if action=='search':
+                                                if args.info:
+                                                        try:
+                                                                print(u'Package: '+result['package'])
+                                                                print(u'Version: '+result['version'])
+                                                                print(u'Categories: '+','.join(result['categories']))
+                                                                print(u'Status: '+result['status'])
+                                                                print(u'Summary: '+result['summary'])
+                                                                print(u'Description: '+result['description'])
+                                                                pkgString=[]
+                                                                for dependency in result['depends']:
+                                                                                pkgName=dependency.split(';')[0]
+                                                                                pkgString.append(pkgName)
+                                                                print(u'Depends: '+' '+','.join(pkgString))
+                                                                print("")
+                                                        except:
+                                                                pass
+                                                else:
+                                                        #Only print name and summary
+                                                        print(result['package']+": "+result['summary'])
+                                        elif action=='list':
+                                                #Print package, summary and status
+                                                try:
+                                                        if result['package']:
+                                                                package=result['package']
+                                                        else:
+                                                                package=result['name']
+                                                        print(package+": "+result['summary']+' ('+','.join(result['categories'])+')'+' ('+result['status']+')')
+                                                except:
+                                                        pass
+                                        elif action=='install':
+                                                for app in result:
+                                                                        print(app+' '+result[app])
+                                        else:
+                                                        print(result)
                                 printed=True
-                        if printed:
-                                print ("####################")
+#                               print ("---------------")
+#                       if printed:
+#                               print ("####################")
                 return(printed)
+        #def print_results
 
         CURSOR_UP='\033[F'
@@ -30 +62 @@
         actions=[]
         parms={}
-        store=storeManager.StoreManager()
         args=process_Args(sys.argv)
+        store=storeManager.StoreManager(args.debug)
 
-        if args.debug:
-                actions.append('debug')
-                store.set_debug(args.debug)
-                parms['debug']=args.debug
-        if args.search:
+        '''     if args.debug:
+                        actions.append('debug')
+                        store.set_debug(args.debug)
+                        parms['debug']=args.debug'''
+        if (args.search or args.info):
                 actions.append('search')
+                if args.info:
+                                args.search=args.info
                 parms['search']=args.search
         if args.install:
@@ -56 +90 @@
         start_time=time.time()
         for action in actions:
-                print("Launching: "+action)
+#               print(u"Launching: "+action)
                 store.execute_action(action,parms[action])
                 actionList[action]=False
                 
-        print ("All actions launched: " +str(actions))
+#       print ("All actions launched: " +str(actions))
         while store.is_action_running():
-                #               print("                                                                                                               ",end="\r")
-                print (CURSOR_UP + ERASE_LINE)
-                print(store.get_progress(),end="\r")
+                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:
@@ -70 +107 @@
                         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()
-
 
 def process_Args(args):
@@ -79 +122 @@
         parser.add_argument('--list-sections',action='store_true',help=(u"List all sections from the store"))
         parser.add_argument('--search',metavar='Name',nargs='?',help=(u"Search a package"))
+        parser.add_argument('--info',metavar='Name',nargs='?',help=(u"Show all info from a package"))
         parser.add_argument('--install',metavar='Package',help=(u"Install a package"))
         parser.add_argument('--remove',metavar='Package',help=(u"Remove a package"))