CreatBot/CreatBotMoonraker
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新提示优化

Browse Source 
(cherry picked from commit defb4580255f96b5aa6b81f7c7188afe304bf7b1)
This commit is contained in:
张开科 2024-08-08 15:39:28 +08:00
parent 966cb8cc96
commit 7d9cd6c869
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moonraker/components/update_manager/common.py
View File

@ -26,7 +26,7 @@ KLIPPER_DEFAULT_EXEC = os.path.expanduser("~/klippy-env/bin/python")
BASE_CONFIG: Dict[str, Dict[str, str]] = { BASE_CONFIG: Dict[str, Dict[str, str]] = {
"moonraker": { "moonraker": {
"origin": "https://github.com/arksine/moonraker.git", "origin": "https://github.com/CreatBotOfficail/CreatBotMoonraker.git",
"requirements": "scripts/moonraker-requirements.txt", "requirements": "scripts/moonraker-requirements.txt",
"venv_args": "-p python3", "venv_args": "-p python3",
"system_dependencies": "scripts/system-dependencies.json", "system_dependencies": "scripts/system-dependencies.json",
@ -37,8 +37,8 @@ BASE_CONFIG: Dict[str, Dict[str, str]] = {
"managed_services": "moonraker" "managed_services": "moonraker"
}, },
"klipper": { "klipper": {
"moved_origin": "https://github.com/kevinoconnor/klipper.git", "moved_origin": "https://github.com/CreatBotOfficail/CreatBotKlipper.git",
"origin": "https://github.com/Klipper3d/klipper.git", "origin": "https://github.com/CreatBotOfficail/CreatBotKlipper.git",
"requirements": "scripts/klippy-requirements.txt", "requirements": "scripts/klippy-requirements.txt",
"venv_args": "-p python2", "venv_args": "-p python2",
"install_script": "scripts/install-octopi.sh", "install_script": "scripts/install-octopi.sh",

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

@ -46,7 +46,7 @@ class PackageDeploy(BaseDeploy):
async def initialize(self) -> Dict[str, Any]: async def initialize(self) -> Dict[str, Any]:
storage = await super().initialize() storage = await super().initialize()
self.available_packages = storage.get('packages', []) # self.available_packages = storage.get('packages', [])
provider: BasePackageProvider provider: BasePackageProvider
try_fallback = True try_fallback = True
if self.use_packagekit: if self.use_packagekit:
@ -100,7 +100,7 @@ class PackageDeploy(BaseDeploy):
# Do not force a refresh until the server has started # Do not force a refresh until the server has started
if self.server.is_running(): if self.server.is_running():
await self._update_package_cache(force=True) await self._update_package_cache(force=True)
self.available_packages = await self.provider.get_packages() # self.available_packages = await self.provider.get_packages()
pkg_msg = "\n".join(self.available_packages) pkg_msg = "\n".join(self.available_packages)
self.log_info( self.log_info(
f"Detected {len(self.available_packages)} package updates:" f"Detected {len(self.available_packages)} package updates:"

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

@ -138,7 +138,7 @@ class ZipDeploy(AppDeploy):
async def _detect_fallback(self) -> bool: async def _detect_fallback(self) -> bool:
# Only used by "web" app types to fallback on the previous version info # Only used by "web" app types to fallback on the previous version info
fallback_defs = { fallback_defs = {
"mainsail": "mainsail-crew", "CreatBotMainsail": "CreatBotOfficail",
"fluidd": "fluidd-core" "fluidd": "fluidd-core"
} }
for fname in ("manifest.json", "manifest.webmanifest"): for fname in ("manifest.json", "manifest.webmanifest"):