5 Commits

Author SHA1 Message Date
jamie 0ceed7fbc1 Merge pull request 'v1.0.1' (#3) from v1.0.1 into master
Reviewed-on: #3
2026-01-08 20:23:33 +00:00
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
jamie 81a416cb83 Merge pull request 'refactor: comment out changelog generation steps in release workflow' (#2) from v1.0.0 into master
Reviewed-on: #2
2026-01-08 20:02:29 +00:00
jamie 2b60f1a8c2 refactor: comment out changelog generation steps in release workflow
Release / release (pull_request) Successful in 1m13s
2026-01-08 20:01:48 +00:00
2 changed files with 3 additions and 2 deletions
+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'])