From 2300e6834a8fbc9bfb7741955b64a4146f34868c Mon Sep 17 00:00:00 2001
From: brookieyu <yulu20@huawei.com>
Date: Thu, 28 Dec 2023 11:50:29 +0800
Subject: [PATCH] manifest: optimize the style of use about manifest

* the manifest command is used to manager src code, we can
  use it to download src code or generate manifest.yaml from
  src directory. we optimize it and let it's use more easily.

Signed-off-by: brookieyu <yulu20@huawei.com>
---
 src/oebuild/app/plugins/manifest/manifest.py | 49 +++++++++-----------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/oebuild/app/plugins/manifest/manifest.py b/src/oebuild/app/plugins/manifest/manifest.py
index 1eaca5e..866066c 100644
--- a/src/oebuild/app/plugins/manifest/manifest.py
+++ b/src/oebuild/app/plugins/manifest/manifest.py
@@ -38,6 +38,7 @@ class Manifest(OebuildCommand):
 
     def __init__(self):
         self.configure = Configure()
+        self.manifest_command = ['download', 'create']
         super().__init__(
             'manifest',
             'generate manifest from oebuild workspace',
@@ -53,27 +54,11 @@ class Manifest(OebuildCommand):
             parser_adder,
             usage='''
 
-  %(prog)s [-c CREATE] [-r recover] [-m_dir MANIFEST_DIR]
+  %(prog)s [create / download] [-f MANIFEST_DIR]
 
 ''')
 
-        parser.add_argument('-c',
-                            '--create', 
-                            dest = "is_create",
-                            action = "store_true",
-                            help='''
-            create manifest from oebuild workspace src directory
-            ''')
-
-        parser.add_argument('-r',
-                            '--recover', 
-                            dest = "is_recover",
-                            action = "store_true",
-                            help='''
-            restore repo version to oebuild workspace src directory from a manifest
-            ''')
-
-        parser.add_argument('-m_dir',
+        parser.add_argument('-f',
                             '--manifest_dir',
                             dest='manifest_dir',
                             help='''
@@ -84,20 +69,30 @@ class Manifest(OebuildCommand):
         return parser
 
     def do_run(self, args: argparse.Namespace, unknown = None):
+        if not self.configure.is_oebuild_dir():
+            logger.error('your current directory had not finishd init')
+            sys.exit(-1)
+
+        if not (unknown and unknown[0] in self.manifest_command):
+            unknown = ['-h']
+        else:
+            command = unknown[0]
+            unknown = unknown[1:]
+
         # perpare parse help command
         if self.pre_parse_help(args, unknown):
             return
 
         args = args.parse_args(unknown)
-
-        if not self.configure.is_oebuild_dir():
-            logger.error('your current directory had not finishd init')
-            sys.exit(-1)
-
-        if args.is_create:
-            self._create_manifest(args.manifest_dir)
-        elif args.is_recover:
-            self._restore_manifest(args.manifest_dir)
+        manifest_dir = args.manifest_dir if args.manifest_dir else (self.configure.source_yocto_dir()
+                                                                    + '/.oebuild/manifest.yaml')
+        if command == 'create':
+            self._create_manifest(manifest_dir)
+        elif command == 'download':
+            if not os.path.exists(manifest_dir):
+                logger.error('The path is invalid, please check the path')
+                sys.exit(1)
+            self._restore_manifest(manifest_dir)
 
     def _create_manifest(self, manifest_dir):
         src_list = os.listdir(self.configure.source_dir())
-- 
Gitee