From 37df7a2f166e13163d63ce06321f63e07f9251ff Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 27 Dec 2024 14:09:20 -0500 Subject: [PATCH 01/12] Added Spotisub service. --- docker-compose.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index dc8d0dcc..b7fbcac1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4531,6 +4531,27 @@ services: type: bind bind: create_host_path: true + spotisub: + container_name: spotisub + environment: + SPOTIPY_CLIENT_ID: ${YOUR_SPOTIFY_ID} + SPOTIPY_CLIENT_SECRET: ${YOUR_SPOTIFY_SECRET} + SPOTIPY_REDIRECT_URI: http://127.0.0.1:8080/ + SUBSONIC_API_HOST: http://navidrome + SUBSONIC_API_PORT: 4533 + SUBSONIC_API_USER: ${NAVIDROME_USERNAME} + SUBSONIC_API_PASS: ${NAVIDROME_PASSWORD} + healthcheck: + test: curl -s http://127.0.0.1:5183/api/v1/utils/healthcheck | grep -q 'Ok!' || exit 1 + interval: 30s + retries: 20 + start_period: 30s + image: blastbeng/spotisub:latest + ports: + - 5183:5183 + restart: always + volumes: + - ${DOCKER_VOLUME_CONFIG}/spotisub:/home/user/spotisub/cache swag: cap_add: - NET_ADMIN From 3fb31d024b3d00880c16f4c785484c0f28d647b0 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 27 Dec 2024 14:13:59 -0500 Subject: [PATCH 02/12] Minor tweak to Actions. --- .gitea/workflows/deployment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index b65eb9ae..6de7902a 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -21,11 +21,11 @@ jobs: chmod +x /usr/local/bin/tea echo "Listing PRs..." tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep 'open|closed|merged' | awk -F, '{print $3}' | sed -e 's|"||g') + pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep 'open' | awk -F, '{print $3}' | sed -e 's|"||g') echo "pr_state=$(echo ${pr_state})" >> "$GITHUB_OUTPUT" - name: Create PR - if: steps.list-prs.outputs.pr_state == 'closed' + if: steps.list-prs.outputs.pr_state != 'open' uses: arifer612/Gitea-PR-action@v1.2.0 with: url: ${{ gitea.server_url }} From 8ed6f772388738420ead429674b47dd9a1e1d59f Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 27 Dec 2024 14:18:00 -0500 Subject: [PATCH 03/12] Minor tweak to Actions. --- .gitea/workflows/deployment.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 6de7902a..d3dfee43 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -21,8 +21,14 @@ jobs: chmod +x /usr/local/bin/tea echo "Listing PRs..." tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep 'open' | awk -F, '{print $3}' | sed -e 's|"||g') - echo "pr_state=$(echo ${pr_state})" >> "$GITHUB_OUTPUT" + tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep -q 'open' + if [ $? -eq 0 ]; then + echo "PR already exists. Skipping PR creation." + echo "pr_state=open" >> "$GITHUB_OUTPUT" + else + echo "PR does not exist. Creating PR..." + echo "pr_state=closed" >> "$GITHUB_OUTPUT" + fi - name: Create PR if: steps.list-prs.outputs.pr_state != 'open' From bd6a2a433302d021fc783eeb4fc1e8e80a5e0a67 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 27 Dec 2024 14:19:26 -0500 Subject: [PATCH 04/12] Minor tweak to Actions. --- .gitea/workflows/deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index d3dfee43..98d46f5d 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -21,7 +21,7 @@ jobs: chmod +x /usr/local/bin/tea echo "Listing PRs..." tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep -q 'open' + tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep 'open' if [ $? -eq 0 ]; then echo "PR already exists. Skipping PR creation." echo "pr_state=open" >> "$GITHUB_OUTPUT" From 0b58c7e29a4d1c9c376ad523924e1a4499091266 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 27 Dec 2024 14:23:59 -0500 Subject: [PATCH 05/12] Minor tweak to Actions. --- .gitea/workflows/deployment.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 98d46f5d..f904a021 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -21,17 +21,10 @@ jobs: chmod +x /usr/local/bin/tea echo "Listing PRs..." tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep 'open' - if [ $? -eq 0 ]; then - echo "PR already exists. Skipping PR creation." - echo "pr_state=open" >> "$GITHUB_OUTPUT" - else - echo "PR does not exist. Creating PR..." - echo "pr_state=closed" >> "$GITHUB_OUTPUT" - fi + tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv - name: Create PR - if: steps.list-prs.outputs.pr_state != 'open' + if: steps.list-prs.outputs.pr_state == 'closed' uses: arifer612/Gitea-PR-action@v1.2.0 with: url: ${{ gitea.server_url }} From cadb8800fda3bc33ed90e0c1a993f8503f445644 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 27 Dec 2024 14:28:12 -0500 Subject: [PATCH 06/12] Minor tweak to Actions. --- .gitea/workflows/deployment.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index f904a021..05f9b34b 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -21,7 +21,14 @@ jobs: chmod +x /usr/local/bin/tea echo "Listing PRs..." tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv + tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep 'open' + if [ $? -eq 0 ]; then + echo "PR already exists. Skipping PR creation." + echo "pr_state=open" >> $GITHUB_OUTPUT + else + echo "PR does not exist. Creating PR..." + echo "pr_state=closed" >> $GITHUB_OUTPUT + fi - name: Create PR if: steps.list-prs.outputs.pr_state == 'closed' From 01ec44654848773e8784975560ee0691b6cf2dc8 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 27 Dec 2024 16:46:38 -0500 Subject: [PATCH 07/12] . --- .gitea/workflows/deployment.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 05f9b34b..2e9e9aaa 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -21,17 +21,11 @@ jobs: chmod +x /usr/local/bin/tea echo "Listing PRs..." tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep 'open' - if [ $? -eq 0 ]; then - echo "PR already exists. Skipping PR creation." - echo "pr_state=open" >> $GITHUB_OUTPUT - else - echo "PR does not exist. Creating PR..." - echo "pr_state=closed" >> $GITHUB_OUTPUT - fi + pr_state=$(tea pr ls --state all --fields index,state,head --output csv | head -2 | tail -1 | awk -F, '{print $2}' | sed -e 's|"||g') + echo "pr_state=$(echo ${pr_state})" >> $GITHUB_OUTPUT - name: Create PR - if: steps.list-prs.outputs.pr_state == 'closed' + if: steps.list-prs.outputs.pr_state != 'open' uses: arifer612/Gitea-PR-action@v1.2.0 with: url: ${{ gitea.server_url }} From 0114b20894708c8d41343815f5ab639d3f1cb2b2 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 27 Dec 2024 16:47:44 -0500 Subject: [PATCH 08/12] . --- .gitea/workflows/deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 2e9e9aaa..2501334f 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -22,7 +22,7 @@ jobs: echo "Listing PRs..." tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} pr_state=$(tea pr ls --state all --fields index,state,head --output csv | head -2 | tail -1 | awk -F, '{print $2}' | sed -e 's|"||g') - echo "pr_state=$(echo ${pr_state})" >> $GITHUB_OUTPUT + echo "pr_state=$(pr_state)" >> $GITHUB_OUTPUT - name: Create PR if: steps.list-prs.outputs.pr_state != 'open' From 3e93b2de3b6739ebfdc12229230ea9c8a2def04b Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 27 Dec 2024 16:49:31 -0500 Subject: [PATCH 09/12] . --- .gitea/workflows/deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 2501334f..d4a03baf 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -22,7 +22,7 @@ jobs: echo "Listing PRs..." tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} pr_state=$(tea pr ls --state all --fields index,state,head --output csv | head -2 | tail -1 | awk -F, '{print $2}' | sed -e 's|"||g') - echo "pr_state=$(pr_state)" >> $GITHUB_OUTPUT + echo "PR state: $pr_state" - name: Create PR if: steps.list-prs.outputs.pr_state != 'open' From 5c902baabb7a8ac9d946d6ab06bf686cba43a77d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 27 Dec 2024 16:51:03 -0500 Subject: [PATCH 10/12] . --- .gitea/workflows/deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index d4a03baf..3e7941f7 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -21,7 +21,7 @@ jobs: chmod +x /usr/local/bin/tea echo "Listing PRs..." tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - pr_state=$(tea pr ls --state all --fields index,state,head --output csv | head -2 | tail -1 | awk -F, '{print $2}' | sed -e 's|"||g') + pr_state=$(tea pr ls --state all --fields index,state,head --output csv | head -2 | tail -1 | awk -F, '{print $2}') echo "PR state: $pr_state" - name: Create PR From d1a523e5ee13f6d1165189bde3e1629a8c63d586 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 27 Dec 2024 16:52:34 -0500 Subject: [PATCH 11/12] . --- .gitea/workflows/deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 3e7941f7..7bbe6cb6 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -21,7 +21,7 @@ jobs: chmod +x /usr/local/bin/tea echo "Listing PRs..." tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - pr_state=$(tea pr ls --state all --fields index,state,head --output csv | head -2 | tail -1 | awk -F, '{print $2}') + tea pr ls --state all --fields index,state,head --output csv | head -2 | tail -1 | awk -F, '{print $2}' echo "PR state: $pr_state" - name: Create PR From dd1d83c751e7ab048a39efce0886483b79d7355d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 27 Dec 2024 17:00:35 -0500 Subject: [PATCH 12/12] Changing the check PR step. --- .gitea/workflows/deployment.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 7bbe6cb6..9a841096 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -17,12 +17,12 @@ jobs: - name: PR list id: list-prs run: | - curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea - chmod +x /usr/local/bin/tea - echo "Listing PRs..." - tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - tea pr ls --state all --fields index,state,head --output csv | head -2 | tail -1 | awk -F, '{print $2}' - echo "PR state: $pr_state" + pr_check=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} \ + -X 'GET' \ + -H 'Accept: application/json' \ + -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' \ + -s | jq '{index: .number, state: .state}') + pr_state=$(echo ${pr_check} | jq -r '.state') - name: Create PR if: steps.list-prs.outputs.pr_state != 'open'