lbkit 0.9.12__tar.gz → 0.9.13__tar.gz

{lbkit-0.9.12/lbkit.egg-info → lbkit-0.9.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.9.12
+Version: 0.9.13
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

lbkit-0.9.13/lbkit/__commit__.py

@@ -0,0 +1 @@
+__commit__ = '014a769'

lbkit-0.9.13/lbkit/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.9.13'

{lbkit-0.9.12 → lbkit-0.9.13}/lbkit/cli.py

@@ -27,10 +27,22 @@ from lbkit import errors
 from lbkit.ukr.build import UKRBuild
 from lbkit.utils.env_detector import EnvDetector
 from lbkit.skill.manager import sync as skill_sync
+from lbkit.upgrade import upgrade as do_upgrade
 
 log = Logger()
 
 
+def ask_user_yes_no(prompt):
+    """向用户询问是/否问题"""
+    while True:
+        answer = input(f"{prompt} [y/N]: ").strip().lower()
+        if answer in ("y", "yes"):
+            return True
+        if answer in ("n", "no", ""):
+            return False
+        print("请输入 y 或 n")
+
+
 class Command(object):
     """A single command of the lbkit application, with all the first level commands. Manages the
     parsing of parameters and delegates functionality in collaborators. It can also show the
@@ -115,6 +127,14 @@ class Command(object):
         """
         skill_sync()
 
+    def upgrade(self, *args):
+        """
+        自升级lbkit.
+
+        通过apt/dnf升级系统包并安装配套的PyPI包
+        """
+        do_upgrade(*args)
+
     def _show_help(self):
         """
         Prints a summary of all commands.
@@ -123,7 +143,7 @@ class Command(object):
                 ("Build Component commands", ["build", "test"]),
                 ("Build Product commands", ["build"]),
                 ("AI Skill commands", ["skill"]),
-                ("Misc commands", ["help"]),
+                ("Misc commands", ["upgrade", "help"]),
                ]
 
         def check_all_commands_listed():

{lbkit-0.9.12 → lbkit-0.9.13}/lbkit/codegen/template/public.c.mako

@@ -434,7 +434,7 @@ ${name} ${name}_decode(GVariant *in)
     }
 
     const gchar *in_val = g_variant_get_string(in, NULL);
-    for (int i = 0; i <= ${len(enum.values.parameters)}; i++) {
+    for (int i = 0; i < (int)G_N_ELEMENTS(_${name}StrMap); i++) {
         if (g_strcmp0(in_val, _${name}StrMap[i]) == 0) {
             return (${name})i;
         }
@@ -494,7 +494,7 @@ gboolean ${name}_validate_odf(yaml_document_t *doc, yaml_node_t *node,
         return FALSE;
     }
     const gchar *value = (const gchar *)node->data.scalar.value;
-    for (int i = 0; i <= ${len(enum.values.parameters)}; i++) {
+    for (int i = 0; i < ${len(enum.values.parameters)}; i++) {
         if (g_strcmp0(value, ${name}_as_string(i)) == 0) {
             return TRUE;
         }
@@ -502,7 +502,6 @@ gboolean ${name}_validate_odf(yaml_document_t *doc, yaml_node_t *node,
     *error_list = g_slist_append(*error_list, g_error_new(ODF_ERROR, ODF_ERROR_PROP_VALIDATE_TYPE_ERROR,
         "the value of property %s is invalid, get %s", prop->str, value));
     return FALSE;
-    return FALSE;
 }
 
 gboolean ${name}_validate_odf_v(yaml_document_t *doc, yaml_node_t *node,
@@ -1702,7 +1701,7 @@ ${name} ${name}_load_from_odf(yaml_document_t *doc, yaml_node_t *node)
         return _${name}_Invalid;
     }
 
-    for (int i = 0; i <= ${len(enum.values.parameters)}; i++) {
+    for (int i = 0; i < (int)G_N_ELEMENTS(_${name}StrMap); i++) {
         if (g_strcmp0((const gchar *)node->data.scalar.value, ${name}_as_string(i)) == 0) {
             return (${name})i;
         }

{lbkit-0.9.12 → lbkit-0.9.13}/lbkit/component/arg_parser.py

@@ -37,6 +37,8 @@ class ArgParser():
                             help=argparse.SUPPRESS)
         parser.add_argument("--cov", action="store_true",
                             help=argparse.SUPPRESS)
+        parser.add_argument("--asan", action="store_true",
+                            help=argparse.SUPPRESS)
         parser.add_argument("--test", action="store_true",
                             help=argparse.SUPPRESS)
         parser.add_argument(

{lbkit-0.9.12 → lbkit-0.9.13}/lbkit/component/build.py

@@ -100,6 +100,8 @@ class BuildComponent():
         self.base_cmd += f" -pr:b {self.profile_build}"
         if self.options.cov:
             self.base_cmd += f" -o {self.name}/*:gcov=True"
+        if self.options.asan:
+            self.base_cmd += f" -o */*:asan=True"
         if self.options.test:
             self.base_cmd += f" -o {self.name}/*:test=True"
         for pkg_option in self.options.pkg_options:
@@ -278,7 +280,7 @@ class BuildComponent():
         tools.exec(graph_cmd, verbose=True)
         bcp = BuildConanParallel(self.orderfile, self.lockfile, self.options.remote)
         bcp.build()
-        cmd = f"conan create {self.base_cmd} --build='{self.name}/*'"
+        cmd = f"conan create . {self.base_cmd} --build='{self.name}/*'"
         tools.exec(cmd, verbose=True)
 
         graph_cmd = f"conan install . {self.base_cmd} --lockfile={self.lockfile} -f json"

{lbkit-0.9.12 → lbkit-0.9.13}/lbkit/component/template/conanbase.mako

@@ -49,6 +49,7 @@ class LiteBmcConan(ConanFile):
         "shared": [False, True],
 % endif
         "gcov": [False, True],
+        "asan": [False, True],
         "test": [False, True],
 % if len(pkg.get("options", [])) > 0:
     % for op, ctx in pkg["options"].items():
@@ -61,6 +62,7 @@ class LiteBmcConan(ConanFile):
         "shared": True,
 % endif
         "gcov": False,
+        "asan": False,
         "test": False,
 % if len(pkg.get("options", [])) > 0:
     % for op, ctx in pkg["options"].items():
@@ -184,6 +186,10 @@ class LiteBmcConan(ConanFile):
         if self.options.gcov:
             flags.append("-fprofile-arcs")
             flags.append("-ftest-coverage")
+        if self.options.asan:
+            flags.append("-fsanitize=address")
+            flags.append("-fno-omit-frame-pointer")
+            flags.append("-g")
         if self.settings.build_type == "Release" and self.settings.arch == "armv8":
             flags.append("-D_FORTIFY_SOURCE=2")
         return flags
@@ -200,27 +206,27 @@ class LiteBmcConan(ConanFile):
         tc.variables["CMAKE_PROJECT_VERSION"] = self.version
         tc.variables["CMAKE_BUILD_TYPE"] = self.settings.build_type
 % if pkg_type == "static-library":
-        tc.variables["BUILD_SHARED_LIBS] = False
+        tc.variables["BUILD_SHARED_LIBS"] = 0
 % elif pkg_type == "shared-libraries":
-        tc.variables["BUILD_SHARED_LIBS"] = True
+        tc.variables["BUILD_SHARED_LIBS"] = 1
 % elif pkg_type == "library":
         if self.options.shared == False:
-            tc.variables["BUILD_SHARED_LIBS"] = False
+            tc.variables["BUILD_SHARED_LIBS"] = 0
         else:
-            tc.variables["BUILD_SHARED_LIBS"] = True
+            tc.variables["BUILD_SHARED_LIBS"] = 1
 % endif
         if self.options.test == True:
-            tc.variables["BUILD_TEST"] = True
+            tc.variables["BUILD_TEST"] = 1
         else:
-            tc.variables["BUILD_TEST"] = False
+            tc.variables["BUILD_TEST"] = 0
 
 % if len(pkg.get("options", [])) > 0:
     % for op, value in pkg["options"].items():
        % if type(value["default"]) == type(False):
         if self.options.${op}:
-            value = True
+            value = 1
         else:
-            value = False
+            value = 0
         % elif type(value["default"]) == type(""):
         value = str(self.options.${op})
         % elif type(value["default"]) == type(123):
@@ -234,8 +240,10 @@ class LiteBmcConan(ConanFile):
         tc.preprocessor_definitions["LB_${op.upper()}"] = value
     % endfor
 % endif
-        tc.extra_cflags = self._append_default_flags()
-        tc.extra_cxxflags = self._append_default_flags()
+        default_flags = self._append_default_flags()
+        tc.extra_cflags = default_flags
+        tc.extra_cxxflags = default_flags
+        tc.extra_ldflags = default_flags
 
         tc.generate()
 

{lbkit-0.9.12 → lbkit-0.9.13}/lbkit/component/template/deploy.mako

@@ -17,6 +17,7 @@ class DeployConan(ConanFile):
     }
     options = {
         "gcov": [False, True],
+        "asan": [False, True],
         "test": [False, True],
 % if len(pkg.get("options", [])) > 0:
     % for op, ctx in pkg["options"].items():
@@ -29,6 +30,7 @@ class DeployConan(ConanFile):
         "shared": True,
 % endif
         "gcov": False,
+        "asan": False,
         "test": False,
 % if len(pkg.get("options", [])) > 0:
     % for op, ctx in pkg["options"].items():

{lbkit-0.9.12 → lbkit-0.9.13}/lbkit/component/test.py

@@ -62,9 +62,9 @@ class TestComponent():
         cmd = f"lcov --compat-libtool -c -q -d {build_folder} -o {coverage_dir}/cover.info"
         tool.exec(cmd)
         for dir in test_src_folder:
-            cmd = f"lcov --compat-libtool --ignore-errors unused -r {coverage_dir}/cover.info \"{build_folder}/{dir}/*\" -o {coverage_dir}/cover.info"
+            cmd = f"lcov --compat-libtool --ignore-errors unused,inconsistent -r {coverage_dir}/cover.info \"{build_folder}/{dir}/*\" -o {coverage_dir}/cover.info"
             tool.exec(cmd)
-        cmd = f"lcov --compat-libtool --ignore-errors unused -r {coverage_dir}/cover.info \"*/include/*\" -o {coverage_dir}/cover.info"
+        cmd = f"lcov --compat-libtool --ignore-errors unused,inconsistent -r {coverage_dir}/cover.info \"*/include/*\" -o {coverage_dir}/cover.info"
         tool.exec(cmd)
         cmd = f"genhtml -o {coverage_dir}/html --legend {coverage_dir}/cover.info"
         tool.exec(cmd)
@@ -184,6 +184,10 @@ class TestComponent():
         build = BuildComponent(self.build_parser, self.origin_args)
         build.run()
 
+        if hasattr(build.options, 'asan') and build.options.asan:
+            os.environ.setdefault("ASAN_OPTIONS", "halt_on_error=1:detect_leaks=1")
+            log.info("ASAN enabled, ASAN_OPTIONS=" + os.environ["ASAN_OPTIONS"])
+
         self._make_ld_library_path(build.rootfs_dir)
         self._make_dbus_session(build.rootfs_dir)
 

lbkit-0.9.13/lbkit/upgrade.py

@@ -0,0 +1,326 @@
+# Copyright (c) 2021-2024 litebmc.com
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
+"""lbkit 自升级模块"""
+import os
+import subprocess
+import argparse
+import re
+
+from packaging.version import Version as PkgVersion
+
+from lbkit import __version__ as current_version
+from lbkit.log import Logger
+
+log = Logger()
+
+
+def _is_root():
+    return os.geteuid() == 0
+
+
+def _get_installed_deb_version():
+    """获取已安装的 lbkit deb 包版本"""
+    result = subprocess.run(
+        ["dpkg-query", "-W", "-f=${Version}", "lbkit"],
+        capture_output=True, text=True
+    )
+    if result.returncode != 0:
+        return None
+    return result.stdout.strip() or None
+
+
+def _get_installed_rpm_version():
+    """获取已安装的 lbkit rpm 包版本"""
+    result = subprocess.run(
+        ["rpm", "-q", "--queryformat", "%{VERSION}", "lbkit"],
+        capture_output=True, text=True
+    )
+    if result.returncode != 0:
+        return None
+    return result.stdout.strip() or None
+
+
+def _get_apt_candidate_version():
+    """通过 apt-cache 获取 lbkit 的候选升级版本"""
+    is_root = _is_root()
+    sudo = [] if is_root else ["sudo"]
+
+    # apt update
+    log.info("正在更新软件包列表...")
+    subprocess.run(sudo + ["apt", "update", "-qq"],
+                   check=True, capture_output=True)
+
+    result = subprocess.run(
+        ["apt-cache", "policy", "lbkit"],
+        capture_output=True, text=True
+    )
+    if result.returncode != 0:
+        return None
+    for line in result.stdout.splitlines():
+        line = line.strip()
+        if line.startswith("候选：") or line.startswith("Candidate:"):
+            version = line.split("：", 1)[-1].split(": ", 1)[-1].strip()
+            if version:
+                return version
+    return None
+
+
+def _get_dnf_candidate_version():
+    """通过 dnf 获取 lbkit 的候选升级版本"""
+    is_root = _is_root()
+    sudo = [] if is_root else ["sudo"]
+
+    # dnf check-update
+    log.info("正在更新软件包列表...")
+    subprocess.run(sudo + ["dnf", "makecache", "-q"],
+                   check=True, capture_output=True)
+
+    result = subprocess.run(
+        sudo + ["dnf", "list", "available", "lbkit"],
+        capture_output=True, text=True
+    )
+    if result.returncode != 0:
+        return None
+    for line in result.stdout.splitlines():
+        line = line.strip()
+        if line.startswith("lbkit."):
+            parts = line.split()
+            if len(parts) >= 2:
+                # 格式: lbkit.x86_64  0.9.12  repo_name
+                return parts[1]
+    return None
+
+
+def _get_pypi_latest_version():
+    """查询 PyPI（或用户配置的镜像源）上 lbkit 的最新版本"""
+    try:
+        result = subprocess.run(
+            [subprocess.sys.executable, "-m", "pip", "index", "versions", "lbkit"],
+            capture_output=True, text=True, timeout=15
+        )
+        if result.returncode != 0:
+            log.warn(f"查询 PyPI 版本失败:\n{result.stderr}")
+            return None
+        # 输出格式: "lbkit (0.9.12)"
+        match = re.search(r"lbkit\s*\(([^)]+)\)", result.stdout)
+        if match:
+            return match.group(1)
+        return None
+    except Exception as e:
+        log.warn(f"查询 PyPI 版本失败: {e}")
+        return None
+
+
+def _install_deb(version):
+    """通过 apt 安装指定版本的 deb 包"""
+    is_root = _is_root()
+    sudo = [] if is_root else ["sudo"]
+
+    installed = _get_installed_deb_version()
+    if installed == version:
+        log.info(f"deb 包已是目标版本 {version}")
+        return True
+
+    log.info(f"正在安装 deb 包: {installed or '未安装'} → {version}")
+    result = subprocess.run(
+        sudo + ["apt", "install", "-y", "--only-upgrade", f"lbkit={version}"],
+        capture_output=True, text=True
+    )
+    if result.returncode != 0:
+        # 指定版本不存在时回退到安装候选版本
+        log.warn(f"apt 源中未找到版本 {version}，尝试安装候选版本")
+        result = subprocess.run(
+            sudo + ["apt", "install", "-y", "--only-upgrade", "lbkit"],
+            capture_output=True, text=True
+        )
+        if result.returncode != 0:
+            log.error(f"deb 包安装失败:\n{result.stderr}")
+            return False
+
+    new_version = _get_installed_deb_version()
+    if new_version:
+        log.success(f"deb 包已安装: {new_version}")
+    return True
+
+
+def _install_rpm(version):
+    """通过 dnf 安装指定版本的 rpm 包"""
+    is_root = _is_root()
+    sudo = [] if is_root else ["sudo"]
+
+    installed = _get_installed_rpm_version()
+    if installed == version:
+        log.info(f"rpm 包已是目标版本 {version}")
+        return True
+
+    log.info(f"正在安装 rpm 包: {installed or '未安装'} → {version}")
+    result = subprocess.run(
+        sudo + ["dnf", "install", "-y", f"lbkit-{version}"],
+        capture_output=True, text=True
+    )
+    if result.returncode != 0:
+        log.error(f"rpm 包安装失败:\n{result.stderr}")
+        return False
+
+    new_version = _get_installed_rpm_version()
+    if new_version:
+        log.success(f"rpm 包已安装: {new_version}")
+    return True
+
+
+def _is_deb_system():
+    """检测是否为 Debian/Ubuntu 系列系统"""
+    return os.path.isfile("/etc/debian_version")
+
+
+def _is_rpm_system():
+    """检测是否为 RHEL/Rocky Linux/CentOS 系列系统"""
+    if os.path.isfile("/etc/os-release"):
+        with open("/etc/os-release", "r") as fp:
+            for line in fp:
+                if line.strip().startswith("ID="):
+                    distro_id = line.strip().split("=", 1)[1].strip('"')
+                    if distro_id in ("rocky", "centos", "almalinux", "rhel", "fedora"):
+                        return True
+                if line.strip().startswith("ID_LIKE="):
+                    id_like = line.strip().split("=", 1)[1].strip('"')
+                    if "rhel" in id_like:
+                        return True
+    return os.path.isfile("/etc/redhat-release")
+
+
+def _pip_install(version):
+    """安装指定版本的 PyPI 包"""
+    is_root = _is_root()
+    log.info(f"正在安装 PyPI 包 lbkit=={version}...")
+
+    cmd = [subprocess.sys.executable, "-m", "pip", "install",
+           f"lbkit=={version}", "--break-system-packages"]
+    if is_root:
+        cmd.append("--break-system-packages")
+    else:
+        cmd.append("--user")
+
+    result = subprocess.run(cmd, capture_output=True, text=True)
+    if result.returncode != 0:
+        log.error(f"PyPI 包安装失败:\n{result.stderr}")
+        return False
+    log.success(f"PyPI 包 lbkit=={version} 安装完成")
+    return True
+
+
+def _check_path():
+    """检查 ~/.local/bin 是否在 PATH 中，不在则提示用户"""
+    local_bin = os.path.expanduser("~/.local/bin")
+    path_env = os.environ.get("PATH", "")
+    path_dirs = path_env.split(":")
+
+    if local_bin in path_dirs:
+        return
+
+    log.warn(f"{local_bin} 不在 PATH 环境变量中")
+    log.warn("lbk 命令可能无法直接使用")
+
+    from lbkit.cli import ask_user_yes_no
+    if not ask_user_yes_no(f"是否将 {local_bin} 添加到 ~/.bashrc？"):
+        log.info(f"请手动执行: echo 'export PATH=\"{local_bin}:$PATH\"' >> ~/.bashrc")
+        return
+
+    bashrc = os.path.expanduser("~/.bashrc")
+    export_line = f'export PATH="{local_bin}:$PATH"\n'
+    already_in_bashrc = False
+    if os.path.isfile(bashrc):
+        with open(bashrc, "r") as f:
+            already_in_bashrc = local_bin in f.read()
+
+    if already_in_bashrc:
+        log.info(f"{local_bin} 已在 ~/.bashrc 中，可能是当前 shell 未加载")
+        return
+
+    with open(bashrc, "a") as f:
+        f.write("\n# Added by lbkit upgrade\n")
+        f.write(export_line)
+    log.success(f"已将 {local_bin} 添加到 ~/.bashrc")
+    log.info("请执行 source ~/.bashrc 或重新打开终端使配置生效")
+
+
+def upgrade(*args):
+    """执行 lbkit 自升级"""
+    parser = argparse.ArgumentParser(
+        description="自升级lbkit，查询系统包管理器和PyPI可用版本后安装最新版",
+        prog="lbkit upgrade"
+    )
+    parser.parse_args(*args)
+
+    log.info(f"当前版本: {current_version}")
+
+    # 检测系统类型
+    is_deb = _is_deb_system()
+    is_rpm = _is_rpm_system()
+
+    if not is_deb and not is_rpm:
+        log.error("当前系统不是 Debian/Ubuntu 或 RHEL/Rocky Linux 系列，暂不支持自动升级")
+        return 1
+
+    # 1. 查询系统包管理器候选版本
+    sys_ver = None
+    if is_deb:
+        sys_ver = _get_apt_candidate_version()
+        if sys_ver:
+            log.info(f"apt 可用版本: {sys_ver}")
+        else:
+            log.warn("apt 源中未找到 lbkit 包")
+    elif is_rpm:
+        sys_ver = _get_dnf_candidate_version()
+        if sys_ver:
+            log.info(f"dnf 可用版本: {sys_ver}")
+        else:
+            log.warn("dnf 源中未找到 lbkit 包")
+
+    # 2. 查询 PyPI 最新版本
+    pypi_ver = _get_pypi_latest_version()
+    if pypi_ver:
+        log.info(f"PyPI 最新版本: {pypi_ver}")
+    else:
+        log.warn("无法查询 PyPI 版本")
+
+    # 3. 取最大版本号
+    versions = {}
+    if sys_ver:
+        versions["system"] = sys_ver
+    if pypi_ver:
+        versions["pypi"] = pypi_ver
+
+    if not versions:
+        log.error("未找到任何可安装的版本")
+        return 1
+
+    target = max(versions.values(), key=PkgVersion)
+    log.info(f"目标版本: {target}")
+
+    if PkgVersion(target) <= PkgVersion(current_version):
+        log.info(f"当前已是最新版本 {current_version}")
+        return 0
+
+    # 4. 安装系统包（如果系统包管理器有可用版本）
+    if sys_ver:
+        if is_deb:
+            if not _install_deb(target):
+                return 1
+        elif is_rpm:
+            if not _install_rpm(target):
+                return 1
+
+    # 5. 安装 PyPI 包
+    if not _pip_install(target):
+        return 1
+
+    # 6. 检查 PATH
+    _check_path()
+
+    log.success(f"升级完成: {current_version} → {target}")
+    return 0

{lbkit-0.9.12 → lbkit-0.9.13/lbkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.9.12
+Version: 0.9.13
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

{lbkit-0.9.12 → lbkit-0.9.13}/lbkit.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ lbkit/lbkit.py
 lbkit/log.py
 lbkit/misc.py
 lbkit/tools.py
+lbkit/upgrade.py
 lbkit.egg-info/PKG-INFO
 lbkit.egg-info/SOURCES.txt
 lbkit.egg-info/dependency_links.txt

lbkit-0.9.12/lbkit/__commit__.py

@@ -1 +0,0 @@
-__commit__ = 'e5ea324'

lbkit-0.9.12/lbkit/__init__.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.9.12'