bugfix misc (#1394)

* fix doc lists

* rembg dont spam info logs

* scale down for rem bg

* more time for rembg curl

* fix load collage font path

* Revert "fix load collage font path"

This reverts commit 3bebfee.

* fix load collage font path

Author: reloxx13

api/applyEffects.php

@@ -134,17 +134,20 @@
             }
 
             if (!$vars['isCollage'] || $vars['editSingleCollage']) {
+                $filterProcessSize = intval($config['filters']['process_size'] ?? 0);
+                $downscaledForFilter = false;
+
                 // apply filter (optionally downscale first for performance)
                 if ($vars['imageFilter'] !== null && $vars['imageFilter'] !== ImageFilterEnum::PLAIN) {
                     $originalWidth = imagesx($imageResource);
                     $originalHeight = imagesy($imageResource);
                     $filterResource = $imageResource;
 
-                    $filterProcessSize = intval($config['filters']['process_size'] ?? 0);
                     if ($filterProcessSize > 0 && ($originalWidth > $filterProcessSize || $originalHeight > $filterProcessSize)) {
                         $downscaled = $imageHandler->resizeImage($imageResource, $filterProcessSize);
                         if ($downscaled instanceof \GdImage) {
                             $filterResource = $downscaled;
+                            $downscaledForFilter = true;
                         }
                     }
 
@@ -194,6 +197,18 @@
                     }
                 }
 
