From ddeb64277707e55ff4b77e6354e5536acd5cdfe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=A8=E5=B0=8F=E9=80=8F=E6=98=8E=E3=83=BB=E5=AE=B8?= =?UTF-8?q?=E2=9C=A8?= <47057319+TransparentLC@users.noreply.github.com> Date: Tue, 10 Jan 2023 10:12:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E4=BF=9D=E5=AD=98=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E4=B8=8A=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Close #14 --- .github/workflows/build.yml | 9 +++++---- main.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7bbb2a..85ca65f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,9 +27,10 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.x + check-latest: true cache: pip cache-dependency-path: requirements.txt - name: Install pip dependencies @@ -93,8 +94,8 @@ jobs: REAL_ESRGAN_PLATFORM= BUILD_TIME=$(date +%Y%m%d-%H%I%S) - echo "::set-output name=release_name::Automated build ${BUILD_TIME}" - echo "::set-output name=tag_name::autobuild-${BUILD_TIME}" + echo "release_name=Automated build ${BUILD_TIME}" >> $GITHUB_OUTPUT + echo "tag_name=autobuild-${BUILD_TIME}" >> $GITHUB_OUTPUT mkdir release @@ -161,7 +162,7 @@ jobs: RELEASE_FILES="${RELEASE_FILES//'%'/'%25'}" RELEASE_FILES="${RELEASE_FILES//$'\n'/'%0A'}" RELEASE_FILES="${RELEASE_FILES//$'\r'/'%0D'}" - echo "::set-output name=release_files::${RELEASE_FILES}" + echo "release_files=${RELEASE_FILES}" >> $GITHUB_OUTPUT - name: Release automated build uses: softprops/action-gh-release@v1 if: ${{ github.event.inputs.release }} diff --git a/main.py b/main.py index d4eb4a4..376c5ae 100644 --- a/main.py +++ b/main.py @@ -360,7 +360,7 @@ def getOutputPath(self, p: str) -> str: suffix = f'w{self.varintResizeWidth.get()}' case param.ResizeMode.HEIGHT: suffix = f'h{self.varintResizeHeight.get()}' - return f'{base}-{suffix}{ext}' + return f'{base} ({self.models[self.comboModel.current()]} {suffix}){ext}' if __name__ == '__main__': os.chdir(define.APP_PATH)