VCS fix for non-existing code base

This commit is contained in:
Piotr Dec 2025-10-14 19:55:43 +02:00
parent 2d3699ad00
commit d45fe704b6
Signed by: stawros
GPG key ID: 74B18A3F0F1E99C0
4 changed files with 28 additions and 3 deletions

View file

@ -1 +1,7 @@
from .settings import AppConfig
from .settings import GitConfig
from .settings import KeePassConfig
from .settings import Settings
from .settings import get_settings
__all__ = [AppConfig, GitConfig, KeePassConfig, Settings, get_settings]

View file

@ -13,7 +13,8 @@ class AppConfig(BaseModel):
class GitConfig(BaseModel):
directory: str = "/opt/repo/sample"
path: Path = Path("/opt/repo/sample")
url: str = "ssh://git@hattori.ztsh.eu:29418/paas/heimdall.git"
branch: str = "master"
remote: str = "origin"

View file

@ -1,18 +1,33 @@
from git import Repo, Remote
from app.config import get_settings
from app.config import GitConfig, get_settings
class GitService:
def __init__(self):
self._settings = get_settings()
self._repo = Repo(self._settings.git.directory)
self._repo = self._check_preconditions(self._settings.git)
if self._repo.head.ref.name != self._settings.git.branch:
self._repo.git.checkout(self._settings.git.branch)
self._origin: Remote = self._repo.remotes.origin
def get_modified_compose(self) -> str | None:
self._update()
return self._diff()
@staticmethod
def _check_preconditions(config: GitConfig) -> Repo:
def clone():
return Repo.clone_from(config.url, config.path, branch=config.branch)
import os
if not config.path.exists():
return clone()
if not (config.path / ".git").exists():
os.rmdir(config.path)
return clone()
return Repo(config.path)
def _update(self):
self._origin.pull()

View file

@ -2,6 +2,9 @@ app:
host: "127.0.0.1"
port: 8000
reload: true
git:
path: "F:/IdeaProjects/paas/karl/.compose_repository"
branch: "main"
kp:
file: "config/kp.kdbx"
secret: "config/secret.txt"