From e0b544da5182939aa22e1ba2e909059cc0403370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Tr=C3=B6ger?= Date: Fri, 29 Aug 2025 09:44:55 +0200 Subject: [PATCH 1/6] added build actions --- .gitea/workflows/deploy.yaml | 48 ++++++++++++++++++++++++++++ src/functions.py | 6 ++-- src/templates/index.html | 62 +++++++++++++++++++----------------- 3 files changed, 83 insertions(+), 33 deletions(-) create mode 100644 .gitea/workflows/deploy.yaml diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml new file mode 100644 index 0000000..ad57404 --- /dev/null +++ b/.gitea/workflows/deploy.yaml @@ -0,0 +1,48 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +# GitHub recommends pinning actions to a commit SHA. +# To get a newer version, you will need to update the SHA. +# You can also reference a tag or branch, but the action may change without warning. + +name: Publish Docker image + +on: push + +jobs: + push_to_registry: + name: Push Docker image to Docker Hub + runs-on: ubuntu-latest + permissions: + packages: write + contents: read + attestations: write + id-token: write + steps: + - name: Check out the repo + uses: actions/checkout@v4 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + registry: git.letsstein.de + username: ${{ gitea.actor }} + password: ${{ secrets.REGISTRY_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v3 + with: + images: git.letsstein.de/tom/anki_convert + + - name: Build and push Docker image + id: push + uses: docker/build-push-action@v3 + with: + context: . + file: ./Dockerfile + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/src/functions.py b/src/functions.py index 59d47c2..236cf6d 100755 --- a/src/functions.py +++ b/src/functions.py @@ -50,10 +50,10 @@ def convert_text(text: str): for line in seperate(text): # add anki field into line and count the number of changes - line, num = re.subn("(:)(..+)", rf"\1 {{{{c{field_nr}::\2}}}}", line) + line, num = re.subn("(:|\.)(..+)", rf"\1 {{{{c{field_nr}::\2}}}}", line) # if anki field added increase field number - if num > 0: - field_nr += 1 + # if num > 0: + # field_nr += 1 # add changed line to array changed_lines.append(line) diff --git a/src/templates/index.html b/src/templates/index.html index e7b1de1..be00e7f 100755 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -1,32 +1,34 @@ - + - - Anki Converter - - - -
-
-

Upload File/Enter Text

-
- - -
- -
-
- {% if resp_text %} - - {% endif %} -
- - + + Anki Converter + + + +
+
+

Upload File/Enter Text

+
+ + +
+ +
+
+ {% if resp_text %} + + {% endif %} +
+ + From f1f3597cf1e769244bf06429e4ed645cceedd7a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Tr=C3=B6ger?= Date: Fri, 29 Aug 2025 09:46:08 +0200 Subject: [PATCH 2/6] Update deploy.yaml --- .gitea/workflows/deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index ad57404..fd187be 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -8,7 +8,6 @@ # You can also reference a tag or branch, but the action may change without warning. name: Publish Docker image - on: push jobs: From 7d2178c24afc6b9da79289bce094a15bc9e671b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Tr=C3=B6ger?= Date: Fri, 29 Aug 2025 09:51:03 +0200 Subject: [PATCH 3/6] Update deploy.yaml --- .gitea/workflows/deploy.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index fd187be..24b38b5 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -14,16 +14,15 @@ jobs: push_to_registry: name: Push Docker image to Docker Hub runs-on: ubuntu-latest - permissions: - packages: write - contents: read - attestations: write - id-token: write + # permissions: + # packages: write + # contents: read + # attestations: write + # id-token: write steps: - - name: Check out the repo + - name: Checkout uses: actions/checkout@v4 - - - name: Log in to Docker Hub + - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: registry: git.letsstein.de From 4313f2e7d7ccc47f92145a5fce5d8f9fea0e55ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Tr=C3=B6ger?= Date: Fri, 29 Aug 2025 09:58:05 +0200 Subject: [PATCH 4/6] Update deploy.yaml --- .gitea/workflows/deploy.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 24b38b5..4ae8e75 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -22,11 +22,16 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: "check is REGISTRY_TOKEN exists" + env: + super_secret: ${{ secrets.REGISTRY_TOKEN }} + if: ${{ env.super_secret == '' }} + run: 'echo "echo the secret \"REGISTRY_TOKEN\" has not been made; echo please go to \"settings \> secrets \> actions\" to create it" - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: registry: git.letsstein.de - username: ${{ gitea.actor }} + username: jenkins password: ${{ secrets.REGISTRY_TOKEN }} - name: Extract metadata (tags, labels) for Docker From 03877ae991e016558daa160485de6ef0f5020613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Tr=C3=B6ger?= Date: Fri, 29 Aug 2025 09:59:17 +0200 Subject: [PATCH 5/6] Update deploy.yaml --- .gitea/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 4ae8e75..0375a50 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -24,7 +24,7 @@ jobs: uses: actions/checkout@v4 - name: "check is REGISTRY_TOKEN exists" env: - super_secret: ${{ secrets.REGISTRY_TOKEN }} + super_secret: ${{ secrets.REGISTRY_TOKEN }} if: ${{ env.super_secret == '' }} run: 'echo "echo the secret \"REGISTRY_TOKEN\" has not been made; echo please go to \"settings \> secrets \> actions\" to create it" - name: Login to GitHub Container Registry From f7cf62fbbeb8bfceb20f0d42451044cac89fc6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Tr=C3=B6ger?= Date: Fri, 29 Aug 2025 09:59:37 +0200 Subject: [PATCH 6/6] Update deploy.yaml --- .gitea/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 0375a50..b487dab 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -26,7 +26,7 @@ jobs: env: super_secret: ${{ secrets.REGISTRY_TOKEN }} if: ${{ env.super_secret == '' }} - run: 'echo "echo the secret \"REGISTRY_TOKEN\" has not been made; echo please go to \"settings \> secrets \> actions\" to create it" + run: 'echo "echo the secret \"REGISTRY_TOKEN\" has not been made; echo please go to \"settings \> secrets \> actions\" to create it"' - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: