Merge pull request 'v1.0.1' (#3) from v1.0.1 into master

Reviewed-on: #3

.gitea/workflows/release.yml

@@ -20,11 +20,11 @@ jobs:
         id: get_version
         run: echo "VERSION=${{ github.head_ref }}" >> $GITHUB_OUTPUT
 
-      # - name: Generate Changelog
-      #   id: changelog
-      #   uses: https://github.com/metcalfc/changelog-generator@v4.6.2
-      #   with:
-      #     myToken: ${{ secrets.GITHUB_TOKEN }}
+      - name: Generate Changelog
+        id: changelog
+        uses: https://github.com/metcalfc/changelog-generator@v4.6.2
+        with:
+          myToken: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
         run: |
@@ -41,6 +41,6 @@ jobs:
         with:
           tag_name: ${{ steps.get_version.outputs.VERSION }}
           name: ${{ steps.get_version.outputs.VERSION }}
-          # body: ${{ steps.changelog.outputs.changelog }}
+          body: ${{ steps.changelog.outputs.changelog }}
           draft: false
           prerelease: false

Dockerfile

@@ -3,7 +3,7 @@ LABEL org.opencontainers.image.vendor="JDB-NET"
 WORKDIR /app
 COPY . /app
 ARG VERSION=dev
-ENV APP_VERSION=${VERSION}
+ENV VERSION=${VERSION}
 RUN pip install -r requirements.txt
 RUN apt-get update && apt-get install -y curl ffmpeg procps
 RUN rm -rf /var/lib/apt/lists/*

app.py

@@ -898,6 +898,7 @@ def add_config():
     encoder_type = request.form.get('encoder_type')
     watch_folder = request.form.get('watch_folder')
     temp_dir = request.form.get('temp_dir') or '/temp'
+    target_resolution = request.form.get('target_resolution') or None
     ffmpeg_flags = None
     if encoder_type == 'video':
         crf = request.form.get('crf', '24')
@@ -907,7 +908,7 @@ def add_config():
         audio_bitrate = request.form.get('audio_bitrate', '320k')
         ffmpeg_flags = f'-b:a {audio_bitrate}'
     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'))
 
 @app.route('/edit_config/<int:config_id>', methods=['POST'])