From c390e9605acbca15a26428c81136844bcd10cc9f Mon Sep 17 00:00:00 2001 From: MistEO Date: Thu, 14 Mar 2024 17:00:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9F=BA=E6=9C=AC=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/install.yml | 165 +++++ .gitignore | 600 +++++++++++++----- .gitmodules | 3 + .vscode/settings.json | 20 + README.md | 2 +- assets/MaaCommonAssets | 1 + assets/interface.json | 67 ++ assets/resource/base/model/.gitignore | 1 + .../resource/base/pipeline/base/my_task.json | 5 + configure.py | 17 + install.py | 69 ++ 11 files changed, 793 insertions(+), 157 deletions(-) create mode 100644 .github/workflows/install.yml create mode 100644 .gitmodules create mode 100644 .vscode/settings.json create mode 160000 assets/MaaCommonAssets create mode 100644 assets/interface.json create mode 100644 assets/resource/base/model/.gitignore create mode 100644 assets/resource/base/pipeline/base/my_task.json create mode 100644 configure.py create mode 100644 install.py diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml new file mode 100644 index 0000000..89b51d6 --- /dev/null +++ b/.github/workflows/install.yml @@ -0,0 +1,165 @@ +name: install + +on: + push: + tags: + - "v*" + branches: + - "**" + paths: + - ".github/workflows/install.yml" + - "assets/**" + - "**.py" + pull_request: + branches: + - "**" + paths: + - ".github/workflows/install.yml" + - "assets/**" + - "**.py" + workflow_dispatch: + +jobs: + meta: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - id: set_tag + run: | + is_release=${{ startsWith(github.ref, 'refs/tags/v') }} + tag=$(git describe --tags --match "v*" ${{ github.ref }} || true) + if [[ $tag != v* ]]; then + tag=$(curl -sX GET "https://api.github.com/repos/${{ github.repository }}/releases/latest" --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' | awk '/tag_name/{print $4}' FS='["]') + if [[ $tag != v* ]]; then + tag="v0.0.0" + fi + tag=$(date "+$tag-%y%m%d-$(git rev-parse --short HEAD)") + fi + if ! $($is_release) ; then + prefix=${tag%-*-*} + suffix=${tag#$prefix-} + tag="$prefix-ci.$suffix" + fi + + echo tag=$tag | tee -a $GITHUB_OUTPUT + echo is_release=$is_release | tee -a $GITHUB_OUTPUT + outputs: + tag: ${{ steps.set_tag.outputs.tag }} + is_release: ${{ steps.set_tag.outputs.is_release }} + + windows: + needs: meta + runs-on: windows-latest + strategy: + matrix: + arch: [aarch64, x86_64] + fail-fast: false + + steps: + - uses: actions/checkout@v3 + with: + submodules: true + + - name: Download MaaFramework + uses: robinraju/release-downloader@v1.8 + with: + repository: MaaXYZ/MaaFramework + fileName: "MAA-win-${{ matrix.arch }}*" + latest: true + out-file-path: "deps" + extract: true + + - name: Install + shell: bash + run: | + python ./install.py ${{ needs.meta.outputs.tag }} + + - uses: actions/upload-artifact@v3 + with: + name: MaaXXX-win-${{ matrix.arch }} + path: "install" + + ubuntu: + needs: meta + runs-on: ubuntu-latest + strategy: + matrix: + arch: [aarch64, x86_64] + fail-fast: false + + steps: + - uses: actions/checkout@v3 + with: + submodules: true + + - name: Download MaaFramework + uses: robinraju/release-downloader@v1.8 + with: + repository: MaaXYZ/MaaFramework + fileName: "MAA-linux-${{ matrix.arch }}*" + latest: true + out-file-path: "deps" + extract: true + + - name: Install + shell: bash + run: | + python ./install.py ${{ needs.meta.outputs.tag }} + + - uses: actions/upload-artifact@v3 + with: + name: MaaXXX-linux-${{ matrix.arch }} + path: "install" + + macos: + needs: meta + runs-on: macos-latest + strategy: + matrix: + arch: [aarch64, x86_64] + fail-fast: false + + steps: + - uses: actions/checkout@v3 + with: + submodules: true + + - name: Download MaaFramework + uses: robinraju/release-downloader@v1.8 + with: + repository: MaaXYZ/MaaFramework + fileName: "MAA-macos-${{ matrix.arch }}*" + latest: true + out-file-path: "deps" + extract: true + + - name: Install + shell: bash + run: | + python ./install.py ${{ needs.meta.outputs.tag }} + + - uses: actions/upload-artifact@v3 + with: + name: MaaXXX-macos-${{ matrix.arch }} + path: "install" + + release: + if: ${{ needs.meta.outputs.is_release == 'true' }} + needs: [meta, windows, ubuntu, macos] + runs-on: ubuntu-latest + steps: + - uses: actions/download-artifact@v3 + with: + path: assets + + - run: | + cd assets + for f in *; do + (cd $f && zip -r ../$f-${{ needs.meta.outputs.tag }}.zip .) + done + - uses: softprops/action-gh-release@v1 + with: + files: assets/* + tag_name: ${{ needs.meta.outputs.tag }} diff --git a/.gitignore b/.gitignore index 68bc17f..a652f0b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,160 +1,448 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class +# docs +docs/node_modules +docs/.vuepress/.temp +# Prerequisites +*.d + +# Compiled Object files +build +build-* +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch -# C extensions +# Compiled Dynamic libraries *.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod +!go.mod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + +Debug +Release +.vs +*.vcxproj.user +*.swp + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ -cover/ - -# Translations -*.mo -*.pot - -# Django stuff: +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ +cmake-build-debug/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj *.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -.pybuilder/ -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -# For a library or package, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# .python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# poetry -# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. -# This is especially recommended for binary packages to ensure reproducibility, and is more -# commonly ignored for libraries. -# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control -#poetry.lock - -# pdm -# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. -#pdm.lock -# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it -# in version control. -# https://pdm.fming.dev/#use-with-ide -.pdm.toml - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -# pytype static type analyzer -.pytype/ - -# Cython debug symbols -cython_debug/ - -# PyCharm -# JetBrains specific template is maintained in a separate JetBrains.gitignore that can -# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore -# and can be added to the global gitignore or merged into this file. For a more nuclear -# option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Nuget personal access tokens and Credentials +nuget.config + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +**/.vscode/* +.vscode/* +!.vscode/settings.json +# !.vscode/tasks.json +# !.vscode/launch.json +# !.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +.idea/ +*.sln.iml + +enc_temp_folder/* + +# Nuke +.nuke/temp/* + +# Build +deps +build +install + +# Tools +tools/ImageCropper/**/*.png diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..77e2077 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "assets/MaaCommonAssets"] + path = assets/MaaCommonAssets + url = https://github.com/MaaXYZ/MaaCommonAssets diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..beea32e --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,20 @@ +{ + "json.schemas": [ + { + "fileMatch": [ + "/assets/resource/**/*.json", + "/install/resource/**/*.json" + ], + "url": "/deps/tools/pipeline.schema.json" + } + ], + "[json]": { + "editor.formatOnSave": true, + "editor.insertSpaces": true, + "editor.tabSize": 4, + "editor.indentSize": "tabSize" + }, + "[python]": { + "editor.defaultFormatter": "ms-python.black-formatter" + } +} \ No newline at end of file diff --git a/README.md b/README.md index 8b5c563..6955c48 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# MaaPracticeBoilerplate \ No newline at end of file +# MaaPracticeBoilerplate diff --git a/assets/MaaCommonAssets b/assets/MaaCommonAssets new file mode 160000 index 0000000..270c3e7 --- /dev/null +++ b/assets/MaaCommonAssets @@ -0,0 +1 @@ +Subproject commit 270c3e77d4303ae14ea1c4ef9a084f713ca495ab diff --git a/assets/interface.json b/assets/interface.json new file mode 100644 index 0000000..63e3517 --- /dev/null +++ b/assets/interface.json @@ -0,0 +1,67 @@ +{ + "controller": [ + { + "name": "ADB 默认方式", + "type": "Adb", + "screencap": 16580608 + } + ], + "resource": [ + { + "name": "官服", + "path": [ + "{PROJECT_DIR}/resource/base" + ] + }, + { + "name": "B 服", + "path": [ + "{PROJECT_DIR}/resource/base", + "{PROJECT_DIR}/resource/bilibili" + ] + } + ], + "task": [ + { + "name": "普通任务", + "entry": "MyTask1" + }, + { + "name": "选项任务", + "entry": "MyTask2", + "option": [ + "任务选项1" + ] + }, + { + "name": "参数任务", + "entry": "MyTask3", + "option": [ + "任务选项1" + ], + "param": {} + } + ], + "option": { + "任务选项1": { + "cases": [ + { + "name": "文本1", + "param": { + "OcrTask": { + "text": "文本1" + } + } + }, + { + "name": "文本2", + "param": { + "OcrTask": { + "text": "文本2" + } + } + } + ] + } + } +} \ No newline at end of file diff --git a/assets/resource/base/model/.gitignore b/assets/resource/base/model/.gitignore new file mode 100644 index 0000000..37faf48 --- /dev/null +++ b/assets/resource/base/model/.gitignore @@ -0,0 +1 @@ +ocr \ No newline at end of file diff --git a/assets/resource/base/pipeline/base/my_task.json b/assets/resource/base/pipeline/base/my_task.json new file mode 100644 index 0000000..581eaa8 --- /dev/null +++ b/assets/resource/base/pipeline/base/my_task.json @@ -0,0 +1,5 @@ +{ + "MyTask1": {}, + "MyTask2": {}, + "MyTask3": {} +} \ No newline at end of file diff --git a/configure.py b/configure.py new file mode 100644 index 0000000..894d294 --- /dev/null +++ b/configure.py @@ -0,0 +1,17 @@ +from pathlib import Path + +import shutil + +assets_dir = Path(__file__).parent / "assets" + + +def configure_ocr_model(): + shutil.copytree( + assets_dir / "MaaCommonAssets" / "OCR" / "ppocr_v4" / "zh_cn", + assets_dir / "resource" / "base" / "model" / "ocr", + dirs_exist_ok=True, + ) + + +if __name__ == "__main__": + configure_ocr_model() diff --git a/install.py b/install.py new file mode 100644 index 0000000..d4a36a8 --- /dev/null +++ b/install.py @@ -0,0 +1,69 @@ +from pathlib import Path + +import shutil +import sys +import json + +from configure import configure_ocr_model + + +working_dir = Path(__file__).parent +install_path = working_dir / Path("install") +version = len(sys.argv) > 1 and sys.argv[1] or "v0.0.1" + + +def install_deps(): + shutil.copytree( + working_dir / "deps" / "bin", + install_path, + ignore=shutil.ignore_patterns( + "*MaaDbgControlUnit*", + "*MaaThriftControlUnit*", + "*MaaWin32ControlUnit*", + "*MaaRpc*", + "*MaaHttp*", + ), + dirs_exist_ok=True, + ) + shutil.copytree( + working_dir / "deps" / "share" / "MaaAgentBinary", + install_path / "MaaAgentBinary", + dirs_exist_ok=True, + ) + + +def install_resource(): + + configure_ocr_model() + + shutil.copytree( + working_dir / "assets" / "resource", + install_path / "resource", + dirs_exist_ok=True, + ) + shutil.copy2( + working_dir / "assets" / "interface.json", + install_path, + ) + + with open(install_path / "interface.json", "r+", encoding="utf-8") as f: + interface = json.load(f) + interface["version"] = version + json.dump(interface, f, ensure_ascii=False, indent=4) + + +def install_chores(): + shutil.copy2( + working_dir / "README.md", + install_path, + ) + shutil.copy2( + working_dir / "LICENSE", + install_path, + ) + + +if __name__ == "__main__": + install_deps() + install_resource() + install_chores()