mcpywrap-core 0.7.3__tar.gz → 0.7.4__tar.gz

{mcpywrap_core-0.7.3 → mcpywrap_core-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcpywrap-core
-Version: 0.7.3
+Version: 0.7.4
 Summary: Shared mcpy project dependency, build and runtime logic
 Author-email: boybook <boybook@easecation.net>
 License-Expression: MIT

mcpywrap_core-0.7.4/mcpywrap_core/_version.py

@@ -0,0 +1 @@
+__version__ = '0.7.4'

{mcpywrap_core-0.7.3 → mcpywrap_core-0.7.4}/mcpywrap_core/runtime/deployment.py

@@ -85,6 +85,43 @@ def inventory(root):
     return result
 
 
+def _empty_tree(path):
+    """目录树内没有任何文件、链接或其他条目，只有（可嵌套的）空目录。"""
+    try:
+        with os.scandir(path) as entries:
+            for entry in entries:
+                if is_link(entry.path) or not entry.is_dir(follow_symlinks=False):
+                    return False
+                if not _empty_tree(entry.path):
+                    return False
+    except OSError:
+        return False
+    return True
+
+
+def _runtime_directory(root, name, *recorded):
+    """引擎运行时在开发包里自建的空目录（如网易引擎补建的 entities/）。
+
+    只放行所有记录里都不存在、且磁盘上整棵树为空的目录；任何文件（包括
+    inventory 忽略的 .pyc）、链接或已记录的目录都不在此列。
+    """
+    return (name.endswith('/') and all(name not in files for files in recorded)
+            and _empty_tree(Path(root)/name))
+
+
+def unexpected_changes(root, recorded, current=None):
+    """返回运行目录相对部署记录的改动；引擎自建的空目录不算外部改写。"""
+    current = inventory(root) if current is None else current
+    return [name for name in sorted(current.keys() | recorded.keys())
+            if current.get(name) != recorded.get(name)
+            and not (name not in recorded and _runtime_directory(root, name, recorded))]
+
+
+def _modified(target, changes, hint):
+    return EngineError('运行包已被外部程序改写，已保留现场。', 'deployment_modified', hint,
+                       path=str(target), changes=changes[:20])
+
+
 def _dependency_declarations(project):
     config = read_project(project)
     settings = config.get('tool', {}).get('mcpywrap', {})
@@ -223,9 +260,9 @@ class Deployment:
     def preflight(self):
         self.recover()
         previous = storage.read(self.record_path)
-        if previous and inventory(self.target) != previous['files']:
-            raise EngineError('运行包已被外部程序改写，已保留现场。', 'deployment_modified',
-                              '退出相关游戏并检查运行目录。', path=str(self.target))
+        changes = unexpected_changes(self.target, previous['files']) if previous else []
+        if changes:
+            raise _modified(self.target, changes, '退出相关游戏并检查运行目录。')
 
     def prepare(self, session=None, allowed_sessions=()):
         self.preflight()
@@ -239,9 +276,9 @@ class Deployment:
         fingerprint, structure = source_fingerprint(self.builder)
         previous = storage.read(self.record_path)
         using = readers(self.project, self.target, exclude=(session,) if session else ())
-        if previous and inventory(self.target) != previous['files']:
-            raise EngineError('运行包已被外部程序改写，已保留现场。', 'deployment_modified',
-                              '退出相关游戏并检查运行目录；不要清理其他项目的包。', path=str(self.target))
+        changes = unexpected_changes(self.target, previous['files']) if previous else []
+        if changes:
+            raise _modified(self.target, changes, '退出相关游戏并检查运行目录；不要清理其他项目的包。')
         if previous and previous['fingerprint'] == fingerprint:
             self.record = previous
             return self.builder.target_addon
@@ -429,6 +466,8 @@ class Deployment:
             previous = self.journal['previous']['files']
             applied = set(self.journal['applied'])
             for name in current.keys() | previous.keys() | expected.keys():
+                if _runtime_directory(self.target, name, previous, expected):
+                    continue  # 游戏运行期间自建的空目录不是发布后的外部改动，回滚时保留。
                 permitted = ((previous.get(name), expected.get(name)) if name in applied or name.endswith('/')
                              else (previous.get(name),))
                 if current.get(name) not in permitted:
@@ -459,12 +498,13 @@ class Deployment:
                 else:
                     dest.unlink(missing_ok=True)
             expected_dirs = {name for name in self.journal['previous']['files'] if name.endswith('/')}
-            for name in sorted(inventory(self.target), reverse=True):
-                if name.endswith('/') and name not in expected_dirs:
-                    try:
-                        (self.target/name).rmdir()
-                    except OSError:
-                        pass
+            # 只撤销本次发布新建的目录；未登记的空目录（引擎自建或外部创建）保留原样。
+            published_dirs = {name for name in self.journal['published_files'] if name.endswith('/')}
+            for name in sorted(published_dirs - expected_dirs, reverse=True):
+                try:
+                    (self.target/name).rmdir()
+                except OSError:
+                    pass
             for name in expected_dirs:
                 (self.target/name).mkdir(parents=True, exist_ok=True)
         elif backup.exists():

{mcpywrap_core-0.7.3 → mcpywrap_core-0.7.4}/mcpywrap_core/skill/references/troubleshooting.md

@@ -17,7 +17,7 @@
 | managed_output | build/dev 指向运行目录；改用独立构建目录，游戏更新走 runtime 或重新 run |
 | restart_required | 依赖、身份、布局等变化不能当前热更；停止相关读者后重开原世界，不靠 --new 绕过 |
 | source_changed | 装配期间输入变了；停止持续写入，稳定后重新发起，不无限重试 |
-| deployment_modified | 运行产物被外部改写；保留现场，核对改动和所属会话，不清空全局包 |
+| deployment_modified | 运行产物相对部署记录被改写；`details.changes` 列出首批改动路径。保留现场，核对改动和所属会话，不清空全局包。引擎运行时补建的空目录（如纯脚本行为包缺少的 `entities/`）自 0.7.4 起不再触发；旧版本只差这类空目录时，升级后重新 run 即可，不必手工删除 |
 | pack_conflict / ownership_changed / link_modified | 支持 deployment 命令的 CLI 先运行 `deployment inspect --json`；跨项目用 `deployment migrate --from <旧目录> --session <失败会话> --json` 预览，组用 --group；确认具体变更后才执行返回的 apply_argv。未知内容不手工删除 |
 | plan_stale / deployment_relocated | 前者重新预览现场；后者使用提示的新项目入口，不改 UUID 抢回旧部署 |
 | occupancy_unknown | 无法核验进程与部署的关系；保留现场，不自动杀游戏或清锁 |

{mcpywrap_core-0.7.3 → mcpywrap_core-0.7.4}/mcpywrap_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcpywrap-core
-Version: 0.7.3
+Version: 0.7.4
 Summary: Shared mcpy project dependency, build and runtime logic
 Author-email: boybook <boybook@easecation.net>
 License-Expression: MIT

mcpywrap_core-0.7.3/mcpywrap_core/_version.py

@@ -1 +0,0 @@
-__version__ = '0.7.3'