2 Commits

Author SHA1 Message Date
jamie ddc78cccf1 fix: correct environment variable name from APP_VERSION to VERSION in Dockerfile
Release / release (pull_request) Successful in 1m14s
2026-01-08 20:22:50 +00:00
jamie 83461eda7b feat: add target resolution parameter to configuration 2026-01-08 20:22:45 +00:00
3 changed files with 9 additions and 8 deletions
+6 -6
View File
@@ -20,11 +20,11 @@ jobs:
id: get_version id: get_version
run: echo "VERSION=${{ github.head_ref }}" >> $GITHUB_OUTPUT run: echo "VERSION=${{ github.head_ref }}" >> $GITHUB_OUTPUT
# - name: Generate Changelog - name: Generate Changelog
# id: changelog id: changelog
# uses: https://github.com/metcalfc/changelog-generator@v4.6.2 uses: https://github.com/metcalfc/changelog-generator@v4.6.2
# with: with:
# myToken: ${{ secrets.GITHUB_TOKEN }} myToken: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push Docker image - name: Build and push Docker image
run: | run: |
@@ -41,6 +41,6 @@ jobs:
with: with:
tag_name: ${{ steps.get_version.outputs.VERSION }} tag_name: ${{ steps.get_version.outputs.VERSION }}
name: ${{ steps.get_version.outputs.VERSION }} name: ${{ steps.get_version.outputs.VERSION }}
# body: ${{ steps.changelog.outputs.changelog }} body: ${{ steps.changelog.outputs.changelog }}
draft: false draft: false
prerelease: false prerelease: false
+1 -1
View File
@@ -3,7 +3,7 @@ LABEL org.opencontainers.image.vendor="JDB-NET"
WORKDIR /app WORKDIR /app
COPY . /app COPY . /app
ARG VERSION=dev ARG VERSION=dev
ENV APP_VERSION=${VERSION} ENV VERSION=${VERSION}
RUN pip install -r requirements.txt RUN pip install -r requirements.txt
RUN apt-get update && apt-get install -y curl ffmpeg procps RUN apt-get update && apt-get install -y curl ffmpeg procps
RUN rm -rf /var/lib/apt/lists/* RUN rm -rf /var/lib/apt/lists/*
+2 -1
View File
@@ -898,6 +898,7 @@ def add_config():
encoder_type = request.form.get('encoder_type') encoder_type = request.form.get('encoder_type')
watch_folder = request.form.get('watch_folder') watch_folder = request.form.get('watch_folder')
temp_dir = request.form.get('temp_dir') or '/temp' temp_dir = request.form.get('temp_dir') or '/temp'
target_resolution = request.form.get('target_resolution') or None
ffmpeg_flags = None ffmpeg_flags = None
if encoder_type == 'video': if encoder_type == 'video':
crf = request.form.get('crf', '24') crf = request.form.get('crf', '24')
@@ -907,7 +908,7 @@ def add_config():
audio_bitrate = request.form.get('audio_bitrate', '320k') audio_bitrate = request.form.get('audio_bitrate', '320k')
ffmpeg_flags = f'-b:a {audio_bitrate}' ffmpeg_flags = f'-b:a {audio_bitrate}'
if encoder_type in ['video', 'audio'] and watch_folder: if encoder_type in ['video', 'audio'] and watch_folder:
db_manager.add_config(encoder_type, watch_folder, ffmpeg_flags, temp_dir) db_manager.add_config(encoder_type, watch_folder, ffmpeg_flags, temp_dir, target_resolution)
return redirect(url_for('config')) return redirect(url_for('config'))
@app.route('/edit_config/<int:config_id>', methods=['POST']) @app.route('/edit_config/<int:config_id>', methods=['POST'])