uEdition-Editor 2.0.0b6__tar.gz → 2.0.0b7__tar.gz

{uedition_editor-2.0.0b6 → uedition_editor-2.0.0b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uEdition-Editor
-Version: 2.0.0b6
+Version: 2.0.0b7
 Project-URL: Documentation, https://github.com/uEdition/uEditor#readme
 Project-URL: Issues, https://github.com/uEdition/uEditor/issues
 Project-URL: Source, https://github.com/uEdition/uEditor
@@ -19,7 +19,7 @@ Requires-Dist: aiocron<3,>=2.1
 Requires-Dist: fastapi<1
 Requires-Dist: httptools<1
 Requires-Dist: httpx<1,>=0.28.1
-Requires-Dist: lxml<6,>=5
+Requires-Dist: lxml<7,>=5
 Requires-Dist: pydantic-settings<3,>=2
 Requires-Dist: pydantic[email]<3,>=2
 Requires-Dist: pygit2<2,>=1.17.0

{uedition_editor-2.0.0b6 → uedition_editor-2.0.0b7}/pyproject.toml

@@ -25,7 +25,7 @@ dependencies = [
   "fastapi<1",
   "httptools<1",
   "httpx>=0.28.1,<1",
-  "lxml>=5,<6",
+  "lxml>=5,<7",
   "pydantic[email]>=2,<3",
   "pydantic_settings>=2,<3",
   "pygit2>=1.17.0,<2",

{uedition_editor-2.0.0b6 → uedition_editor-2.0.0b7}/uedition_editor/__about__.py

@@ -3,4 +3,4 @@
 # SPDX-License-Identifier: MIT
 """About this package."""
 
-__version__ = "2.0.0b6"
+__version__ = "2.0.0b7"

{uedition_editor-2.0.0b6 → uedition_editor-2.0.0b7}/uedition_editor/api/branches.py

@@ -97,6 +97,7 @@ async def create_branch(
                 repo.branches.local.create(branch_id, commit)
                 repo.checkout(repo.branches[branch_id])
                 repo.branches[branch_id].upstream = repo.branches[f"{init_settings.git.remote_name}/{branch_id}"]
+                await cron.insecure_track_branches()
                 return {"id": branch_id, "title": de_slugify(data.title)}
             else:
                 for remote_branch_id in repo.branches.remote:
@@ -115,6 +116,7 @@ async def create_branch(
                     )
                     fetch_repo(repo, init_settings.git.remote_name)
                     repo.branches[branch_id].upstream = repo.branches[f"{init_settings.git.remote_name}/{branch_id}"]
+                await cron.insecure_track_branches()
                 return {"id": branch_id, "title": data.title}
         except GitError as ge:
             logger.error(ge)
@@ -165,3 +167,4 @@ async def delete_branch(
                 )
         if branch_id in repo.branches:
             repo.branches.delete(branch_id)
+        await cron.insecure_track_branches()

uedition_editor-2.0.0b7/uedition_editor/cron.py

@@ -0,0 +1,63 @@
+# SPDX-FileCopyrightText: 2024-present Mark Hall <mark.hall@work.room3b.eu>
+#
+# SPDX-License-Identifier: MIT
+"""Regular jobs run in the background of the uEditor."""
+
+import logging
+
+import aiocron
+from pygit2 import GitError, Repository
+from pygit2.enums import RepositoryOpenFlag
+
+from uedition_editor.api.util import de_slugify, fetch_repo, pull_branch, uedition_lock
+from uedition_editor.settings import init_settings
+from uedition_editor.state import local_branches, remote_branches
+
+logger = logging.getLogger(__name__)
+
+
+async def insecure_track_branches():
+    """
+    Track the status of all git branches.
+
+    Use only when the uedition_lock is already completed.
+    """
+    remote_branches.clear()
+    local_branches.clear()
+    try:
+        repo = Repository(init_settings.base_path, flags=RepositoryOpenFlag.NO_SEARCH)
+        logger.debug("Tracking branches")
+        repo.checkout(repo.branches[init_settings.git.default_branch])
+        if init_settings.git.remote_name in list(repo.remotes.names()):
+            logger.debug("Synchronising with remote")
+            fetch_repo(repo, init_settings.git.remote_name)
+        logger.debug("Updating branch status")
+        for branch_name in repo.branches.local:
+            repo.checkout(repo.branches[branch_name])
+            if init_settings.git.remote_name in list(repo.remotes.names()):
+                if repo.branches[branch_name].upstream is not None:
+                    pull_branch(repo, branch_name)
+            diff = repo.diff(
+                repo.revparse_single(init_settings.git.default_branch),
+            )
+            local_branches.append(
+                {
+                    "id": branch_name,
+                    "title": de_slugify(branch_name),
+                    "update_from_default": diff.stats.files_changed > 0,
+                }
+            )
+        for branch_name in repo.branches.remote:
+            if repo.branches[branch_name].remote_name == init_settings.git.remote_name and "HEAD" not in branch_name:
+                remote_branches.append({"id": branch_name, "title": de_slugify(branch_name)})
+        logger.debug("Tracking complete")
+    except GitError as ge:
+        logger.error(ge)
+        local_branches.append({"id": "-", "title": "Direct Access", "nogit": True})
+
+
+@aiocron.crontab("*/5 * * * *")
+async def track_branches() -> None:
+    """Track the status of all git branches."""
+    async with uedition_lock:
+        await insecure_track_branches()

uedition_editor-2.0.0b6/uedition_editor/cron.py

@@ -1,57 +0,0 @@
-# SPDX-FileCopyrightText: 2024-present Mark Hall <mark.hall@work.room3b.eu>
-#
-# SPDX-License-Identifier: MIT
-"""Regular jobs run in the background of the uEditor."""
-
-import logging
-
-import aiocron
-from pygit2 import GitError, Repository
-from pygit2.enums import RepositoryOpenFlag
-
-from uedition_editor.api.util import de_slugify, fetch_repo, pull_branch, uedition_lock
-from uedition_editor.settings import init_settings
-from uedition_editor.state import local_branches, remote_branches
-
-logger = logging.getLogger(__name__)
-
-
-@aiocron.crontab("*/5 * * * *")
-async def track_branches() -> None:
-    """Track the status of all git branches."""
-    async with uedition_lock:
-        remote_branches.clear()
-        local_branches.clear()
-        try:
-            repo = Repository(init_settings.base_path, flags=RepositoryOpenFlag.NO_SEARCH)
-            logger.debug("Tracking branches")
-            repo.checkout(repo.branches[init_settings.git.default_branch])
-            if init_settings.git.remote_name in list(repo.remotes.names()):
-                logger.debug("Synchronising with remote")
-                fetch_repo(repo, init_settings.git.remote_name)
-            logger.debug("Updating branch status")
-            for branch_name in repo.branches.local:
-                repo.checkout(repo.branches[branch_name])
-                if init_settings.git.remote_name in list(repo.remotes.names()):
-                    if repo.branches[branch_name].upstream is not None:
-                        pull_branch(repo, branch_name)
-                diff = repo.diff(
-                    repo.revparse_single(init_settings.git.default_branch),
-                )
-                local_branches.append(
-                    {
-                        "id": branch_name,
-                        "title": de_slugify(branch_name),
-                        "update_from_default": diff.stats.files_changed > 0,
-                    }
-                )
-            for branch_name in repo.branches.remote:
-                if (
-                    repo.branches[branch_name].remote_name == init_settings.git.remote_name
-                    and "HEAD" not in branch_name
-                ):
-                    remote_branches.append({"id": branch_name, "title": de_slugify(branch_name)})
-            logger.debug("Tracking complete")
-        except GitError as ge:
-            logger.error(ge)
-            local_branches.append({"id": "-", "title": "Direct Access", "nogit": True})