Skip to content

Commit

Permalink
Merge branch 'release/v1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Mirio committed Nov 16, 2023
2 parents 13b2e2f + 1cfc93d commit c32ab3e
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 5 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ updates:
# Update GitHub actions in workflows
- package-ecosystem: 'github-actions'
directory: '/'
commit-message:
prefix: 'chore(dependabot): '
target-branch: 'develop'
# Every weekday
schedule:
Expand All @@ -16,13 +18,17 @@ updates:
# Look for a `requirements.txt` in the `root` directory
# also 'setup.cfg', 'runtime.txt' and 'requirements/*.txt'
directory: '/'
commit-message:
prefix: 'chore(dependabot): '
target-branch: 'develop'
# Every weekday
schedule:
interval: 'daily'

- package-ecosystem: 'docker'
directory: '/'
commit-message:
prefix: 'chore(dependabot): '
target-branch: 'develop'
# Every weekday
schedule:
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM alpine:3.18

# Opencontainers Specs (https://github.com/opencontainers/image-spec/blob/main/annotations.md)
LABEL org.opencontainers.image.title="VerbaCap"
LABEL org.opencontainers.image.description="Podcast Manager"
LABEL org.opencontainers.image.source="https://github.com/Mirio/verbacap"
LABEL org.opencontainers.image.licenses="MIT"
LABEL org.opencontainers.image.title "VerbaCap"
LABEL org.opencontainers.image.description "Podcast Manager"
LABEL org.opencontainers.image.source "https://github.com/Mirio/verbacap"
LABEL org.opencontainers.image.licenses "MIT"

ARG USERNAME="app"
ARG GITCLIFF_VERSION="1.4.0"
Expand Down
2 changes: 2 additions & 0 deletions config/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
Core_AddDataSourceView,
Core_DeleteDataSourceView,
Core_EpisodeView,
Core_HealthView,
Core_HomepageView,
Core_PlayerView,
Core_PlaylistView,
Expand Down Expand Up @@ -81,6 +82,7 @@
path("user-about/", TemplateView.as_view(template_name="pages/about.html"), name="about"),
path("users/", include("verbacap.users.urls", namespace="users")),
path("accounts/", include("allauth.urls")),
path("-/health/", Core_HealthView.as_view(), name="health_check"),
# Your stuff: custom urls includes go here
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

Expand Down
5 changes: 5 additions & 0 deletions core/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,3 +228,8 @@ def test_settingsview(self):
client.login(username="testuser", password="1234")
response_logged = client.get("/settings/")
self.assertEqual(response_logged.status_code, 200)

def test_healthcheckview(self):
client = Client()
response = client.get("/-/health/")
self.assertEqual(response.status_code, 200)
7 changes: 7 additions & 0 deletions core/views.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.http import HttpResponse
from django.shortcuts import render
from django.views import View

Expand Down Expand Up @@ -34,6 +35,12 @@ def get(self, request):
return render(request, "core/player.html")


class Core_HealthView(View):
def get(self, request):
# TODO: Implement a more deeper health check
return HttpResponse("ok")


class Core_AddDataSourceView(LoginRequiredMixin, View):
def get(self, request):
return render(request, "core/add_datasource.html")
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ pytest-django==4.7.0 # https://github.com/pytest-dev/pytest-django
# ------------------------------------------------------------------------------
feedparser==6.0.10 # https://github.com/kurtmckee/feedparser
beautifulsoup4==4.12.2
yt-dlp==2023.11.14 # https://github.com/yt-dlp/yt-dlp
yt-dlp==2023.11.16 # https://github.com/yt-dlp/yt-dlp
django-filter==23.3 # https://github.com/carltongibson/django-filter

0 comments on commit c32ab3e

Please sign in to comment.