removed more debug stuff

RCMast3r · Dec 28, 2023 · 377c240 · 377c240
1 parent b155ef2
commit 377c240
Showing 1 changed file with 26 additions and 27 deletions.
diff --git a/generator/pio_lib_gen.py b/generator/pio_lib_gen.py
@@ -12,7 +12,7 @@
 try:
     import docker
 except ImportError:
-    env.Execute("$PYTHONEXE -m pip install docker")        
+    env.Execute("$PYTHONEXE -m pip install docker")
     import docker
 import SCons.Action
 
@@ -22,52 +22,51 @@
 # based on https://github.com/nanopb/nanopb/blob/master/generator/platformio_generator.py
 
 
-
 python_exe = env.subst("$PYTHONEXE")
 project_dir = env.subst("$PROJECT_DIR")
 build_dir = env.subst("$BUILD_DIR")
 
-generated_src_dir = os.path.join(build_dir, 'dbcppp', 'generated-src')
-generated_build_dir = os.path.join(build_dir, 'dbcppp', 'generated-build')
+generated_src_dir = os.path.join(build_dir, "dbcppp", "generated-src")
+generated_build_dir = os.path.join(build_dir, "dbcppp", "generated-build")
 
-user_dbc_file =  env.subst(env.GetProjectOption("user_dbc", ""))
-drvname=  env.subst(env.GetProjectOption("drvname", ""))
+user_dbc_file = env.subst(env.GetProjectOption("user_dbc", ""))
+drvname = env.subst(env.GetProjectOption("drvname", ""))
 dbc_file = fs.match_src_files(project_dir, user_dbc_file)
 rel_dir_dbc_path = os.path.dirname(dbc_file[0])
 
 dbc_file_name = os.path.basename(dbc_file[0])
 
-import tarfile
-
-def copy_to(src, dst):
-    name, dst = dst.split(':')
-    container = client.containers.get(name)
-
-    os.chdir(os.path.dirname(src))
-    srcname = os.path.basename(src)
-    tar = tarfile.open(src + '.tar', mode='w')
-    try:
-        tar.add(srcname)
-    finally:
-        tar.close()
-
-    data = open(src + '.tar', 'rb').read()
-    container.put_archive(os.path.dirname(dst), data)
-
-
 if not len(dbc_file):
     print("[dbcpio] ERROR: No file matched pattern:")
     print(f"user_dbcs: {user_dbc_file}")
     exit(1)
 
 
-abs_path_to_dbc = project_dir+'/'+rel_dir_dbc_path
+abs_path_to_dbc = project_dir + "/" + rel_dir_dbc_path
 client = docker.from_env()
 
 if not os.path.isdir(generated_src_dir):
     os.makedirs(generated_src_dir)
-client.containers.run('ghcr.io/rcmast3r/ccoderdbc:main', './build/coderdbc -rw -dbc /data/hytech.dbc -out /out -drvname '+drvname,group_add=["1000"], user=1000,volumes=[abs_path_to_dbc+":/data", generated_src_dir+":/out"], working_dir='/app')
 
-env.Append(CPPPATH=[generated_src_dir, generated_src_dir+'/inc', generated_src_dir+'/lib', generated_src_dir+'/conf'])
+client.containers.run(
+    "ghcr.io/rcmast3r/ccoderdbc:main",
+    "./build/coderdbc -rw -dbc /data/"
+    + dbc_file_name
+    + " -out /out -drvname "
+    + drvname,
+    group_add=["1000"],
+    user=1000,
+    volumes=[abs_path_to_dbc + ":/data", generated_src_dir + ":/out"],
+    working_dir="/app",
+)
+
+env.Append(
+    CPPPATH=[
+        generated_src_dir,
+        generated_src_dir + "/inc",
+        generated_src_dir + "/lib",
+        generated_src_dir + "/conf",
+    ]
+)
 
 env.BuildSources(generated_build_dir, generated_src_dir)