gitlatex 2.0.0__tar.gz → 2.0.1__tar.gz

{gitlatex-2.0.0/gitlatex.egg-info → gitlatex-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitlatex
-Version: 2.0.0
+Version: 2.0.1
 Summary: A simple UI for LaTeX projects with Git support. Clone repos, edit, compile, and push.
 License-Expression: ISC
 Project-URL: Homepage, https://github.com/abdussamiakanda/gitlatex

{gitlatex-2.0.0 → gitlatex-2.0.1}/gitlatex/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.0.0'
-__version_tuple__ = version_tuple = (2, 0, 0)
+__version__ = version = '2.0.1'
+__version_tuple__ = version_tuple = (2, 0, 1)
 
-__commit_id__ = commit_id = 'gf67d4da27'
+__commit_id__ = commit_id = 'ga0d651549'

{gitlatex-2.0.0 → gitlatex-2.0.1}/gitlatex/http.py

@@ -1,7 +1,11 @@
 """Small helpers and constants shared by every route module."""
 
+import functools
+
 from flask import request
 
+from gitlatex import state
+
 MIME_TYPES = {
     ".pdf": "application/pdf",
     ".png": "image/png",
@@ -29,6 +33,15 @@ ASSET_EXTENSIONS = frozenset({".css", ".js", ".mjs", ".svg", ".ico", ".png", ".j
                               ".woff2", ".ttf", ".wasm"})
 
 
+def with_project_lock(view):
+    """Run a route while holding state.project_lock (see gitlatex/state.py)."""
+    @functools.wraps(view)
+    def wrapper(*args, **kwargs):
+        with state.project_lock:
+            return view(*args, **kwargs)
+    return wrapper
+
+
 def _json():
     """Request JSON body; default to empty dict."""
     return request.get_json(force=True, silent=True) or {}

{gitlatex-2.0.0 → gitlatex-2.0.1}/gitlatex/routes/compile.py

@@ -7,7 +7,7 @@ import subprocess
 from flask import Blueprint, jsonify, request, send_file
 
 from gitlatex import state
-from gitlatex.http import _json
+from gitlatex.http import _json, with_project_lock
 from gitlatex.services.latex import LATEX_ENGINES, run_latex_build
 from gitlatex.services.paths import resolve_repo_path
 from gitlatex.services.synctex import save_remote_synctex
@@ -16,6 +16,7 @@ bp = Blueprint("compile", __name__)
 
 
 @bp.route("/compile", methods=["GET", "POST"])
+@with_project_lock
 def compile_latex():
     if request.method == "GET":
         return jsonify(
@@ -111,11 +112,13 @@ def handle_save_pdf():
 
 
 @bp.route("/save-pdf", methods=["POST"])
+@with_project_lock
 def save_pdf():
     return handle_save_pdf()
 
 
 @bp.route("/api/save-pdf", methods=["POST"])
+@with_project_lock
 def api_save_pdf():
     return handle_save_pdf()
 

{gitlatex-2.0.0 → gitlatex-2.0.1}/gitlatex/routes/git.py

@@ -1,11 +1,13 @@
 """Git operations: push, pull, status, history and diffs."""
 
 import datetime
+import re
 import os
 
 from flask import Blueprint, jsonify, request
 
 from gitlatex import state
+from gitlatex.http import with_project_lock
 from gitlatex.services.git_backend import NULL_TREE, GitCommandError, Repo
 from gitlatex.services.gitrepo import _blob_text, _close_repo, _numstat, _open_repo
 from gitlatex.services.paths import resolve_repo_path
@@ -14,6 +16,7 @@ bp = Blueprint("git", __name__)
 
 
 @bp.route("/push", methods=["POST"])
+@with_project_lock
 def push():
     if not state.current_repo_path:
         return jsonify(error="No repository selected"), 400
@@ -52,6 +55,7 @@ def push():
 
 
 @bp.route("/api/git/commit", methods=["POST"])
+@with_project_lock
 def commit_all():
     """Stage everything and commit, without pushing (for projects with no remote)."""
     if not state.current_repo_path:
@@ -79,6 +83,7 @@ def commit_all():
 
 
 @bp.route("/api/git/init", methods=["POST"])
+@with_project_lock
 def init_repo():
     if not state.current_repo_path:
         return jsonify(error="No repository selected"), 400
@@ -97,7 +102,62 @@ def _json_message():
     return message.strip() if isinstance(message, str) else ""
 
 
+# What TeX writes next to a document. Committed copies are common (people
+# commit main.pdf), and every compile rewrites them locally.
+_BUILD_OUTPUT = re.compile(
+    r"\.(synctex\.gz|synctex|aux|log|out|toc|lof|lot|fls|fdb_latexmk|bcf|run\.xml|blg|bbl|nav|snm|vrb|xdv)$",
+    re.IGNORECASE,
+)
+
+
+def _is_build_output(root, path):
+    if _BUILD_OUTPUT.search(path):
+        return True
+    # A PDF is build output only when it is a document's own PDF (main.pdf next
+    # to main.tex); figure PDFs are the user's files.
+    if path.lower().endswith(".pdf"):
+        return os.path.isfile(os.path.join(root, path[:-4] + ".tex"))
+    return False
+
+
+def _clear_stale_build_outputs(repo):
+    """Drop local build outputs that the incoming commits replace.
+
+    Compiling rewrites main.pdf (PDFs embed a timestamp) and writes
+    main.synctex.gz, so a project that commits them always looks modified, and
+    `git pull` refuses to overwrite them. They are regenerated by the next
+    compile anyway, so the remote's copies win. Only files the remote actually
+    changes are touched; the user's own edits are left to --autostash.
+    Returns the paths cleared.
+    """
+    try:
+        if not repo.remotes or repo.head.is_detached or repo.active_branch.tracking_branch() is None:
+            return []
+        repo.git.fetch("--quiet")
+        incoming = repo.git.diff("--name-only", "HEAD...@{u}").splitlines()
+    except (GitCommandError, TypeError, ValueError):
+        return []
+    root = repo.working_tree_dir
+    modified = set(repo.git.diff("--name-only").splitlines()) | set(repo.git.diff("--name-only", "--cached").splitlines())
+    untracked = set(repo.untracked_files)
+    cleared = []
+    for path in incoming:
+        if not _is_build_output(root, path):
+            continue
+        try:
+            if path in modified:
+                repo.git.checkout("HEAD", "--", path)
+                cleared.append(path)
+            elif path in untracked:
+                os.remove(os.path.join(root, path))
+                cleared.append(path)
+        except (GitCommandError, OSError) as e:
+            print("Could not clear", path, e)
+    return cleared
+
+
 @bp.route("/pull", methods=["POST"])
+@with_project_lock
 def pull():
     if not state.current_repo_path:
         return jsonify(error="No repository selected"), 400
@@ -107,15 +167,18 @@ def pull():
         repo = Repo(state.current_repo_path)
         try:
             before = repo.head.commit.hexsha if repo.head.is_valid() else None
-            # --autostash keeps working-tree noise (compile artifacts like main.pdf)
-            # from blocking the pull; older gits don't support it for merges.
+            cleared = _clear_stale_build_outputs(repo)
+            # --autostash sets the user's own uncommitted edits aside and puts
+            # them back after the merge; older gits don't support it for merges.
             try:
                 output = repo.git.pull("--autostash")
-            except GitCommandError:
+            except GitCommandError as e:
+                if "--autostash" not in str(e) and "autostash" not in str(e).lower():
+                    raise
                 output = repo.git.pull()
             after = repo.head.commit.hexsha if repo.head.is_valid() else None
-            print("Pulled from origin")
-            return jsonify(success=True, output=output, changed=before != after)
+            print("Pulled from origin" + (" (replaced local build output: %s)" % ", ".join(cleared) if cleared else ""))
+            return jsonify(success=True, output=output, changed=before != after, cleared=cleared)
         finally:
             if getattr(repo, "close", None):
                 try:

{gitlatex-2.0.0 → gitlatex-2.0.1}/gitlatex/routes/workspace.py

@@ -22,7 +22,7 @@ import shutil
 from flask import Blueprint, jsonify
 
 from gitlatex import state
-from gitlatex.http import _json
+from gitlatex.http import _json, with_project_lock
 from gitlatex.services import comments
 from gitlatex.services.git_backend import Repo
 from gitlatex.services.paths import resolve_repo_path
@@ -167,6 +167,7 @@ def rename_project():
 
 
 @bp.route("/api/fs/write", methods=["POST"])
+@with_project_lock
 def write_file():
     if not state.current_repo_path:
         return _no_project()
@@ -185,6 +186,7 @@ def write_file():
 
 
 @bp.route("/api/fs/mkdir", methods=["POST"])
+@with_project_lock
 def make_dir():
     if not state.current_repo_path:
         return _no_project()
@@ -201,6 +203,7 @@ def make_dir():
 
 
 @bp.route("/api/fs/delete", methods=["POST"])
+@with_project_lock
 def delete_path():
     if not state.current_repo_path:
         return _no_project()
@@ -220,6 +223,7 @@ def delete_path():
 
 
 @bp.route("/api/fs/move", methods=["POST"])
+@with_project_lock
 def move_path():
     if not state.current_repo_path:
         return _no_project()

gitlatex-2.0.1/gitlatex/state.py

@@ -0,0 +1,34 @@
+"""Process-wide server state.
+
+These values are genuinely global to a running server: which repos folder
+is being served, which project the user has selected, the last compile error,
+and the lock that serializes changes to project files. Route modules import
+this module and read `state.x` rather than importing the names directly, so
+everyone sees the same value after a rebind.
+"""
+
+import threading
+
+# Absolute path of the repos folder, set once at startup by create_app().
+BASE_DIR = None
+
+# Absolute path of the project the user has selected, or None.
+current_repo_path = None
+
+# Message from the most recent failed compile, surfaced by /compile-error.
+last_compile_error = None
+
+# Held by everything that changes a project's files: Git (pull, push, commit),
+# compiles, PDF saves and the editor's writes. A PDF saved in the middle of a
+# pull would otherwise be caught by --autostash and conflict when it is put back.
+project_lock = threading.RLock()
+
+
+def repo_selected():
+    return current_repo_path is not None
+
+
+def repo_name():
+    """Folder name of the selected project, or None."""
+    import os
+    return os.path.basename(current_repo_path) if current_repo_path else None