lbkit 0.6.2__tar.gz → 0.6.4__tar.gz

{lbkit-0.6.2/lbkit.egg-info → lbkit-0.6.4}/PKG-INFO

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

lbkit-0.6.4/lbkit/__init__.py

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

{lbkit-0.6.2 → lbkit-0.6.4}/lbkit/codegen/codegen.py

@@ -30,8 +30,7 @@ class CodeGen(object):
         os.makedirs(os.path.join(directory, "public"), exist_ok=True)
         os.makedirs(os.path.join(directory, "server"), exist_ok=True)
         os.makedirs(os.path.join(directory, "client"), exist_ok=True)
-        lookup = TemplateLookup(directories=os.path.join(lb_cwd, "template"))
-        interface = IdfInterface(lookup, idf_file)
+        interface = self.get_interface(idf_file)
         out_file = os.path.join(directory, "public", interface.name + ".xml")
         interface.render_dbus_xml("interface.introspect.xml.mako", out_file, self.codegen_version)
         for code_type in ["server", "client", "public"]:
@@ -54,6 +53,9 @@ class CodeGen(object):
         with open(odf_file, "w", encoding="utf-8") as fp:
             json.dump(odf_data, fp, sort_keys=False, indent=4)
 
+    def get_interface(self, idf_file):
+        lookup = TemplateLookup(directories=os.path.join(lb_cwd, "template"))
+        return IdfInterface(lookup, idf_file)
 
     def run(self):
         """

{lbkit-0.6.2 → lbkit-0.6.4}/lbkit/codegen/idf_interface.py

@@ -1,8 +1,8 @@
-import yaml
 import os
 import re
 import copy
 import hashlib
+from functools import cached_property
 from lbkit.log import Logger
 from lbkit.codegen.renderer import Renderer
 from lbkit.codegen.ctype_defination import CTYPE_OBJS, RefObjArrayValidator, RefObjValidator
@@ -113,20 +113,34 @@ def ctype_to_variant_signature(intf: IdfInterfaceBase, ctype: str):
     match = re.match(f"^(struct|enum|dict)\[(.*)\]$", ctype)
 
     match_intf, match_ctype = get_intfname_and_ctype(match.group(2))
+    if match_intf != "self":
+        intf = intf.dependency_idf_interface[match_intf]
     if match.group(1) == "struct":
-        if match_intf == "self":
-            stru = intf.structures.get(match_ctype)
-            if stru is None:
-                raise IDFException(f"Unknown structure {match_ctype} get")
-            return sig_prefix + stru.signature
+        stru = intf.structures.get(match_ctype)
+        if stru is None:
+            raise IDFException(f"Unknown structure {match_ctype} get")
+        return sig_prefix + stru.signature
     elif match.group(1) == "enum":
         return sig_prefix + "s"
     else:
-        if match_intf == "self":
-            dictionary = intf.dictionaries.get(match_ctype)
-            if dictionary is None:
-                raise IDFException(f"Unknown structure {match_ctype} get")
-            return sig_prefix + dictionary.signature
+        dictionary = intf.dictionaries.get(match_ctype)
+        if dictionary is None:
+            raise IDFException(f"Unknown structure {match_ctype} get")
+        return sig_prefix + dictionary.signature
+
+def ctype_to_dependency_interface(ctype: str):
+    match = re.match(f"^array\[(.*)\]$", ctype)
+    if match is not None:
+        ctype = match.group(1)
+    match = re.match(f"^({CTYPE_REGEX})$", ctype)
+    if match is not None:
+        return []
+    match = re.match(f"^(struct|enum|dict)\[(.*)\]$", ctype)
+
+    match_intf, _ = get_intfname_and_ctype(match.group(2))
+    if match_intf == "self":
+        return []
+    return [match_intf]
 
 
 class IdfCtypeRender():
@@ -139,7 +153,7 @@ class IdfCtypeRender():
 
     def __init__(self):
         # 非基础类型
-        match = re.match(f"^(set\[enum\[(.*)\]\])$", self.ctype)
+        match = re.match(f"^set\[enum\[(.*)\]\]$", self.ctype)
         # 如果set类型由转换成数组，当前不具备对set类型独立处理能力
         if match:
             self.ctype = f"array[enum[{match.group(1)}]]"
@@ -217,19 +231,23 @@ class IdfCtypeRender():
             is_array = True
             ctype = match.group(1)
         match = re.match(f"^(struct|enum|dict)\[(.*)\]$", ctype)
-        _, stru_name = get_intfname_and_ctype(match.group(2))
+        intf_name, stru_name = get_intfname_and_ctype(match.group(2))
+        if intf_name == "self":
+            intf = self.intf
+        else:
+            intf = self.intf.dependency_idf_interface[intf_name]
         if match.group(1) == "struct":
-            stru = self.intf.structures.get(stru_name)
+            stru = intf.structures.get(stru_name)
             if stru is None:
                 raise IDFException(f"Structurer {stru_name} is not found, generate odf for {self.name} failed")
             schema = stru.odf_schema()
         elif match.group(1) == "enum":
-            enum = self.intf.enumerations.get(stru_name)
+            enum = intf.enumerations.get(stru_name)
             if enum is None:
                 raise IDFException(f"Enumerate {stru_name} is not found, generate odf for {self.name} failed")
             schema = enum.odf_schema()
         else:
-            dict_cls = self.intf.dictionaries.get(stru_name)
+            dict_cls = intf.dictionaries.get(stru_name)
             if dict_cls is None:
                 raise IDFException(f"Dictionary {stru_name} is not found, generate odf for {self.name} failed")
             schema = dict_cls.odf_schema()
@@ -730,6 +748,10 @@ class IdfProperty(IdfCtypeRender):
     def signature(self):
         return ctype_to_variant_signature(self.intf, self.ctype)
 
+    @cached_property
+    def dependency_interface(self):
+        return ctype_to_dependency_interface(self.ctype)
+
 
 class IdfParameter(IdfCtypeRender):
     def __init__(self, intf: IdfInterfaceBase, para_data):
@@ -744,6 +766,11 @@ class IdfParameter(IdfCtypeRender):
     def signature(self):
         return ctype_to_variant_signature(self.intf, self.ctype)
 
+    @cached_property
+    def dependency_interface(self):
+        return ctype_to_dependency_interface(self.ctype)
+
+
 class IdfParameters():
     def __init__(self, intf: IdfInterfaceBase, para_data):
         self.intf = intf
@@ -763,6 +790,14 @@ class IdfParameters():
             sig += para.signature
         return sig
 
+    @cached_property
+    def dependency_interface(self):
+        deps = []
+        for para in self.parameters:
+            deps.extend(para.dependency_interface)
+        return list(set(deps))
+
+
 class IdfBase():
     def __init__(self, intf: IdfInterfaceBase, data):
         self.intf = intf
@@ -795,6 +830,13 @@ class IdfMethod(IdfBase):
     def out_signature(self):
         return "(" + self.returns.signature + ")"
 
+    @cached_property
+    def dependency_interface(self):
+        deps = []
+        deps.extend(self.parameters.dependency_interface)
+        deps.extend(self.returns.dependency_interface)
+        return list(set(deps))
+
 class IdfSignal(IdfBase):
     def __init__(self, intf: IdfInterfaceBase, signal_data):
         super().__init__(intf, signal_data)
@@ -804,6 +846,10 @@ class IdfSignal(IdfBase):
     def signature(self):
         return "(" + self.properties.signature + ")"
 
+    @cached_property
+    def dependency_interface(self):
+        return self.properties.dependency_interface
+
 class IdfStructure(IdfBase):
     def __init__(self, intf: IdfInterfaceBase, stru_data, propety_key = "values"):
         super().__init__(intf, stru_data)
@@ -813,6 +859,10 @@ class IdfStructure(IdfBase):
     def signature(self):
         return "(" + self.values.signature+ ")"
 
+    @cached_property
+    def dependency_interface(self):
+        return self.values.dependency_interface
+
     def odf_schema(self):
         schema = {}
         for prop in self.values.parameters:
@@ -889,6 +939,10 @@ class IdfDictionary():
         else:
             return "a{" + self.key_obj.signature + self.values.signature + "}"
 
+    @cached_property
+    def dependency_interface(self):
+        return self.values.dependency_interface
+
     @property
     def key_is_string(self):
         return self.key_type in ["string", "signature", "object_path"]
@@ -967,13 +1021,51 @@ class IdfInterface(IdfInterfaceBase):
         self.alias = None
         self.load_elements()
 
-    @property
+    @cached_property
+    def dependency_idf_interface(self):
+        deps: dict[str, IdfInterface] = {}
+        intfs = self.dependency_interface
+        for intf in intfs:
+            intf_path = intf.replace(".", "/") + ".yaml"
+            cwd = os.getcwd()
+            realpath = None
+            while cwd != "/":
+                tmp_path = os.path.join(cwd, intf_path)
+                if os.path.isfile(tmp_path):
+                    realpath = tmp_path
+                    break
+                cwd = os.path.dirname(cwd)
+
+            if not realpath:
+                raise FileNotFoundError(f"Dependency interface {intf} not exist")
+            log.debug(f"Found dependency interface: {realpath}")
+            deps[intf] = (IdfInterface(self.lookup, realpath))
+        return deps
+
+    @cached_property
     def signature(self):
         sig = ""
         for prop in self.properties:
             sig += prop.signature
         return "(" + sig + ")"
 
+    @cached_property
+    def dependency_interface(self):
+        deps = []
+        for prop in self.properties:
+            deps.extend(prop.dependency_interface)
+        for _, dicti in self.dictionaries.items():
+            deps.extend(dicti.dependency_interface)
+        for _, strct in self.structures.items():
+            deps.extend(strct.dependency_interface)
+        for action in self.plugin.actions:
+            deps.extend(action.dependency_interface)
+        for signal in self.signals:
+            deps.extend(signal.dependency_interface)
+        for method in self.methods:
+            deps.extend(method.dependency_interface)
+        return list(set(deps))
+
     @property
     def odf_schema(self):
         schema = {}
@@ -1092,12 +1184,12 @@ class IdfInterface(IdfInterfaceBase):
             log.debug(f"{signal.name} signature: " + signal.signature)
         for method in self.methods:
             log.debug(f"{method.name} in signature: " + method.in_signature + ", out signature: " + method.out_signature)
-        for name, stru in self.structures.items():
-            log.debug(f"{name} signature: " + stru.signature)
-        for name, enum in self.enumerations.items():
-            log.debug(f"{name} signature: " + enum.signature)
-        for name, dictionary in self.dictionaries.items():
-            log.debug(f"{name} signature: " + dictionary.signature)
+        # for name, stru in self.structures.items():
+        #     log.debug(f"{name} signature: " + stru.signature)
+        # for name, enum in self.enumerations.items():
+        #     log.debug(f"{name} signature: " + enum.signature)
+        # for name, dictionary in self.dictionaries.items():
+        #     log.debug(f"{name} signature: " + dictionary.signature)
         # 接口本身也是一个结构体
         intf_stru = IdfStructure(self, idf, propety_key="properties")
         self.structures[self.alias] = intf_stru

{lbkit-0.6.2 → lbkit-0.6.4}/lbkit/codegen/template/client.c.mako

@@ -1,4 +1,7 @@
 #include "lb_base.h"
+% for dep_intf in intf.dependency_interface:
+#include "public/${dep_intf}.h"
+% endfor
 #include "${intf.name}.h"
 
 <% class_name = intf.alias + "_Cli"

{lbkit-0.6.2 → lbkit-0.6.4}/lbkit/codegen/template/public.c.mako

@@ -1,4 +1,7 @@
 #include "lb_base.h"
+% for dep_intf in intf.dependency_interface:
+#include "public/${dep_intf}.h"
+% endfor
 #include "${intf.name}.h"
 
 <% class_name = intf.alias %>\

{lbkit-0.6.2 → lbkit-0.6.4}/lbkit/codegen/template/server.c.mako

@@ -1,5 +1,8 @@
 <% from lbkit.codegen.ctype_defination import StringValidator %>\
 #include "lb_base.h"
+% for dep_intf in intf.dependency_interface:
+#include "public/${dep_intf}.h"
+% endfor
 #include "${intf.name}.h"
 
 <%

{lbkit-0.6.2 → lbkit-0.6.4}/lbkit/component/build.py

@@ -71,7 +71,10 @@ class BuildComponent():
         self.pkg = None
         self.base_cmd = ""
         self.gen_conaninfo()
-        self.base_cmd += f" --user {self.user} --channel {self.channel}"
+        # 此场景发布的包名不带@user/channel
+        if self.user != "litebmc" or self.channel != "release":
+            self.base_cmd += f" --user {self.user} --channel {self.channel}"
+
         self.base_cmd += f" -pr {self.profile} -s build_type={self.build_type} -r " + self.options.remote
         self.base_cmd += f" -pr:b {self.profile_build}"
         if self.options.cov:
@@ -126,8 +129,9 @@ class BuildComponent():
         self.name = pkg.get("name")
         self.version = pkg.get("version")
 
-        self.package = self.name + "/" + self.version + \
-            "@" + self.user + "/" + self.channel
+        self.package = self.name + "/" + self.version
+        if self.user != "litebmc" or self.channel != "release":
+            self.package += "@" + self.user + "/" + self.channel
         # 准备部署依赖
         requires = pkg.get("requires")
         deps = []
@@ -190,8 +194,12 @@ class BuildComponent():
     def build(self):
         log.info(os.getcwd())
 
-        export_cmd = f"conan export . --user={self.user} --channel={self.channel}"
+        export_cmd = "conan export . "
+        if self.user != "litebmc" or self.channel != "release":
+            export_cmd += f"--user={self.user} --channel={self.channel}"
         tools.run(export_cmd, capture_output=False)
+        # import sys
+        # sys.exit(-1)
 
         lockfile = os.path.join(cwd, ".temp", "conan.lock")
         graphfile = os.path.join(cwd, ".temp", "graph.info")

{lbkit-0.6.2 → lbkit-0.6.4}/lbkit/component/template/conanbase.mako

@@ -28,8 +28,11 @@ libs = pkg.get("package_info", {}).get("libs", [])
 class LiteBmcConan(ConanFile):
     name = "${pkg_name}"
     version = "${pkg["version"]}"
+% if pkg["user"] != "litebmc" or pkg["channel"] != "release":
+## @litebmc/release则生成的包名不带@user/channel
     user = "${pkg["user"]}"
     channel = "${pkg["channel"]}"
+% endif
     settings = "os", "arch", "compiler", "build_type"
     description = "${pkg["description"]}"
     url = "${pkg["url"]}"
@@ -78,16 +81,12 @@ class LiteBmcConan(ConanFile):
             return
 
         scm_url = None
-        remotes = git.run("remote -v")
-        checked_name = []
-        for r in remotes.splitlines():
-            name, url = r.split(maxsplit=1)
-            if name in checked_name:
-                continue
-            checked_name.append(name)
-            url, scm_commit = git.get_url_and_commit(remote=name)
-            if url.startswith("https://"):
-                scm_url = url
+        scm_commit = git.get_commit()
+        branches = git.run("branch -r --contains {}".format(scm_commit))
+        remotes = git.run("remote")
+        for remote in remotes.splitlines():
+            if "{}/".format(remote) in branches:
+                scm_url = git.get_remote_url(remote)
                 break
         if not scm_url:
             files.update_conandata(self, {"sources": {"commit": None, "url": None, "pwd": os.getcwd()}})

{lbkit-0.6.2 → lbkit-0.6.4/lbkit.egg-info}/PKG-INFO

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

lbkit-0.6.2/lbkit/__init__.py

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