Add _ prefix to logger
This commit is contained in:
parent
9572c6a3df
commit
97f9f0ddba
6 changed files with 155 additions and 102 deletions
|
|
@ -7,7 +7,7 @@ from cutekit.ninja import Writer
|
|||
from cutekit.context import ComponentInstance, Context, contextFor
|
||||
from cutekit import shell, rules
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def gen(out: TextIO, context: Context):
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ from cutekit.context import contextFor
|
|||
|
||||
Callback = Callable[[Args], None]
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class Cmd:
|
||||
|
|
@ -247,11 +247,11 @@ def initCmd(args: Args):
|
|||
template = args.consumeArg()
|
||||
name = args.consumeArg()
|
||||
|
||||
logger.info("Fetching registry...")
|
||||
_logger.info("Fetching registry...")
|
||||
r = requests.get(f"https://raw.githubusercontent.com/{repo}/main/registry.json")
|
||||
|
||||
if r.status_code != 200:
|
||||
logger.error("Failed to fetch registry")
|
||||
_logger.error("Failed to fetch registry")
|
||||
exit(1)
|
||||
|
||||
registry = r.json()
|
||||
|
|
@ -272,7 +272,7 @@ def initCmd(args: Args):
|
|||
raise LookupError(f"Couldn't find a template named {template}")
|
||||
|
||||
if not name:
|
||||
logger.info(f"No name was provided, defaulting to {template}")
|
||||
_logger.info(f"No name was provided, defaulting to {template}")
|
||||
name = template
|
||||
|
||||
if os.path.exists(name):
|
||||
|
|
|
|||
|
|
@ -4,10 +4,18 @@ from pathlib import Path
|
|||
import os
|
||||
import logging
|
||||
|
||||
from cutekit.model import ProjectManifest, TargetManifest, ComponentManifest, Props, Type, Tool, Tools
|
||||
from cutekit.model import (
|
||||
ProjectManifest,
|
||||
TargetManifest,
|
||||
ComponentManifest,
|
||||
Props,
|
||||
Type,
|
||||
Tool,
|
||||
Tools,
|
||||
)
|
||||
from cutekit import const, shell, jexpr, utils, rules, mixins, project
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class IContext(Protocol):
|
||||
|
|
@ -27,13 +35,14 @@ class ComponentInstance:
|
|||
context: IContext
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
enabled: bool,
|
||||
disableReason: str,
|
||||
manifest: ComponentManifest,
|
||||
sources: list[str],
|
||||
res: list[str],
|
||||
resolved: list[str]):
|
||||
self,
|
||||
enabled: bool,
|
||||
disableReason: str,
|
||||
manifest: ComponentManifest,
|
||||
sources: list[str],
|
||||
res: list[str],
|
||||
resolved: list[str],
|
||||
):
|
||||
self.enabled = enabled
|
||||
self.disableReason = disableReason
|
||||
self.manifest = manifest
|
||||
|
|
@ -55,23 +64,34 @@ class ComponentInstance:
|
|||
|
||||
def objsfiles(self) -> list[tuple[str, str]]:
|
||||
def toOFile(s: str) -> str:
|
||||
return os.path.join(self.objdir(), s.replace(os.path.join(self.manifest.dirname(), ''), '') + ".o")
|
||||
return os.path.join(
|
||||
self.objdir(),
|
||||
s.replace(os.path.join(self.manifest.dirname(), ""), "") + ".o",
|
||||
)
|
||||
|
||||
return list(map(lambda s: (s, toOFile(s)), self.sources))
|
||||
|
||||
def resfiles(self) -> list[tuple[str, str, str]]:
|
||||
def toAssetFile(s: str) -> str:
|
||||
return os.path.join(self.resdir(), s.replace(os.path.join(self.manifest.dirname(), 'res/'), ''))
|
||||
return os.path.join(
|
||||
self.resdir(),
|
||||
s.replace(os.path.join(self.manifest.dirname(), "res/"), ""),
|
||||
)
|
||||
|
||||
def toAssetId(s: str) -> str:
|
||||
return s.replace(os.path.join(self.manifest.dirname(), 'res/'), '')
|
||||
return s.replace(os.path.join(self.manifest.dirname(), "res/"), "")
|
||||
|
||||
return list(map(lambda s: (s, toAssetFile(s), toAssetId(s)), self.res))
|
||||
|
||||
def outfile(self) -> str:
|
||||
if self.isLib():
|
||||
return os.path.join(self.context.builddir(), self.manifest.id, f"lib/{self.manifest.id}.a")
|
||||
return os.path.join(
|
||||
self.context.builddir(), self.manifest.id, f"lib/{self.manifest.id}.a"
|
||||
)
|
||||
else:
|
||||
return os.path.join(self.context.builddir(), self.manifest.id, f"bin/{self.manifest.id}.out")
|
||||
return os.path.join(
|
||||
self.context.builddir(), self.manifest.id, f"bin/{self.manifest.id}.out"
|
||||
)
|
||||
|
||||
def cinclude(self) -> str:
|
||||
if "cpp-root-include" in self.manifest.props:
|
||||
|
|
@ -90,7 +110,9 @@ class Context(IContext):
|
|||
def enabledInstances(self) -> Iterable[ComponentInstance]:
|
||||
return filter(lambda x: x.enabled, self.instances)
|
||||
|
||||
def __init__(self, target: TargetManifest, instances: list[ComponentInstance], tools: Tools):
|
||||
def __init__(
|
||||
self, target: TargetManifest, instances: list[ComponentInstance], tools: Tools
|
||||
):
|
||||
self.target = target
|
||||
self.instances = instances
|
||||
self.tools = tools
|
||||
|
|
@ -102,15 +124,20 @@ class Context(IContext):
|
|||
return result[0]
|
||||
|
||||
def cincls(self) -> list[str]:
|
||||
includes = list(filter(lambda x: x != "", map(
|
||||
lambda x: x.cinclude(), self.enabledInstances())))
|
||||
includes = list(
|
||||
filter(
|
||||
lambda x: x != "", map(lambda x: x.cinclude(), self.enabledInstances())
|
||||
)
|
||||
)
|
||||
return utils.uniq(includes)
|
||||
|
||||
def cdefs(self) -> list[str]:
|
||||
return self.target.cdefs()
|
||||
|
||||
def hashid(self) -> str:
|
||||
return utils.hash((self.target.props, [self.tools[t].toJson() for t in self.tools]))[0:8]
|
||||
return utils.hash(
|
||||
(self.target.props, [self.tools[t].toJson() for t in self.tools])
|
||||
)[0:8]
|
||||
|
||||
def builddir(self) -> str:
|
||||
return os.path.join(const.BUILD_DIR, f"{self.target.id}-{self.hashid()[:8]}")
|
||||
|
|
@ -123,8 +150,10 @@ def loadAllTargets() -> list[TargetManifest]:
|
|||
|
||||
pj = loadProject(projectRoot)
|
||||
paths = list(
|
||||
map(lambda e: os.path.join(const.EXTERN_DIR,
|
||||
e, const.TARGETS_DIR), pj.extern.keys())
|
||||
map(
|
||||
lambda e: os.path.join(const.EXTERN_DIR, e, const.TARGETS_DIR),
|
||||
pj.extern.keys(),
|
||||
)
|
||||
) + [const.TARGETS_DIR]
|
||||
|
||||
ret = []
|
||||
|
|
@ -151,47 +180,50 @@ def loadAllComponents() -> list[ComponentManifest]:
|
|||
files = shell.find(const.SRC_DIR, ["manifest.json"])
|
||||
files += shell.find(const.EXTERN_DIR, ["manifest.json"])
|
||||
|
||||
return list(
|
||||
map(
|
||||
lambda path: ComponentManifest(jexpr.evalRead(path), path),
|
||||
files))
|
||||
return list(map(lambda path: ComponentManifest(jexpr.evalRead(path), path), files))
|
||||
|
||||
|
||||
def filterDisabled(components: list[ComponentManifest], target: TargetManifest) -> tuple[list[ComponentManifest], list[ComponentManifest]]:
|
||||
return list(filter(lambda c: c.isEnabled(target)[0], components)), \
|
||||
list(filter(lambda c: not c.isEnabled(target)[0], components))
|
||||
def filterDisabled(
|
||||
components: list[ComponentManifest], target: TargetManifest
|
||||
) -> tuple[list[ComponentManifest], list[ComponentManifest]]:
|
||||
return list(filter(lambda c: c.isEnabled(target)[0], components)), list(
|
||||
filter(lambda c: not c.isEnabled(target)[0], components)
|
||||
)
|
||||
|
||||
|
||||
def providerFor(what: str, components: list[ComponentManifest]) -> tuple[Optional[str], str]:
|
||||
result: list[ComponentManifest] = list(
|
||||
filter(lambda c: c.id == what, components))
|
||||
def providerFor(
|
||||
what: str, components: list[ComponentManifest]
|
||||
) -> tuple[Optional[str], str]:
|
||||
result: list[ComponentManifest] = list(filter(lambda c: c.id == what, components))
|
||||
|
||||
if len(result) == 0:
|
||||
# Try to find a provider
|
||||
result = list(filter(lambda x: (what in x.provides), components))
|
||||
|
||||
if len(result) == 0:
|
||||
logger.error(f"No provider for '{what}'")
|
||||
_logger.error(f"No provider for '{what}'")
|
||||
return (None, f"No provider for '{what}'")
|
||||
|
||||
if len(result) > 1:
|
||||
ids = list(map(lambda x: x.id, result))
|
||||
logger.error(f"Multiple providers for '{what}': {result}")
|
||||
_logger.error(f"Multiple providers for '{what}': {result}")
|
||||
return (None, f"Multiple providers for '{what}': {','.join(ids)}")
|
||||
|
||||
return (result[0].id, "")
|
||||
|
||||
|
||||
def resolveDeps(componentSpec: str, components: list[ComponentManifest], target: TargetManifest) -> tuple[bool, str, list[str]]:
|
||||
def resolveDeps(
|
||||
componentSpec: str, components: list[ComponentManifest], target: TargetManifest
|
||||
) -> tuple[bool, str, list[str]]:
|
||||
mapping = dict(map(lambda c: (c.id, c), components))
|
||||
|
||||
def resolveInner(what: str, stack: list[str] = []) -> tuple[bool, str, list[str]]:
|
||||
def resolveInner(what: str, stack: list[str] = []) -> tuple[bool, str, list[str]]:
|
||||
result: list[str] = []
|
||||
what = target.route(what)
|
||||
resolved, unresolvedReason = providerFor(what, components)
|
||||
|
||||
if resolved is None:
|
||||
return False, unresolvedReason, []
|
||||
return False, unresolvedReason, []
|
||||
|
||||
if resolved in stack:
|
||||
raise RuntimeError(f"Dependency loop: {stack} -> {resolved}")
|
||||
|
|
@ -199,12 +231,12 @@ def resolveDeps(componentSpec: str, components: list[ComponentManifest], target:
|
|||
stack.append(resolved)
|
||||
|
||||
for req in mapping[resolved].requires:
|
||||
keep, unresolvedReason, reqs = resolveInner(req, stack)
|
||||
keep, unresolvedReason, reqs = resolveInner(req, stack)
|
||||
|
||||
if not keep:
|
||||
stack.pop()
|
||||
logger.error(f"Dependency '{req}' not met for '{resolved}'")
|
||||
return False, unresolvedReason, []
|
||||
_logger.error(f"Dependency '{req}' not met for '{resolved}'")
|
||||
return False, unresolvedReason, []
|
||||
|
||||
result.extend(reqs)
|
||||
|
||||
|
|
@ -218,29 +250,33 @@ def resolveDeps(componentSpec: str, components: list[ComponentManifest], target:
|
|||
return enabled, unresolvedReason, resolved
|
||||
|
||||
|
||||
def instanciate(componentSpec: str, components: list[ComponentManifest], target: TargetManifest) -> Optional[ComponentInstance]:
|
||||
def instanciate(
|
||||
componentSpec: str, components: list[ComponentManifest], target: TargetManifest
|
||||
) -> Optional[ComponentInstance]:
|
||||
manifest = next(filter(lambda c: c.id == componentSpec, components))
|
||||
wildcards = set(
|
||||
chain(*map(lambda rule: rule.fileIn, rules.rules.values())))
|
||||
sources = shell.find(
|
||||
manifest.subdirs, list(wildcards), recusive=False)
|
||||
wildcards = set(chain(*map(lambda rule: rule.fileIn, rules.rules.values())))
|
||||
sources = shell.find(manifest.subdirs, list(wildcards), recusive=False)
|
||||
|
||||
res = shell.find(os.path.join(manifest.dirname(), "res"))
|
||||
|
||||
enabled, unresolvedReason, resolved = resolveDeps(
|
||||
componentSpec, components, target)
|
||||
enabled, unresolvedReason, resolved = resolveDeps(componentSpec, components, target)
|
||||
|
||||
return ComponentInstance(enabled, unresolvedReason, manifest, sources, res, resolved[1:])
|
||||
return ComponentInstance(
|
||||
enabled, unresolvedReason, manifest, sources, res, resolved[1:]
|
||||
)
|
||||
|
||||
|
||||
def instanciateDisabled(component: ComponentManifest, target: TargetManifest) -> ComponentInstance:
|
||||
def instanciateDisabled(
|
||||
component: ComponentManifest, target: TargetManifest
|
||||
) -> ComponentInstance:
|
||||
return ComponentInstance(
|
||||
enabled=False,
|
||||
disableReason=component.isEnabled(target)[1],
|
||||
manifest=component,
|
||||
sources=[],
|
||||
res=[],
|
||||
resolved=[])
|
||||
resolved=[],
|
||||
)
|
||||
|
||||
|
||||
context: dict[str, Context] = {}
|
||||
|
|
@ -250,7 +286,7 @@ def contextFor(targetSpec: str, props: Props = {}) -> Context:
|
|||
if targetSpec in context:
|
||||
return context[targetSpec]
|
||||
|
||||
logger.info(f"Loading context for '{targetSpec}'")
|
||||
_logger.info(f"Loading context for '{targetSpec}'")
|
||||
|
||||
targetEls = targetSpec.split(":")
|
||||
|
||||
|
|
@ -269,10 +305,8 @@ def contextFor(targetSpec: str, props: Props = {}) -> Context:
|
|||
tool = target.tools[toolSpec]
|
||||
|
||||
tools[toolSpec] = Tool(
|
||||
strict=False,
|
||||
cmd=tool.cmd,
|
||||
args=tool.args,
|
||||
files=tool.files)
|
||||
strict=False, cmd=tool.cmd, args=tool.args, files=tool.files
|
||||
)
|
||||
|
||||
tools[toolSpec].args += rules.rules[toolSpec].args
|
||||
|
||||
|
|
@ -286,10 +320,18 @@ def contextFor(targetSpec: str, props: Props = {}) -> Context:
|
|||
tools[toolSpec].args += tool.args
|
||||
|
||||
instances: list[ComponentInstance] = list(
|
||||
map(lambda c: instanciateDisabled(c, target), disabled))
|
||||
map(lambda c: instanciateDisabled(c, target), disabled)
|
||||
)
|
||||
|
||||
instances += cast(list[ComponentInstance], list(filter(lambda e: e is not None, map(lambda c: instanciate(
|
||||
c.id, components, target), components))))
|
||||
instances += cast(
|
||||
list[ComponentInstance],
|
||||
list(
|
||||
filter(
|
||||
lambda e: e is not None,
|
||||
map(lambda c: instanciate(c.id, components, target), components),
|
||||
)
|
||||
),
|
||||
)
|
||||
|
||||
context[targetSpec] = Context(
|
||||
target,
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import logging
|
|||
from cutekit.jexpr import Json
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
Props = dict[str, Any]
|
||||
|
||||
|
|
@ -267,12 +267,12 @@ class ComponentManifest(Manifest):
|
|||
def isEnabled(self, target: TargetManifest) -> tuple[bool, str]:
|
||||
for k, v in self.enableIf.items():
|
||||
if k not in target.props:
|
||||
logger.info(f"Component {self.id} disabled by missing {k} in target")
|
||||
_logger.info(f"Component {self.id} disabled by missing {k} in target")
|
||||
return False, f"Missing props '{k}' in target"
|
||||
|
||||
if target.props[k] not in v:
|
||||
vStrs = [f"'{str(x)}'" for x in v]
|
||||
logger.info(
|
||||
_logger.info(
|
||||
f"Component {self.id} disabled by {k}={target.props[k]} not in {v}"
|
||||
)
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -5,14 +5,15 @@ from cutekit import shell, project, const, context
|
|||
|
||||
import importlib.util as importlib
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def load(path: str):
|
||||
logger.info(f"Loading plugin {path}")
|
||||
_logger.info(f"Loading plugin {path}")
|
||||
spec = importlib.spec_from_file_location("plugin", path)
|
||||
|
||||
if not spec or not spec.loader:
|
||||
logger.error(f"Failed to load plugin {path}")
|
||||
_logger.error(f"Failed to load plugin {path}")
|
||||
return None
|
||||
|
||||
module = importlib.module_from_spec(spec)
|
||||
|
|
@ -20,16 +21,18 @@ def load(path: str):
|
|||
|
||||
|
||||
def loadAll():
|
||||
logger.info("Loading plugins...")
|
||||
_logger.info("Loading plugins...")
|
||||
|
||||
projectRoot = project.root()
|
||||
|
||||
if projectRoot is None:
|
||||
logger.info("Not in project, skipping plugin loading")
|
||||
_logger.info("Not in project, skipping plugin loading")
|
||||
return
|
||||
|
||||
pj = context.loadProject(projectRoot)
|
||||
paths = list(map(lambda e: os.path.join(const.EXTERN_DIR, e), pj.extern.keys())) + ["."]
|
||||
paths = list(map(lambda e: os.path.join(const.EXTERN_DIR, e), pj.extern.keys())) + [
|
||||
"."
|
||||
]
|
||||
|
||||
for dirname in paths:
|
||||
pluginDir = os.path.join(projectRoot, dirname, const.META_DIR, "plugins")
|
||||
|
|
@ -39,6 +42,5 @@ def loadAll():
|
|||
plugin = load(os.path.join(pluginDir, files))
|
||||
|
||||
if plugin:
|
||||
logger.info(f"Loaded plugin {plugin.name}")
|
||||
_logger.info(f"Loaded plugin {plugin.name}")
|
||||
plugin.init()
|
||||
|
||||
|
|
|
|||
|
|
@ -15,11 +15,13 @@ import tempfile
|
|||
from typing import Optional
|
||||
from cutekit import const
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class Uname:
|
||||
def __init__(self, sysname: str, nodename: str, release: str, version: str, machine: str):
|
||||
def __init__(
|
||||
self, sysname: str, nodename: str, release: str, version: str, machine: str
|
||||
):
|
||||
self.sysname = sysname
|
||||
self.nodename = nodename
|
||||
self.release = release
|
||||
|
|
@ -47,8 +49,10 @@ def sha256sum(path: str) -> str:
|
|||
return hashlib.sha256(f.read()).hexdigest()
|
||||
|
||||
|
||||
def find(path: str | list[str], wildcards: list[str] = [], recusive: bool = True) -> list[str]:
|
||||
logger.info(f"Looking for files in {path} matching {wildcards}")
|
||||
def find(
|
||||
path: str | list[str], wildcards: list[str] = [], recusive: bool = True
|
||||
) -> list[str]:
|
||||
_logger.info(f"Looking for files in {path} matching {wildcards}")
|
||||
|
||||
result: list[str] = []
|
||||
|
||||
|
|
@ -84,7 +88,7 @@ def find(path: str | list[str], wildcards: list[str] = [], recusive: bool = True
|
|||
|
||||
|
||||
def mkdir(path: str) -> str:
|
||||
logger.info(f"Creating directory {path}")
|
||||
_logger.info(f"Creating directory {path}")
|
||||
|
||||
try:
|
||||
os.makedirs(path)
|
||||
|
|
@ -95,7 +99,7 @@ def mkdir(path: str) -> str:
|
|||
|
||||
|
||||
def rmrf(path: str) -> bool:
|
||||
logger.info(f"Removing directory {path}")
|
||||
_logger.info(f"Removing directory {path}")
|
||||
|
||||
if not os.path.exists(path):
|
||||
return False
|
||||
|
|
@ -108,18 +112,18 @@ def wget(url: str, path: Optional[str] = None) -> str:
|
|||
|
||||
if path is None:
|
||||
path = os.path.join(
|
||||
const.CACHE_DIR,
|
||||
hashlib.sha256(url.encode('utf-8')).hexdigest())
|
||||
const.CACHE_DIR, hashlib.sha256(url.encode("utf-8")).hexdigest()
|
||||
)
|
||||
|
||||
if os.path.exists(path):
|
||||
return path
|
||||
|
||||
logger.info(f"Downloading {url} to {path}")
|
||||
_logger.info(f"Downloading {url} to {path}")
|
||||
|
||||
r = requests.get(url, stream=True)
|
||||
r.raise_for_status()
|
||||
mkdir(os.path.dirname(path))
|
||||
with open(path, 'wb') as f:
|
||||
with open(path, "wb") as f:
|
||||
for chunk in r.iter_content(chunk_size=8192):
|
||||
if chunk:
|
||||
f.write(chunk)
|
||||
|
|
@ -128,17 +132,20 @@ def wget(url: str, path: Optional[str] = None) -> str:
|
|||
|
||||
|
||||
def exec(*args: str, quiet: bool = False) -> bool:
|
||||
logger.info(f"Executing {args}")
|
||||
_logger.info(f"Executing {args}")
|
||||
|
||||
try:
|
||||
proc = subprocess.run(
|
||||
args, stdout=sys.stdout if not quiet else subprocess.PIPE, stderr=sys.stderr if not quiet else subprocess.PIPE)
|
||||
args,
|
||||
stdout=sys.stdout if not quiet else subprocess.PIPE,
|
||||
stderr=sys.stderr if not quiet else subprocess.PIPE,
|
||||
)
|
||||
|
||||
if proc.stdout:
|
||||
logger.info(proc.stdout.decode('utf-8'))
|
||||
_logger.info(proc.stdout.decode("utf-8"))
|
||||
|
||||
if proc.stderr:
|
||||
logger.error(proc.stderr.decode('utf-8'))
|
||||
_logger.error(proc.stderr.decode("utf-8"))
|
||||
|
||||
except FileNotFoundError:
|
||||
raise RuntimeError(f"{args[0]}: Command not found")
|
||||
|
|
@ -150,14 +157,13 @@ def exec(*args: str, quiet: bool = False) -> bool:
|
|||
raise RuntimeError(f"{args[0]}: Segmentation fault")
|
||||
|
||||
if proc.returncode != 0:
|
||||
raise RuntimeError(
|
||||
f"{args[0]}: Process exited with code {proc.returncode}")
|
||||
raise RuntimeError(f"{args[0]}: Process exited with code {proc.returncode}")
|
||||
|
||||
return True
|
||||
|
||||
|
||||
def popen(*args: str) -> str:
|
||||
logger.info(f"Executing {args}")
|
||||
_logger.info(f"Executing {args}")
|
||||
|
||||
try:
|
||||
proc = subprocess.run(args, stdout=subprocess.PIPE, stderr=sys.stderr)
|
||||
|
|
@ -168,14 +174,13 @@ def popen(*args: str) -> str:
|
|||
raise RuntimeError(f"{args[0]}: Segmentation fault")
|
||||
|
||||
if proc.returncode != 0:
|
||||
raise RuntimeError(
|
||||
f"{args[0]}: Process exited with code {proc.returncode}")
|
||||
raise RuntimeError(f"{args[0]}: Process exited with code {proc.returncode}")
|
||||
|
||||
return proc.stdout.decode('utf-8')
|
||||
return proc.stdout.decode("utf-8")
|
||||
|
||||
|
||||
def readdir(path: str) -> list[str]:
|
||||
logger.info(f"Reading directory {path}")
|
||||
_logger.info(f"Reading directory {path}")
|
||||
|
||||
try:
|
||||
return os.listdir(path)
|
||||
|
|
@ -184,19 +189,19 @@ def readdir(path: str) -> list[str]:
|
|||
|
||||
|
||||
def cp(src: str, dst: str):
|
||||
logger.info(f"Copying {src} to {dst}")
|
||||
_logger.info(f"Copying {src} to {dst}")
|
||||
|
||||
shutil.copy(src, dst)
|
||||
|
||||
|
||||
def mv(src: str, dst: str):
|
||||
logger.info(f"Moving {src} to {dst}")
|
||||
_logger.info(f"Moving {src} to {dst}")
|
||||
|
||||
shutil.move(src, dst)
|
||||
|
||||
|
||||
def cpTree(src: str, dst: str):
|
||||
logger.info(f"Copying {src} to {dst}")
|
||||
_logger.info(f"Copying {src} to {dst}")
|
||||
|
||||
shutil.copytree(src, dst, dirs_exist_ok=True)
|
||||
|
||||
|
|
@ -204,10 +209,14 @@ def cpTree(src: str, dst: str):
|
|||
def cloneDir(url: str, path: str, dest: str) -> str:
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
mkdir(tmp)
|
||||
exec(*["git", "clone", "-n", "--depth=1",
|
||||
"--filter=tree:0", url, tmp, "-q"], quiet=True)
|
||||
exec(*["git", "-C", tmp, "sparse-checkout",
|
||||
"set", "--no-cone", path, "-q"], quiet=True)
|
||||
exec(
|
||||
*["git", "clone", "-n", "--depth=1", "--filter=tree:0", url, tmp, "-q"],
|
||||
quiet=True,
|
||||
)
|
||||
exec(
|
||||
*["git", "-C", tmp, "sparse-checkout", "set", "--no-cone", path, "-q"],
|
||||
quiet=True,
|
||||
)
|
||||
exec(*["git", "-C", tmp, "checkout", "-q", "--no-progress"], quiet=True)
|
||||
mv(os.path.join(tmp, path), dest)
|
||||
|
||||
|
|
@ -232,7 +241,7 @@ def latest(cmd: str) -> str:
|
|||
if cmd in LATEST_CACHE:
|
||||
return LATEST_CACHE[cmd]
|
||||
|
||||
logger.info(f"Finding latest version of {cmd}")
|
||||
_logger.info(f"Finding latest version of {cmd}")
|
||||
|
||||
regex: re.Pattern[str]
|
||||
|
||||
|
|
@ -254,7 +263,7 @@ def latest(cmd: str) -> str:
|
|||
versions.sort()
|
||||
chosen = versions[-1]
|
||||
|
||||
logger.info(f"Chosen {chosen} as latest version of {cmd}")
|
||||
_logger.info(f"Chosen {chosen} as latest version of {cmd}")
|
||||
|
||||
LATEST_CACHE[cmd] = chosen
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue