mirror of
https://github.com/LmeSzinc/AzurLaneAutoScript.git
synced 2025-01-07 08:06:49 +08:00
Add: git-over-cdn
This commit is contained in:
LmeSzinc
parent
a7f0a0231a
commit
1b9fd01852
@ -61,6 +61,9 @@ class ConfigModel:
|
||||
CDN: Union[str, bool] = False
|
||||
Run: Optional[str] = None
|
||||
|
||||
# Dynamic
|
||||
GitOverCdn: bool = False
|
||||
|
||||
|
||||
class DeployConfig(ConfigModel):
|
||||
def __init__(self, file=DEPLOY_CONFIG):
|
||||
@ -79,6 +82,18 @@ class DeployConfig(ConfigModel):
|
||||
'https://git.saarcenter.com/LmeSzinc/AzurLaneAutoScript.git',
|
||||
]:
|
||||
self.Repository = 'git://git.lyoko.io/AzurLaneAutoScript'
|
||||
|
||||
# Bypass webui.config.DeployConfig.__setattr__()
|
||||
# Don't write these into deploy.yaml
|
||||
super().__setattr__(
|
||||
'GitOverCdn',
|
||||
self.Repository == 'git://git.lyoko.io/AzurLaneAutoScript' and self.Branch == 'master'
|
||||
)
|
||||
if self.Repository in ['global']:
|
||||
super().__setattr__('Repository', 'https://github.com/LmeSzinc/AzurLaneAutoScript')
|
||||
if self.Repository in ['cn']:
|
||||
super().__setattr__('Repository', 'git://git.lyoko.io/AzurLaneAutoScript')
|
||||
|
||||
self.write()
|
||||
self.show_config()
|
||||
|
||||
@ -87,7 +102,7 @@ class DeployConfig(ConfigModel):
|
||||
for k, v in self.config.items():
|
||||
if k in ("Password", "SSHUser"):
|
||||
continue
|
||||
if self.config_template[k] == v:
|
||||
if self.config_template.get(k) == v:
|
||||
continue
|
||||
logger.info(f"{k}: {v}")
|
||||
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
import os
|
||||
|
||||
from deploy.config import DeployConfig
|
||||
from deploy.git_over_cdn.client import GitOverCdnClient
|
||||
from deploy.logger import logger
|
||||
from deploy.utils import *
|
||||
|
||||
@ -78,6 +77,18 @@ class GitManager(DeployConfig):
|
||||
logger.hr('Show Version', 1)
|
||||
self.execute(f'"{self.git}" --no-pager log --no-merges -1')
|
||||
|
||||
@property
|
||||
def goc_client(self):
|
||||
client = GitOverCdnClient(
|
||||
url='https://vip.123pan.cn/1818706573/pack/LmeSzinc_AzurLaneAutoScript_master',
|
||||
folder=self.root_filepath,
|
||||
source='origin',
|
||||
branch='master',
|
||||
git=self.git,
|
||||
)
|
||||
client.logger = logger
|
||||
return client
|
||||
|
||||
def git_install(self):
|
||||
logger.hr('Update Alas', 0)
|
||||
|
||||
@ -85,6 +96,10 @@ class GitManager(DeployConfig):
|
||||
logger.info('AutoUpdate is disabled, skip')
|
||||
return
|
||||
|
||||
if self.GitOverCdn:
|
||||
if self.goc_client.update(keep_changes=self.KeepLocalChanges):
|
||||
return
|
||||
|
||||
self.git_repository_init(
|
||||
repo=self.Repository,
|
||||
source='origin',
|
||||
|
||||
263
deploy/git_over_cdn/client.py
Normal file
263
deploy/git_over_cdn/client.py
Normal file
@ -0,0 +1,263 @@
|
||||
import io
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import zipfile
|
||||
from typing import Callable, Generic, TypeVar
|
||||
|
||||
import requests
|
||||
from requests.adapters import HTTPAdapter
|
||||
|
||||
T = TypeVar("T")
|
||||
|
||||
TEMPLATE_FILE = './config/template.yaml'
|
||||
|
||||
|
||||
class cached_property(Generic[T]):
|
||||
"""
|
||||
cached-property from https://github.com/pydanny/cached-property
|
||||
Add typing support
|
||||
|
||||
A property that is only computed once per instance and then replaces itself
|
||||
with an ordinary attribute. Deleting the attribute resets the property.
|
||||
Source: https://github.com/bottlepy/bottle/commit/fa7733e075da0d790d809aa3d2f53071897e6f76
|
||||
"""
|
||||
|
||||
def __init__(self, func: Callable[..., T]):
|
||||
self.func = func
|
||||
|
||||
def __get__(self, obj, cls) -> T:
|
||||
if obj is None:
|
||||
return self
|
||||
|
||||
value = obj.__dict__[self.func.__name__] = self.func(obj)
|
||||
return value
|
||||
|
||||
|
||||
class PrintLogger:
|
||||
info = print
|
||||
warning = print
|
||||
error = print
|
||||
|
||||
@staticmethod
|
||||
def attr(name, text):
|
||||
print(f'[{name}] {text}')
|
||||
|
||||
|
||||
class GitOverCdnClient:
|
||||
logger = PrintLogger()
|
||||
|
||||
def __init__(self, url, folder, source='origin', branch='master', git='git'):
|
||||
"""
|
||||
Args:
|
||||
url: http://127.0.0.1:22251/pack/LmeSzinc_AzurLaneAutoScript_master/
|
||||
folder: D:/AzurLaneAutoScript
|
||||
"""
|
||||
self.url = url.strip('/')
|
||||
self.folder = folder.replace('\\', '/')
|
||||
self.source = source
|
||||
self.branch = branch
|
||||
self.git = git
|
||||
|
||||
def filepath(self, path):
|
||||
path = os.path.join(self.folder, '.git', path)
|
||||
return os.path.abspath(path).replace('\\', '/')
|
||||
|
||||
def urlpath(self, path):
|
||||
return f'{self.url}{path}'
|
||||
|
||||
@cached_property
|
||||
def current_commit(self) -> str:
|
||||
for file in [
|
||||
f'./refs/remotes/{self.source}/{self.branch}',
|
||||
f'./refs/heads/{self.branch}',
|
||||
'ORIG_HEAD',
|
||||
]:
|
||||
file = self.filepath(file)
|
||||
try:
|
||||
with open(file, 'r', encoding='utf-8') as f:
|
||||
commit = f.read()
|
||||
res = re.search(r'([0-9a-f]{40})', commit)
|
||||
if res:
|
||||
commit = res.group(1)
|
||||
self.logger.attr('CurrentCommit', commit)
|
||||
return commit
|
||||
except FileNotFoundError as e:
|
||||
self.logger.error(f'Failed to get local commit: {e}')
|
||||
except Exception as e:
|
||||
self.logger.error(f'Failed to get local commit: {e}')
|
||||
return ''
|
||||
|
||||
@property
|
||||
def session(self):
|
||||
session = requests.Session()
|
||||
session.trust_env = False
|
||||
session.mount('http://', HTTPAdapter(max_retries=3))
|
||||
session.mount('https://', HTTPAdapter(max_retries=3))
|
||||
return session
|
||||
|
||||
@cached_property
|
||||
def latest_commit(self) -> str:
|
||||
try:
|
||||
url = self.urlpath('/latest.json')
|
||||
self.logger.info(f'Fetch url: {url}')
|
||||
resp = self.session.get(url, timeout=3)
|
||||
except Exception as e:
|
||||
self.logger.error(f'Failed to get remote commit: {e}')
|
||||
return ''
|
||||
|
||||
if resp.status_code == 200:
|
||||
try:
|
||||
info = json.loads(resp.text)
|
||||
commit = info['commit']
|
||||
self.logger.attr('LatestCommit', commit)
|
||||
return commit
|
||||
except json.JSONDecodeError:
|
||||
self.logger.error(f'Failed to get remote commit, response is not a json: {resp.text}')
|
||||
return ''
|
||||
except KeyError:
|
||||
self.logger.error(f'Failed to get remote commit, key "commit" is not found: {resp.text}')
|
||||
return ''
|
||||
else:
|
||||
self.logger.error(f'Failed to get remote commit, status={resp.status_code}, text={resp.text}')
|
||||
return ''
|
||||
|
||||
def download_pack(self):
|
||||
try:
|
||||
url = self.urlpath(f'/{self.latest_commit}/{self.current_commit}.zip')
|
||||
self.logger.info(f'Fetch url: {url}')
|
||||
resp = self.session.get(url, timeout=20)
|
||||
except Exception as e:
|
||||
self.logger.error(f'Failed to download pack: {e}')
|
||||
return False
|
||||
|
||||
if resp.status_code == 200:
|
||||
try:
|
||||
zipped = zipfile.ZipFile(io.BytesIO(resp.content))
|
||||
for file in [f'pack-{self.latest_commit}.pack', f'pack-{self.latest_commit}.idx']:
|
||||
self.logger.info(f'Unzip {file}')
|
||||
member = zipped.getinfo(file)
|
||||
tmp = self.filepath(f'./objects/pack/{file}.tmp')
|
||||
out = self.filepath(f'./objects/pack/{file}')
|
||||
with zipped.open(member) as source, open(tmp, "wb") as target:
|
||||
shutil.copyfileobj(source, target)
|
||||
os.replace(tmp, out)
|
||||
return True
|
||||
except zipfile.BadZipFile as e:
|
||||
# File is not a zip file
|
||||
self.logger.error(e)
|
||||
return False
|
||||
except KeyError as e:
|
||||
# There is no item named 'xxx.idx' in the archive
|
||||
self.logger.error(e)
|
||||
return False
|
||||
except Exception as e:
|
||||
self.logger.error(e)
|
||||
return False
|
||||
elif resp.status_code == 404:
|
||||
self.logger.error(f'Failed to download pack, status={resp.status_code}, no such pack files provided')
|
||||
return False
|
||||
else:
|
||||
self.logger.error(f'Failed to download pack, status={resp.status_code}, text={resp.text}')
|
||||
return False
|
||||
|
||||
def update_refs(self):
|
||||
file = self.filepath(f'./refs/remotes/{self.source}/{self.branch}')
|
||||
text = f'{self.latest_commit}\n'
|
||||
self.logger.info(f'Update refs: {file}')
|
||||
os.makedirs(os.path.dirname(file), exist_ok=True)
|
||||
try:
|
||||
with open(file, 'w', encoding='utf-8', newline='') as f:
|
||||
f.write(text)
|
||||
return True
|
||||
except FileNotFoundError as e:
|
||||
self.logger.error(f'Failed to get local commit: {e}')
|
||||
except Exception as e:
|
||||
self.logger.error(f'Failed to get local commit: {e}')
|
||||
|
||||
return False
|
||||
|
||||
def git_command(self, *args, timeout=300):
|
||||
"""
|
||||
Execute ADB commands in a subprocess,
|
||||
usually to be used when pulling or pushing large files.
|
||||
|
||||
Args:
|
||||
timeout (int):
|
||||
|
||||
Returns:
|
||||
str:
|
||||
"""
|
||||
os.chdir(self.folder)
|
||||
cmd = list(map(str, args))
|
||||
cmd = [self.git] + cmd
|
||||
self.logger.info(f'Execute: {cmd}')
|
||||
|
||||
process = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=False)
|
||||
try:
|
||||
stdout, stderr = process.communicate(timeout=timeout)
|
||||
except subprocess.TimeoutExpired:
|
||||
process.kill()
|
||||
stdout, stderr = process.communicate()
|
||||
self.logger.warning(f'TimeoutExpired when calling {cmd}, stdout={stdout}, stderr={stderr}')
|
||||
return stdout.decode()
|
||||
|
||||
def git_reset(self, keep_changes=False):
|
||||
"""
|
||||
git reset --hard <commit>
|
||||
"""
|
||||
if keep_changes:
|
||||
self.git_command('stash')
|
||||
self.git_command('reset', '--hard', f'{self.source}/{self.branch}')
|
||||
self.git_command('stash', 'pop')
|
||||
else:
|
||||
self.git_command('reset', '--hard', f'{self.source}/{self.branch}')
|
||||
|
||||
def is_uptodate(self):
|
||||
"""
|
||||
Returns:
|
||||
bool: If repo is up-to-date
|
||||
"""
|
||||
_ = self.current_commit
|
||||
_ = self.latest_commit
|
||||
if not self.current_commit:
|
||||
self.logger.error('Failed to get current commit')
|
||||
return False
|
||||
if not self.latest_commit:
|
||||
self.logger.error('Failed to get latest commit')
|
||||
return False
|
||||
if self.current_commit == self.latest_commit:
|
||||
self.logger.info('Already up to date')
|
||||
return True
|
||||
return False
|
||||
|
||||
def update(self, keep_changes=False):
|
||||
"""
|
||||
Args:
|
||||
keep_changes:
|
||||
|
||||
Returns:
|
||||
bool: If repo is up-to-date
|
||||
"""
|
||||
_ = self.current_commit
|
||||
_ = self.latest_commit
|
||||
if not self.current_commit:
|
||||
self.logger.error('Failed to get current commit')
|
||||
return False
|
||||
if not self.latest_commit:
|
||||
self.logger.error('Failed to get latest commit')
|
||||
return False
|
||||
if self.current_commit == self.latest_commit:
|
||||
self.logger.info('Already up to date')
|
||||
self.git_reset(keep_changes=keep_changes)
|
||||
return True
|
||||
|
||||
if not self.download_pack():
|
||||
return False
|
||||
if not self.update_refs():
|
||||
return False
|
||||
self.git_reset(keep_changes=keep_changes)
|
||||
self.logger.info('Update success')
|
||||
return True
|
||||
@ -33,4 +33,9 @@ def hr(title, level=3):
|
||||
logger.info(f"<<< {title} >>>")
|
||||
|
||||
|
||||
def attr(name, text):
|
||||
print(f'[{name}] {text}')
|
||||
|
||||
|
||||
logger.hr = hr
|
||||
logger.attr = attr
|
||||
|
||||
@ -68,6 +68,15 @@ class Updater(DeployConfig, GitManager, PipManager):
|
||||
|
||||
def _check_update(self) -> bool:
|
||||
self.state = "checking"
|
||||
|
||||
if State.deploy_config.GitOverCdn:
|
||||
if self.goc_client.is_uptodate():
|
||||
logger.info(f"No update")
|
||||
return False
|
||||
else:
|
||||
logger.info(f"New update available")
|
||||
return True
|
||||
|
||||
source = "origin"
|
||||
for _ in range(3):
|
||||
if self.execute(
|
||||
|
||||
Loading…
Reference in New Issue
Block a user