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

update_manager: report detected_type and configured_type for applications 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-07-08 09:02:08 -04:00
parent d76abe019f
commit dacd9f7565
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moonraker/components/update_manager/app_deploy.py
View File

@ -166,7 +166,7 @@ class AppDeploy(BaseDeploy):
'debug_enabled': self.debug, 'debug_enabled': self.debug,
'need_channel_update': self.need_channel_update, 'need_channel_update': self.need_channel_update,
'is_valid': self._is_valid, 'is_valid': self._is_valid,
'type': self.type 'configured_type': self.type
} }
async def _get_file_hash(self, async def _get_file_hash(self,

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

@ -578,6 +578,7 @@ class GitRepo:
def get_repo_status(self) -> Dict[str, Any]: def get_repo_status(self) -> Dict[str, Any]:
return { return {
'detected_type': "git_repo",
'remote_alias': self.git_remote, 'remote_alias': self.git_remote,
'branch': self.git_branch, 'branch': self.git_branch,
'owner': self.git_owner, 'owner': self.git_owner,
@ -589,7 +590,8 @@ class GitRepo:
'detached': self.head_detached, 'detached': self.head_detached,
'commits_behind': self.commits_behind, 'commits_behind': self.commits_behind,
'git_messages': self.git_messages, 'git_messages': self.git_messages,
'full_version_string': self.full_version_string 'full_version_string': self.full_version_string,
'pristine': not self.dirty
} }
def get_version(self, upstream: bool = False) -> Tuple[Any, ...]: def get_version(self, upstream: bool = False) -> Tuple[Any, ...]:

15
moonraker/components/update_manager/zip_deploy.py
View File

@ -58,6 +58,7 @@ class ZipDeploy(AppDeploy):
"Invalid url set for 'origin' option in section " "Invalid url set for 'origin' option in section "
f"[{config.get_name()}]. Unable to extract owner/repo.") f"[{config.get_name()}]. Unable to extract owner/repo.")
self.host_repo: str = config.get('host_repo', self.official_repo) self.host_repo: str = config.get('host_repo', self.official_repo)
self.detected_type: str = "?"
self.source_checksum: str = "" self.source_checksum: str = ""
self.pristine = False self.pristine = False
self.verified = False self.verified = False
@ -125,8 +126,14 @@ class ZipDeploy(AppDeploy):
for key in RINFO_KEYS: for key in RINFO_KEYS:
if key not in release_info: if key not in release_info:
self._add_error(f"Missing release info item: {key}") self._add_error(f"Missing release info item: {key}")
local_channel = release_info.get('channel', "?") self.detected_type = "?"
self.need_channel_update = self.channel != local_channel self.need_channel_update = False
if 'channel' in release_info:
local_channel = release_info['channel']
self.need_channel_update = self.channel != local_channel
self.detected_type = "zip"
if local_channel == "beta":
self.detected_type = "zip_beta"
self.full_version = release_info.get('long_version', "?") self.full_version = release_info.get('long_version', "?")
self.short_version = self._get_tag_version( self.short_version = self._get_tag_version(
release_info.get('git_version', "")) release_info.get('git_version', ""))
@ -245,6 +252,9 @@ class ZipDeploy(AppDeploy):
self._add_error( self._add_error(
"RELEASE_INFO not found in latest release assets") "RELEASE_INFO not found in latest release assets")
self.commit_log = [] self.commit_log = []
if self.short_version == self.latest_version:
# No need to report the commit log when versions match
return
if "COMMIT_LOG" in asset_info: if "COMMIT_LOG" in asset_info:
asset_url, content_type, size = asset_info['COMMIT_LOG'] asset_url, content_type, size = asset_info['COMMIT_LOG']
commit_bytes = await self.cmd_helper.http_download_request( commit_bytes = await self.cmd_helper.http_download_request(
@ -388,6 +398,7 @@ class ZipDeploy(AppDeploy):
# client functionality. In the future it would be # client functionality. In the future it would be
# good to report values that are specifc # good to report values that are specifc
status.update({ status.update({
'detected_type': self.detected_type,
'remote_alias': "origin", 'remote_alias': "origin",
'branch': "master", 'branch': "master",
'owner': self.owner, 'owner': self.owner,