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

update_manager: report "owner" in update status 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-02-27 20:36:12 -05:00
parent 6c994f6c9c
commit bf48744048
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
moonraker/plugins/update_manager.py
View File

@ -417,6 +417,7 @@ class GitUpdater:
self.execute_cmd_with_response = umgr.execute_cmd_with_response self.execute_cmd_with_response = umgr.execute_cmd_with_response
self.notify_update_response = umgr.notify_update_response self.notify_update_response = umgr.notify_update_response
self.name = config.get_name().split()[-1] self.name = config.get_name().split()[-1]
self.owner = "?"
self.repo_path = path self.repo_path = path
if path is None: if path is None:
self.repo_path = config.get('path') self.repo_path = config.get('path')
@ -529,7 +530,7 @@ class GitUpdater:
async def _check_version(self, need_fetch=True): async def _check_version(self, need_fetch=True):
self.is_valid = self.detached = False self.is_valid = self.detached = False
self.cur_hash = self.branch = self.remote = "?" self.cur_hash = self.branch = self.remote = "?"
self.version = self.remote_version = "?" self.version = self.remote_version = self.owner = "?"
try: try:
blist = await self.execute_cmd_with_response( blist = await self.execute_cmd_with_response(
f"git -C {self.repo_path} branch --list") f"git -C {self.repo_path} branch --list")
@ -577,11 +578,15 @@ class GitUpdater:
self._log_exc("Error retreiving git info") self._log_exc("Error retreiving git info")
return return
remote_url = remote_url.strip()
owner_match = re.match(r"https?://.*/(.*)/", remote_url)
if owner_match is not None:
self.owner = owner_match.group(1)
self.is_dirty = repo_version.endswith("dirty") self.is_dirty = repo_version.endswith("dirty")
versions = [] versions = []
for ver in [repo_version, remote_version]: for ver in [repo_version, remote_version]:
tag_version = "?" tag_version = "?"
ver_match = re.match(r"v\d+\.\d+\.\d-\d+", ver) ver_match = re.match(r"v\d+\.\d+\.\d-\d+", ver.strip())
if ver_match: if ver_match:
tag_version = ver_match.group() tag_version = ver_match.group()
versions.append(tag_version) versions.append(tag_version)
@ -758,6 +763,7 @@ class GitUpdater:
return { return {
'remote_alias': self.remote, 'remote_alias': self.remote,
'branch': self.branch, 'branch': self.branch,
'owner': self.owner,
'version': self.version, 'version': self.version,
'remote_version': self.remote_version, 'remote_version': self.remote_version,
'current_hash': self.cur_hash, 'current_hash': self.cur_hash,
@ -841,7 +847,7 @@ class WebUpdater:
self.server = umgr.server self.server = umgr.server
self.notify_update_response = umgr.notify_update_response self.notify_update_response = umgr.notify_update_response
self.repo = config.get('repo').strip().strip("/") self.repo = config.get('repo').strip().strip("/")
self.name = self.repo.split("/")[-1] self.owner, self.name = self.repo.split("/", 1)
if hasattr(config, "get_name"): if hasattr(config, "get_name"):
self.name = config.get_name().split()[-1] self.name = config.get_name().split()[-1]
self.path = os.path.realpath(os.path.expanduser( self.path = os.path.realpath(os.path.expanduser(
@ -964,6 +970,7 @@ class WebUpdater:
def get_update_status(self): def get_update_status(self):
return { return {
'name': self.name, 'name': self.name,
'owner': self.owner,
'version': self.version, 'version': self.version,
'remote_version': self.remote_version 'remote_version': self.remote_version
} }