cue4parse 0.0.4__tar.gz → 0.0.5__tar.gz

{cue4parse-0.0.4 → cue4parse-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cue4parse
-Version: 0.0.4
+Version: 0.0.5
 Summary: CUE4Parse Python wrapper and CLI tool to extract packages from Unreal Engine games
 Project-URL: Homepage, https://github.com/joric/CUE4Parse-Python/wiki
 Project-URL: Repository, https://github.com/joric/CUE4Parse-Python
@@ -20,11 +20,4 @@ Description-Content-Type: text/markdown
 
 CUE4Parse Python wrapper, CLI tool, and scripting engine
 
-## Usage
-
-`pip install cue4parse`
-
-* Make sure executable is added to paths, e.g. `%LOCALAPPDATA%\Python\pythoncore-3.14-64\Scripts`.
-* Needs CUE4Parse libraries in `%LOCALAPPDATA%/cue4parse/libs` (downloads and unpacks FModel on Windows).
-* To run CLI: `cue4parse`
-
+* Documentation: https://github.com/joric/CUE4Parse-Python/wiki

cue4parse-0.0.5/README.md

@@ -0,0 +1,5 @@
+# CUE4Parse-Python
+
+CUE4Parse Python wrapper, CLI tool, and scripting engine
+
+* Documentation: https://github.com/joric/CUE4Parse-Python/wiki

{cue4parse-0.0.4 → cue4parse-0.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "cue4parse"
-version = "0.0.4"
+version = "0.0.5"
 description = "CUE4Parse Python wrapper and CLI tool to extract packages from Unreal Engine games"
 requires-python = ">=3.9"
 dependencies = ["pythonnet>=3.0"]

{cue4parse-0.0.4 → cue4parse-0.0.5}/src/cue4parse/cli.py

@@ -191,9 +191,9 @@ def execute(options: CliOptions) -> int:
     overwrite_files = options.yes
 
     if options.verbose:
-        Log.Logger = with_console(LoggerConfiguration().MinimumLevel.Verbose()).CreateLogger()
+        Log.Logger = LoggerConfiguration().MinimumLevel.Verbose().WriteTo.Console().CreateLogger()
     else:
-        Log.Logger = with_console(LoggerConfiguration().MinimumLevel.Fatal()).CreateLogger()
+        Log.Logger = LoggerConfiguration().MinimumLevel.Fatal().WriteTo.Console().CreateLogger()
 
     try:
         game_version = parse_enum(EGame, options.game, "GAME_UE5_LATEST")

cue4parse-0.0.5/src/cue4parse/core.py

@@ -0,0 +1,110 @@
+from __future__ import annotations
+
+import fnmatch
+import json
+import logging
+import os
+import sys
+import time
+from dataclasses import dataclass
+from enum import Flag, auto
+from pathlib import Path
+from typing import Any, Iterable
+
+from cue4parse import _DLL_DIR
+
+def _find_dotnet_root() -> Path | None:
+    candidates = [
+        Path.home() / ".dotnet",
+        Path("/usr/share/dotnet"),
+        Path("/usr/lib/dotnet"),
+    ]
+    for candidate in candidates:
+        if (candidate / "host" / "fxr").exists():
+            return candidate
+    return None
+
+def _find_runtime_config() -> str | None:
+    libs_dir = Path(__file__).parent / "libs"
+    configs = list(libs_dir.glob("*.runtimeconfig.json"))
+    return str(configs[0]) if configs else None
+
+dotnet_root = _find_dotnet_root()
+if dotnet_root:
+    os.environ["DOTNET_ROOT"] = str(dotnet_root)
+
+import pythonnet
+
+runtime_config = _find_runtime_config()
+if runtime_config:
+    pythonnet.load("coreclr", runtime_config=runtime_config)
+else:
+    pythonnet.load("coreclr")
+
+import clr
+
+libs_dir = _DLL_DIR
+cue4parse_dll_dir = str(libs_dir)
+sys.path.append(cue4parse_dll_dir)
+
+clr.AddReference("CUE4Parse")
+clr.AddReference("CUE4Parse-Conversion")
+
+clr.AddReference("System")
+clr.AddReference("System.Core")
+clr.AddReference("Newtonsoft.Json")
+
+# enable logger
+
+clr.AddReference("Serilog")
+clr.AddReference("Serilog.Sinks.Console")
+
+import System
+from Serilog import Log, LoggerConfiguration
+from Serilog.Configuration import LoggerSinkConfiguration
+from Serilog.Events import LogEventLevel
+
+def patch_serilog_console() -> None:
+    flags = System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static
+    sink_type = clr.GetClrType(LoggerSinkConfiguration)
+    logger_type = clr.GetClrType(LoggerConfiguration)
+    assembly = System.Reflection.Assembly.Load("Serilog.Sinks.Console")
+
+    console_method = next(
+        method
+        for typ in assembly.GetTypes()
+        for method in typ.GetMethods(flags)
+        if method.Name == "Console"
+        and (params := method.GetParameters())
+        and params[0].ParameterType == sink_type
+    )
+
+    parent_field = next(
+        field
+        for field in sink_type.GetFields(
+            System.Reflection.BindingFlags.Public
+            | System.Reflection.BindingFlags.NonPublic
+            | System.Reflection.BindingFlags.Instance
+        )
+        if field.FieldType == logger_type
+    )
+
+    def console(self, *args, **kwargs):
+        overrides = {"standardErrorFromLevel": LogEventLevel.Verbose, **kwargs}
+        positional = (self, *args)
+        values = [
+            overrides[p.Name]
+            if p.Name in overrides
+            else positional[i]
+            if i < len(positional)
+            else System.Type.Missing
+            for i, p in enumerate(console_method.GetParameters())
+        ]
+        console_method.Invoke(None, System.Array[System.Object](values))
+        return parent_field.GetValue(self)
+
+    setattr(LoggerSinkConfiguration, "Console", console)
+
+patch_serilog_console()
+
+Log.Logger = LoggerConfiguration().MinimumLevel.Verbose().WriteTo.Console().CreateLogger()

{cue4parse-0.0.4 → cue4parse-0.0.5}/src/cue4parse/example.py

@@ -1,4 +1,4 @@
-import time
+import time, sys
 from cue4parse import *
 
 GAME_DIR = r"E:\Games\Subnautica2\Subnautica2\Content\Paks"
@@ -7,7 +7,7 @@ MAPPINGS_FILE = r"E:\Games\Subnautica2\Subnautica2.usmap"
 def main():
     start = time.perf_counter()
 
-    Log.Logger = with_console(LoggerConfiguration().MinimumLevel.Verbose()).CreateLogger()
+    Log.Logger = LoggerConfiguration().MinimumLevel.Verbose().WriteTo.Console().CreateLogger()
 
     version = VersionContainer(EGame.GAME_UE5_6, ETexturePlatform.DesktopMobile)
     provider = DefaultFileProvider(GAME_DIR, SearchOption.TopDirectoryOnly, version, StringComparer.OrdinalIgnoreCase)
@@ -24,15 +24,14 @@ def main():
 
     exports = package.GetExports()
 
-    name_filter = lambda name: 'Lifepod' in str(name)
+    filter = lambda name: 'Lifepod' in str(name)
 
     for export in exports:
-        name = str(export)
-        if not name_filter(name):
+        if not filter(export.ExportType):
             continue
-        print(export.ExportType)
+        print(export.ExportType, export.Name)
 
-    print(f'Finished in {time.perf_counter() - start:.4f}s')
+    print(f'Finished in {time.perf_counter() - start:.4f}s', file=sys.stderr)
 
 if __name__ == '__main__':
     raise SystemExit(main())

{cue4parse-0.0.4 → cue4parse-0.0.5}/src/cue4parse/includes.py

@@ -31,4 +31,3 @@ from CUE4Parse_Conversion.Textures import ETextureFormat, TextureDecoder, Textur
 from CUE4Parse_Conversion.Textures.BC import DetexHelper
 from CUE4Parse_Conversion.UEFormat.Enums import EFileCompressionFormat
 from CUE4Parse.UE4.Assets.Exports.Material import EMaterialFormat
-

cue4parse-0.0.4/README.md

@@ -1,12 +0,0 @@
-# CUE4Parse-Python
-
-CUE4Parse Python wrapper, CLI tool, and scripting engine
-
-## Usage
-
-`pip install cue4parse`
-
-* Make sure executable is added to paths, e.g. `%LOCALAPPDATA%\Python\pythoncore-3.14-64\Scripts`.
-* Needs CUE4Parse libraries in `%LOCALAPPDATA%/cue4parse/libs` (downloads and unpacks FModel on Windows).
-* To run CLI: `cue4parse`
-

cue4parse-0.0.4/src/cue4parse/core.py

@@ -1,90 +0,0 @@
-from __future__ import annotations
-
-import fnmatch
-import json
-import logging
-import os
-import sys
-import time
-from dataclasses import dataclass
-from enum import Flag, auto
-from pathlib import Path
-from typing import Any, Iterable
-
-from cue4parse import _DLL_DIR
-
-def _find_dotnet_root() -> Path | None:
-    candidates = [
-        Path.home() / ".dotnet",
-        Path("/usr/share/dotnet"),
-        Path("/usr/lib/dotnet"),
-    ]
-    for candidate in candidates:
-        if (candidate / "host" / "fxr").exists():
-            return candidate
-    return None
-
-def _find_runtime_config() -> str | None:
-    libs_dir = Path(__file__).parent / "libs"
-    configs = list(libs_dir.glob("*.runtimeconfig.json"))
-    return str(configs[0]) if configs else None
-
-dotnet_root = _find_dotnet_root()
-if dotnet_root:
-    os.environ["DOTNET_ROOT"] = str(dotnet_root)
-
-import pythonnet
-
-runtime_config = _find_runtime_config()
-if runtime_config:
-    pythonnet.load("coreclr", runtime_config=runtime_config)
-else:
-    pythonnet.load("coreclr")
-
-import clr
-
-libs_dir = _DLL_DIR
-cue4parse_dll_dir = str(libs_dir)
-sys.path.append(cue4parse_dll_dir)
-
-clr.AddReference("CUE4Parse")
-clr.AddReference("CUE4Parse-Conversion")
-
-clr.AddReference("System")
-clr.AddReference("System.Core")
-clr.AddReference("Newtonsoft.Json")
-
-clr.AddReference("Serilog")
-clr.AddReference("Serilog.Sinks.Console")
-
-import System
-from Serilog import Log, LoggerConfiguration
-from Serilog.Events import LogEventLevel
-from Serilog.Configuration import LoggerSinkConfiguration
-
-def with_console(cfg: LoggerConfiguration) -> LoggerConfiguration:
-    asm = System.Reflection.Assembly.Load("Serilog.Sinks.Console")
-    bf = System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static
-    lsc_t = clr.GetClrType(LoggerSinkConfiguration)
-    for t in asm.GetTypes():
-        if not (t.IsSealed and t.IsAbstract):
-            continue
-        for m in t.GetMethods(bf):
-            if m.Name != "Console":
-                continue
-            ps = m.GetParameters()
-            if len(ps) >= 1 and ps[0].ParameterType == lsc_t:
-                args = [System.Type.Missing] * len(ps)
-                args[0] = cfg.WriteTo
-                # Find and set the standardErrorFromLevel parameter so it's stderr, not stdout
-                for i, p in enumerate(ps):
-                    if p.Name == "standardErrorFromLevel":
-                        lel_t = System.Type.GetType("Serilog.Events.LogEventLevel, Serilog")
-                        args[i] = System.Enum.Parse(lel_t, "Verbose")
-                        break
-                m.Invoke(None, System.Array[System.Object](args))
-                return cfg
-    raise RuntimeError("Serilog console sink extension method not found")
-
-# you can re-define it in user code later with Verbose() or any other level
-Log.Logger = with_console(LoggerConfiguration().MinimumLevel.Fatal()).CreateLogger()