From ec5723d2b3122faaa5b76c5a1b156c9a915af9d6 Mon Sep 17 00:00:00 2001 From: krateng Date: Tue, 5 Apr 2022 16:00:25 +0200 Subject: [PATCH 1/2] Version bump --- maloja/proccontrol/tasks/__init__.py | 2 +- maloja/proccontrol/tasks/import_scrobbles.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maloja/proccontrol/tasks/__init__.py b/maloja/proccontrol/tasks/__init__.py index cd5be4c..9fd1159 100644 --- a/maloja/proccontrol/tasks/__init__.py +++ b/maloja/proccontrol/tasks/__init__.py @@ -22,7 +22,7 @@ def loadexternal(filename): msg = f"Skipped {result['CONFIDENT_SKIP'] + result['UNCERTAIN_SKIP']} scrobbles" if result['UNCERTAIN_SKIP'] > 0: - warningmsg = col['orange'](f"{result['UNCERTAIN_SKIP']} Warning{'s' if result['UNCERTAIN_SKIP'] != 1 else ''}!") + warningmsg = col['indianred'](f"{result['UNCERTAIN_SKIP']} Warning{'s' if result['UNCERTAIN_SKIP'] != 1 else ''}!") msg += f" ({warningmsg})" print(msg) diff --git a/maloja/proccontrol/tasks/import_scrobbles.py b/maloja/proccontrol/tasks/import_scrobbles.py index 0d22df0..bfdb248 100644 --- a/maloja/proccontrol/tasks/import_scrobbles.py +++ b/maloja/proccontrol/tasks/import_scrobbles.py @@ -14,7 +14,7 @@ outputs = { "UNCERTAIN_IMPORT": lambda msg: print(col['orange'](msg)), #"CONFIDENT_SKIP": lambda msg: print(col['ffcba4'](msg)), "CONFIDENT_SKIP": lambda msg: None, - "UNCERTAIN_SKIP": lambda msg: print(col['orange'](msg)), + "UNCERTAIN_SKIP": lambda msg: print(col['indianred'](msg)), "FAIL": lambda msg: print(col['red'](msg)), } diff --git a/pyproject.toml b/pyproject.toml index 4e09dec..219601d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "malojaserver" -version = "2.14.7" +version = "2.14.8" description = "Self-hosted music scrobble database" readme = "./README.md" requires-python = ">=3.6" From 447d31b44eefcc822633af6681b280454e2dd987 Mon Sep 17 00:00:00 2001 From: krateng Date: Tue, 5 Apr 2022 16:08:13 +0200 Subject: [PATCH 2/2] Disabled dockerhub docs update, peter-evans/dockerhub-description#10 --- .github/workflows/dockerhub.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index aff96f6..88a0229 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -39,10 +39,11 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - name: Update Readme and short description - uses: peter-evans/dockerhub-description@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} - repository: krateng/maloja - short-description: ${{ github.event.repository.description }} +# skipping this until https://github.com/peter-evans/dockerhub-description/issues/10 is fixed +# - name: Update Readme and short description +# uses: peter-evans/dockerhub-description@v2 +# with: +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} +# repository: krateng/maloja +# short-description: ${{ github.event.repository.description }}