3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git_deploy: report git repository name 

Signed-off-by: Christoph Frei <fryakatkop@gmail.com>
This commit is contained in:
FrY Sennberg 2021-11-02 00:10:35 +01:00 committed by GitHub
parent 9f89b03aa3
commit eec60a760b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/web_api.md
View File

@ -2133,6 +2133,7 @@ and `fluidd` are present as clients configured in `moonraker.conf`
"remote_alias": "origin",
"branch": "master",
"owner": "Arksine",
"repo_name": "moonraker":
"version": "v0.4.1-45",
"remote_version": "v0.4.1-45",
"full_version_string": "v0.4.1-45-g7e230c1c",
@ -2164,6 +2165,7 @@ and `fluidd` are present as clients configured in `moonraker.conf`
"remote_alias": "origin",
"branch": "master",
"owner": "Klipper3d",
"repo_name": "klipper",
"version": "v0.9.1-317",
"remote_version": "v0.9.1-324",
"full_version_string": "v0.9.1-324-gd77928b1",

11
moonraker/components/update_manager/git_deploy.py
View File

@ -218,6 +218,7 @@ class GitRepo:
self.moved_origin_url = moved_origin_url
self.valid_git_repo: bool = False
self.git_owner: str = "?"
self.git_repo_name: str = "?"
self.git_remote: str = "?"
self.git_branch: str = "?"
self.current_version: str = "?"
@ -321,6 +322,14 @@ class GitRepo:
self.git_owner = "?"
if owner_match is not None:
self.git_owner = owner_match.group(1)
# Parse GitHub Repository Name from URL
repo_match = re.match(r".*\/([^\.]*).*", self.upstream_url)
self.git_repo_name = "?"
if repo_match is not None:
self.git_repo_name = repo_match.group(1)
# check if Repository is dirty
self.dirty = current_version.endswith("dirty")
# Parse Version Info
@ -430,6 +439,7 @@ class GitRepo:
logging.info(
f"Git Repo {self.alias} Detected:\n"
f"Owner: {self.git_owner}\n"
f"Repository Name: {self.git_repo_name}\n"
f"Path: {self.git_path}\n"
f"Remote: {self.git_remote}\n"
f"Branch: {self.git_branch}\n"
@ -605,6 +615,7 @@ class GitRepo:
'remote_alias': self.git_remote,
'branch': self.git_branch,
'owner': self.git_owner,
'repo_name': self.git_repo_name,
'version': self.current_version,
'remote_version': self.upstream_version,
'current_hash': self.current_commit,