+                // Apply rembg (downscale first if filters_process_size is set and not already downscaled for filters)
+                if ($filterProcessSize > 0 && !$downscaledForFilter) {
+                    $width = imagesx($imageResource);
+                    $height = imagesy($imageResource);
+                    if ($width > $filterProcessSize || $height > $filterProcessSize) {
+                        $downscaled = $imageHandler->resizeImage($imageResource, $filterProcessSize);
+                        if ($downscaled instanceof \GdImage) {
+                            $imageResource = $downscaled;
+                        }
+                    }
+                }
+
                 // Apply rembg
                 [$imageHandler, $imageResource] = Rembg::process($imageHandler, $vars, $config['rembg'], $imageResource);
                 if ($config['picture']['polaroid_effect']) {

assets/js/admin/generator.js

@@ -115,8 +115,9 @@ function loadCurrentConfig() {
     $('input[name=\'text_enabled\'][data-trigger=\'general\']').prop('checked', text_enabled);
     $('input[name=\'text_font_family\']').val(font_family);
     $('input[name=\'text_font_family\']')[0].setAttribute('data-fontclass', 'font-selected');
+    const font_family_public = toPublicUrl(font_family);
     $('#fontselectedStyle').html(
-        `@font-face{font-family:"fontselected";src:url(${font_family}) format("truetype");} .font-selected{font-family:"fontselected",Verdena,Tahoma;}`
+        `@font-face{font-family:"fontselected";src:url(${font_family_public}) format("truetype");} .font-selected{font-family:"fontselected",Verdena,Tahoma;}`
     );
     $('input[name=\'text_font_color\']').attr('value', font_color);
     $('input[name=\'text_font_size\']').attr('value', font_size);
@@ -172,7 +173,7 @@ function changeGeneralSetting() {
     const c_text_enabled = $('input[name=\'text_enabled\'][data-trigger=\'general\']').is(':checked');
     let c_text_font = $('input[name=\'text_font_family\']')[0].getAttribute('data-fontclass');
     let c_text_font_unique_id = $('input[name=\'text_font_family\']').data('unique-id');
-    let c_text_font_value = $('input[name=\'text_font_family\']').val();
+    let c_text_font_value = toPublicUrl($('input[name=\'text_font_family\']').val());
     const c_font_color = $('input[name=\'text_font_color\']').val();
     const c_font_size = $('input[name=\'text_font_size\']').val();
     const c_text_1 = $('input[name=\'text_line_1\']').val();

docs/code_of_conduct.md

@@ -18,24 +18,22 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:
 
+
 * Demonstrating empathy and kindness toward other people
 * Being respectful of differing opinions, viewpoints, and experiences
 * Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
 * Focusing on what is best not just for us as individuals, but for the overall
   community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
+
+* The use of sexualized language or imagery, and sexual attention or advances of any kind
 * Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
+* Publishing others' private information, such as a physical or email address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
 
 ## Enforcement Responsibilities
 

docs/contributing-docs.md

@@ -14,6 +14,7 @@ Help improve the Photobooth docs by following these steps.
   python3 -m venv .venv
   source .venv/bin/activate
   ```
+
 - Install MkDocs and the theme:
   ```
   pip install mkdocs mkdocs-material
@@ -26,6 +27,7 @@ Help improve the Photobooth docs by following these steps.
   mkdocs build --config-file mkdocs_remote.yml
   mkdocs serve -f mkdocs_remote.yml
   ```
+
 - Open the URL shown in the terminal (typically `http://127.0.0.1:8000`) to review your changes live.
 
 ## 4) Edit guidelines

docs/faq/go2rtc-troubleshooting.md

@@ -27,6 +27,7 @@ Access go2rtc via [http://localhost:1984](http://localhost:1984) and, maybe, adj
 **2 executes `gphoto2` / `rpicam-still` / `fswebcam` with the corresponding parameters.**
 
 If only `%s` is passed, it uses by default the following arguments:
+
 - on `gphoto2`: `--set-config output=Off --capture-image-and-download --filename=%s`
 - on `rpicam-still`: `-n -q 100 -o %s`
 - on `fswebcam`: `--no-banner -d /dev/video0 -r 1280x720 %s`

docs/faq/hide-cursor.md

@@ -3,6 +3,7 @@
 > Note: Tools like `unclutter` do not work on Wayland.
 
 ## Pi OS Trixie (Wayland)
+
 - Hide the cursor by renaming the pointer icon:
   ```
   sudo mv /usr/share/icons/PiXtrix/cursors/left_ptr /usr/share/icons/PiXtrix/cursors/left_ptr.bak
@@ -17,6 +18,7 @@
   ```
   sudo mv /usr/share/icons/PiXflat/cursors/left_ptr /usr/share/icons/PiXflat/cursors/left_ptr.bak
   ```
+
 - Disable screen blanking:
   ```
   sudo raspi-config nonint do_blanking 1
@@ -25,6 +27,7 @@
   ```
   sudo raspi-config nonint do_blanking 0
   ```
+
 - Turn off the screensaver by editing `/etc/xdg/lxsession/LXDE-pi/autostart` and removing `@xscreensaver -no-splash`.
 - Prevent DPMS screen blanking by creating `/etc/X11/xorg.conf.d/99-dpms.conf`:
   ```
@@ -39,6 +42,7 @@
   ```
 
 ## Pi OS Bullseye and earlier (X11)
+
 - Disable screensaver and screen blanking with `sudo raspi-config`:
   - 1 System Options → S6 Boot / Auto Login → choose desktop auto-login.
   - 1 System Options → S6 Screen Blanking → disable.

docs/faq/index.md

@@ -188,10 +188,7 @@ Yes you can. There's different ways depending on your needs and personal setup:
 2. You need to change the background URL path via config or admin panel. Replace `url(../img/bg.jpg)` with your IP-Adress and port (if needed) as URL.
    Example:
 
-    ```
-    -   /img/bg.jpg
-    +   http://192.168.0.2:8081
-    ```
+   Use `http://192.168.0.2:8081` (or your own stream URL) in place of `/img/bg.jpg`.
 
     To use an DSLR or an Raspberry Pi Camera module see _Setting up a preview stream from your DSLR or PiCamera_ above.
 
@@ -201,6 +198,7 @@ Yes you can. There's different ways depending on your needs and personal setup:
 
 If connection fails some help can be found inside the official [PHPMailer Wiki](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting), especially gmail needs some special config.
 
+
 -   Should be obvious but the photobooth must be connected to WIFI/internet to send photos live.
 
     Otherwise, tell them to check the box to send them the photo later and it will add everyone's email to a list for you.
@@ -260,6 +258,7 @@ Take a look for "Loaded Configuration File" to get the path of your php.ini, you
 This feature will automatically and in regular intervals copy (sync) new pictures to a plugged-in USB stick
 
 Use the [Photobooth Setup Wizard](https://photoboothproject.github.io/install/setup_wizard) to get the operating system setup in place.
+
 - 6. Permissions -> USB Sync policy
 
 The target USB device is selected through the admin panel.
@@ -534,6 +533,7 @@ Magic Greenscreen is a feature that uses AI to automatically remove backgrounds
    Choose __8 Rembg Setup__
 
    This script will:
+
    - Check for Python 3 and required packages
    - Create a virtual environment in `/var/www/rembg/rembg_venv`
    - Install rembg and its dependencies (PIL, onnxruntime)

docs/faq/preview.md

@@ -51,11 +51,13 @@ Keeps the DSLR connection alive for preview + capture on Linux.
 
 ## Troubleshooting
 
+
 - Check v4l2loopback after updates:
   ```
   v4l2-ctl --list-devices
   ```
   Expected: `GPhoto2 Webcam (platform:v4l2loopback-000): /dev/video0`
+
 - If missing, rebuild v4l2loopback:
   ```
   curl -LO https://github.com/umlaeute/v4l2loopback/archive/refs/tags/v0.12.7.tar.gz
@@ -64,6 +66,7 @@ Keeps the DSLR connection alive for preview + capture on Linux.
   sudo depmod -a
   sudo modprobe v4l2loopback exclusive_caps=1 card_label="GPhoto2 Webcam"
   ```
+
 - Chromium may pick the wrong webcam (e.g. `bcm2835-isp`); disable other webcams if needed.
 - Long preview startup? Increase countdown (e.g. 8s) or run preview continuously (higher battery/CPU).
 - For command help: `python3 /var/www/html/api/cameracontrol.py --help` (adjust path if installed in a subfolder).

docs/install/prerequisites.md

@@ -1,6 +1,6 @@
 # Prerequisites
 
-| Software          | Required version       | Note
+| Software          | Required version       | Note                                                                                                                                |
 |-------------------|------------------------|-------------------------------------------------------------------------------------------------------------------------------------|
 | Node.js           | >=v20.15.0             | Currently only v20 is tested. Our installer will check your Node.js version and suggest an update/downgrade if needed. Versions below v20 aren't supported anymore. |
 | npm               | >=v10.7.0              |                                                                                                                                     |

docs/install/setup_wizard.md

@@ -3,6 +3,7 @@
 To make the installation and optional feature setup as simple as possible, we have created the "Photobooth Setup Wizard" for you. It can setup your Raspberry Pi, Computer or Laptop as a full blown Photobooth.
 
 This means:
+
 - Photobooth and all needed packages and dependencies get installed and the automatic camera mount is disabled on installaion.
 - Optional permissions can be set/unset
 - Shortcuts and autostart in kiosk mode can be setup/removed
@@ -17,5 +18,6 @@ sudo bash install-photobooth.sh
 ```
 
 On Photobooth installation by default Apache is used for an easy and no-hassle setup.
+
 - Adjust your installation setup if needed: 1 Installation configuration
 - To get to know all options you can simply run `sudo bash install-photobooth.sh --help`.