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

update_manager: add support for application tags 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-02-13 08:51:47 -05:00
parent 92eda982ce
commit ecfad5cff1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,7 @@ class AppDeploy(BaseDeploy):
self._verify_path(config, 'env', self.executable) self._verify_path(config, 'env', self.executable)
self.venv_args = config.get('venv_args', None) self.venv_args = config.get('venv_args', None)
self.info_tags: List[str] = config.getlist("info_tags", [])
self.is_service = config.getboolean("is_system_service", True) self.is_service = config.getboolean("is_system_service", True)
storage = self._load_storage() storage = self._load_storage()
self.need_channel_update = storage.get('need_channel_upate', False) self.need_channel_update = storage.get('need_channel_upate', False)
@ -193,7 +194,8 @@ 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,
'configured_type': self.type 'configured_type': self.type,
'info_tags': self.info_tags
} }
def get_persistent_data(self) -> Dict[str, Any]: def get_persistent_data(self) -> Dict[str, Any]:

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

@ -1289,6 +1289,7 @@ class WebClientDeploy(BaseDeploy):
self.path = pathlib.Path(config.get("path")).expanduser().resolve() self.path = pathlib.Path(config.get("path")).expanduser().resolve()
self.type = config.get('type') self.type = config.get('type')
self.channel = "stable" if self.type == "web" else "beta" self.channel = "stable" if self.type == "web" else "beta"
self.info_tags: List[str] = config.getlist("info_tags", [])
self.persistent_files: List[str] = [] self.persistent_files: List[str] = []
pfiles = config.getlist('persistent_files', None) pfiles = config.getlist('persistent_files', None)
if pfiles is not None: if pfiles is not None:
@ -1436,7 +1437,8 @@ class WebClientDeploy(BaseDeploy):
'version': self.version, 'version': self.version,
'remote_version': self.remote_version, 'remote_version': self.remote_version,
'configured_type': self.type, 'configured_type': self.type,
'channel': self.channel 'channel': self.channel,
'info_tags': self.info_tags
} }
def load_component(config: ConfigHelper) -> UpdateManager: def load_component(config: ConfigHelper) -> UpdateManager: