UEPyScripts 1.2.7__tar.gz → 1.3.0__tar.gz

{uepyscripts-1.2.7 → uepyscripts-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UEPyScripts
-Version: 1.2.7
+Version: 1.3.0
 Summary: Collection of Python tools and helpers designed to automate common Unreal Engine project tasks (builds, packaging, editor control, CI tasks, etc.).
 Project-URL: Changelog, https://github.com/TheEmidee/UEPyScripts/releases
 Project-URL: Homepage, https://github.com/TheEmidee/UEPyScripts

{uepyscripts-1.2.7 → uepyscripts-1.3.0}/src/uepyscripts/internal/engine_resolver.py

@@ -11,6 +11,13 @@ from ..tools.helpers import get_engine_root_folder_from_env_var, is_engine_from_
 from ..tools.winreg import get_registry_value
 
 
+def resolve_engine_from_native_project(project: Project) -> Optional[Path]:
+    if project.is_native_project:
+        return project.root_folder.parent
+
+    return None
+
+
 def resolve_engine_from_env_var(project: Project) -> Optional[Path]:
     return get_engine_root_folder_from_env_var(project.engine_association)
 
@@ -86,6 +93,7 @@ def resolve_engine_from_path(project: Project) -> Optional[Path]:
 
 def resolve_engine_path(project: Project) -> Path:
     resolvers = [
+        resolve_engine_from_native_project,
         resolve_engine_from_registry,
         resolve_engine_from_egs,
         resolve_engine_from_path,

{uepyscripts-1.2.7 → uepyscripts-1.3.0}/src/uepyscripts/internal/project.py

@@ -1,4 +1,3 @@
-import os
 from pathlib import Path
 from typing import Optional
 
@@ -44,6 +43,10 @@ class Project:
     def engine_association(self) -> str:
         return self.uproject.engine_association
 
+    @property
+    def is_native_project(self) -> bool:
+        return not self.engine_association
+
     def __str__(self) -> str:
         return f"""
 ----- Project infos -----
@@ -55,6 +58,24 @@ class Project:
         """
 
 
+EXCLUDED_DIR_NAMES = {"Engine", "FeaturePacks", "Samples", "Scripts", "Templates", ".git"}
+
+
+def find_uproject_in_subfolders(root: Path) -> Optional[Path]:
+    """Recursively search for a .uproject file under root, skipping excluded folders."""
+    for entry in root.iterdir():
+        if entry.is_dir():
+            if entry.name in EXCLUDED_DIR_NAMES:
+                continue
+            found = find_uproject_in_subfolders(entry)
+            if found:
+                return found
+        elif entry.is_file() and entry.suffix == ".uproject":
+            return entry.resolve()
+
+    return None
+
+
 def find_parent_with_project_file(starting_path: Path, max_parents: int = 10) -> Optional[Path]:
     current_path = Path(starting_path).resolve()
 
@@ -65,12 +86,16 @@ def find_parent_with_project_file(starting_path: Path, max_parents: int = 10) ->
             if file.is_file() and file.suffix == ".uproject":
                 return file.resolve()
 
+        build_version_path = path / "Engine" / "Build" / "Build.version"
+        if build_version_path.is_file():
+            return find_uproject_in_subfolders(path)
+
     return None
 
 
 def resolve_project(uproject_path: Optional[Path] = None) -> Project:
     if not uproject_path:
-        dir_path = Path(os.path.dirname(os.path.realpath(__file__)))
+        dir_path = Path.cwd()
         uproject_path = find_parent_with_project_file(dir_path)
         if not uproject_path:
             raise Exception(f"Could not find a uproject file from {dir_path}")

uepyscripts-1.3.0/src/uepyscripts/tools/subprocess.py

@@ -0,0 +1,50 @@
+import subprocess
+import sys
+from typing import Any
+
+from uepyscripts import logger
+
+
+def run_subprocess(cmd: list[str], log_output: bool = True) -> int:
+    """Run a subprocess with the given command and return its exit code (or 0 if fire-and-forget)."""
+    kwargs: dict[str, Any] = {}
+    creationflags = 0
+
+    if sys.platform == "win32":
+        creationflags = subprocess.CREATE_NEW_PROCESS_GROUP | subprocess.CREATE_NO_WINDOW
+        startupinfo = subprocess.STARTUPINFO()
+        startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+        startupinfo.wShowWindow = subprocess.SW_HIDE
+        kwargs["startupinfo"] = startupinfo
+    else:
+        kwargs["start_new_session"] = True
+
+    if log_output:
+        process = subprocess.Popen(
+            cmd,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+            bufsize=1,
+            creationflags=creationflags,
+            **kwargs,
+        )
+
+        assert process.stdout is not None
+        for line in process.stdout:
+            line = line.strip()
+            if line:
+                logger.info(line)
+
+        process.wait()
+        return process.returncode
+    else:
+        subprocess.Popen(
+            cmd,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            stdin=subprocess.DEVNULL,
+            creationflags=creationflags,
+            **kwargs,
+        )
+        return 0

{uepyscripts-1.2.7 → uepyscripts-1.3.0}/src/uepyscripts/tools/ue/engine_installation/engine_installer.py

@@ -63,9 +63,9 @@ class TaskList:
 
 class EngineInstaller:
     def __init__(self, project: Project, unattended: bool = False) -> None:
+        self.project = project
         self.check_requirements()
 
-        self.project = project
         try:
             self.engine_destination_folder = resolve_engine_destination(project)
         except FileNotFoundError as e:
@@ -95,6 +95,9 @@ class EngineInstaller:
         if not is_7z_installed():
             raise RuntimeError("7-Zip is not installed or not found in PATH. Please install 7-Zip to proceed.")
 
+        if self.project.is_native_project:
+            raise RuntimeError("A native project should be in the same folder than its engine")
+
     def get_project_platforms(self) -> List[str]:
         platforms: str = self.config["EngineUpdate.TurnKey"]["Platforms"]
         return platforms.split("+")

uepyscripts-1.2.7/src/uepyscripts/tools/subprocess.py

@@ -1,23 +0,0 @@
-import subprocess
-
-from uepyscripts import logger
-
-
-def run_subprocess(cmd: list[str], log_output: bool = True) -> int:
-    """Run a subprocess with the given command and return the Popen object."""
-    if log_output:
-        process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, text=True, bufsize=1, universal_newlines=True)
-
-        assert process.stdout is not None
-        assert process.stderr is not None
-
-        for line in process.stdout:
-            line = line.strip()
-            if line:
-                logger.info(line)
-
-        process.wait()
-        return process.returncode
-    else:
-        subprocess.Popen(cmd, stdout=subprocess.PIPE)
-        return 0