From 3fc73c37df33037f42c85003708467bb35f046ff Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Fri, 30 Aug 2024 21:05:36 +0200 Subject: [PATCH] build: cleanup Signed-off-by: AuxXxilium --- .github/workflows/update.yml | 6 -- scripts/func.py | 163 ----------------------------------- update.sh | 4 +- 3 files changed, 2 insertions(+), 171 deletions(-) delete mode 100755 scripts/func.py diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index f0a51b0..1de2c82 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -61,12 +61,6 @@ jobs: sudo rm -rf ./files sudo rm -rf ./dsm - - name: Get data - run: | - sudo pip install -r scripts/requirements.txt - sudo python scripts/func.py getmodels -w "." -j "models.json" - sudo python scripts/func.py getpats -w "." -j "pats.json" - - name: Update run: | sudo ./update.sh diff --git a/scripts/func.py b/scripts/func.py deleted file mode 100755 index 594f345..0000000 --- a/scripts/func.py +++ /dev/null @@ -1,163 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2023 AuxXxilium and Ing -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# - -import os, sys, glob, json, yaml, click, shutil, tarfile, kmodule, requests -from openpyxl import Workbook - - -@click.group() -def cli(): - """ - The CLI is a commands to Arc. - """ - pass - - -@cli.command() -@click.option("-w", "--workpath", type=str, required=True, help="The workpath of Arc.") -@click.option("-j", "--jsonpath", type=str, required=True, help="The output path of jsonfile.") -def getmodels(workpath, jsonpath): - - models = {} - with open("{}/platforms.yml".format(workpath), "r") as f: - P_data = yaml.safe_load(f) - P_platforms = P_data.get("platforms", []) - for P in P_platforms: - productvers = {} - for V in P_platforms[P]["productvers"]: - if P_platforms[P]["productvers"][V].get("kpre", "") != "": - productvers[V] = (P_platforms[P]["productvers"][V].get("kpre", "") + "-" + P_platforms[P]["productvers"][V].get("kver", "")) - else: - productvers[V] = P_platforms[P]["productvers"][V].get("kver", "") - models[P] = {"productvers": productvers, "models": []} - - req = requests.get("https://autoupdate.synology.com/os/v2") - req.encoding = "utf-8" - data = json.loads(req.text) - - for I in data["channel"]["item"]: - if not I["title"].startswith("DSM"): - continue - for J in I["model"]: - arch = J["mUnique"].split("_")[1].lower() - name = J["mLink"].split("/")[-1].split("_")[1].replace("%2B", "+") - if arch not in models.keys(): - continue - if name in (A for B in models for A in models[B]["models"]): - continue - models[arch]["models"].append(name) - - if jsonpath: - with open(jsonpath, "w") as f: - json.dump(models, f, indent=4, ensure_ascii=False) - -@cli.command() -@click.option("-w", "--workpath", type=str, required=True, help="The workpath of Arc.") -@click.option("-j", "--jsonpath", type=str, required=True, help="The output path of jsonfile.") -def getpats(workpath, jsonpath): - def __fullversion(ver): - out = ver - arr = ver.split('-') - if len(arr) > 0: - a = arr[0].split('.')[0] if len(arr[0].split('.')) > 0 else '0' - b = arr[0].split('.')[1] if len(arr[0].split('.')) > 1 else '0' - c = arr[0].split('.')[2] if len(arr[0].split('.')) > 2 else '0' - d = arr[1] if len(arr) > 1 else '00000' - e = arr[2] if len(arr) > 2 else '0' - out = '{}.{}.{}-{}-{}'.format(a,b,c,d,e) - return out - - platforms = [] - models = [] - with open("{}/platforms.yml".format(workpath), "r") as f: - data = yaml.safe_load(f) - platforms = data.get("platforms", []) - - req = requests.get("https://autoupdate.synology.com/os/v2") - req.encoding = "utf-8" - data = json.loads(req.text) - - for I in data["channel"]["item"]: - if not I["title"].startswith("DSM"): - continue - for J in I["model"]: - arch = J["mUnique"].split("_")[1].lower() - name = J["mLink"].split("/")[-1].split("_")[1].replace("%2B", "+") - if arch not in platforms: - continue - if name in models: - continue - models.append(name) - - pats = {} - for M in models: - pats[M] = {} - version = '7' - urlInfo = "https://www.synology.com/api/support/findDownloadInfo?lang=en-us" - urlSteps = "https://www.synology.com/api/support/findUpgradeSteps?" - #urlInfo = "https://www.synology.cn/api/support/findDownloadInfo?lang=zh-cn" - #urlSteps = "https://www.synology.cn/api/support/findUpgradeSteps?" - - major = "&major={}".format(version.split('.')[0]) if len(version.split('.')) > 0 else "" - minor = "&minor={}".format(version.split('.')[1]) if len(version.split('.')) > 1 else "" - req = requests.get("{}&product={}{}{}".format(urlInfo, M.replace("+", "%2B"), major, minor)) - req.encoding = "utf-8" - data = json.loads(req.text) - - build_ver = data['info']['system']['detail'][0]['items'][0]['build_ver'] - build_num = data['info']['system']['detail'][0]['items'][0]['build_num'] - buildnano = data['info']['system']['detail'][0]['items'][0]['nano'] - V=__fullversion("{}-{}-{}".format(build_ver, build_num, buildnano)) - if not V in pats[M]: - pats[M][V]={} - pats[M][V]['url'] = data['info']['system']['detail'][0]['items'][0]['files'][0]['url'].split('?')[0] - pats[M][V]['sum'] = data['info']['system']['detail'][0]['items'][0]['files'][0]['checksum'] - - from_ver=0 - for I in data['info']['pubVers']: - if from_ver == 0 or I['build'] < from_ver: from_ver = I['build'] - - for I in data['info']['productVers']: - if not I['version'].startswith(version): continue - if major == "" or minor == "": - majorTmp = "&major={}".format(I['version'].split('.')[0]) if len(I['version'].split('.')) > 0 else "" - minorTmp = "&minor={}".format(I['version'].split('.')[1]) if len(I['version'].split('.')) > 1 else "" - reqTmp = requests.get("{}&product={}{}{}".format(urlInfo, M.replace("+", "%2B"), majorTmp, minorTmp)) - reqTmp.encoding = "utf-8" - dataTmp = json.loads(reqTmp.text) - - build_ver = dataTmp['info']['system']['detail'][0]['items'][0]['build_ver'] - build_num = dataTmp['info']['system']['detail'][0]['items'][0]['build_num'] - buildnano = dataTmp['info']['system']['detail'][0]['items'][0]['nano'] - V=__fullversion("{}-{}-{}".format(build_ver, build_num, buildnano)) - if not V in pats[M]: - pats[M][V]={} - pats[M][V]['url'] = dataTmp['info']['system']['detail'][0]['items'][0]['files'][0]['url'].split('?')[0] - pats[M][V]['sum'] = dataTmp['info']['system']['detail'][0]['items'][0]['files'][0]['checksum'] - - for J in I['versions']: - to_ver=J['build'] - reqSteps = requests.get("{}&product={}&from_ver={}&to_ver={}".format(urlSteps, M.replace("+", "%2B"), from_ver, to_ver)) - if reqSteps.status_code != 200: continue - reqSteps.encoding = "utf-8" - dataSteps = json.loads(reqSteps.text) - for S in dataSteps['upgrade_steps']: - if not 'full_patch' in S or S['full_patch'] is False: continue - if not 'build_ver' in S or not S['build_ver'].startswith(version): continue - V=__fullversion("{}-{}-{}".format(S['build_ver'], S['build_num'], S['nano'])) - if not V in pats[M]: - pats[M][V] = {} - pats[M][V]['url'] = S['files'][0]['url'].split('?')[0] - pats[M][V]['sum'] = S['files'][0]['checksum'] - - if jsonpath: - with open(jsonpath, "w") as f: - json.dump(pats, f, indent=4, ensure_ascii=False) - -if __name__ == "__main__": - cli() diff --git a/update.sh b/update.sh index 096b5a3..b6c528f 100755 --- a/update.sh +++ b/update.sh @@ -31,9 +31,9 @@ function getDSM() { echo "" >>"${TMP_PATH}/dsmdata.yml" echo "${MODEL} ${URLVER} (${VERSION})" >>"${TMP_PATH}/dsmdata.yml" echo "${PAT_URL}" - echo "URL: ${PAT_URL}" >>"${TMP_PATH}/dsmdata.yml" + echo "Url: ${PAT_URL}" >>"${TMP_PATH}/dsmdata.yml" echo "${PAT_HASH}" - echo "HASH: ${PAT_HASH}" >>"${TMP_PATH}/dsmdata.yml" + echo "Hash: ${PAT_HASH}" >>"${TMP_PATH}/dsmdata.yml" if [ -f "${DESTINATION}/pat_url" ] && [ -f "${DESTINATION}/pat_hash" ]; then OLDURL="$(cat "${DESTINATION}/pat_url")" OLDHASH="$(cat "${DESTINATION}/pat_hash")"