feat: seperate single and collage image capture command

Change-Id: I6fd40cbb30c6ecb22c8f9b18a89dbe8e848ac81d

Author: andi34

admin/captureconfig.php

@@ -30,6 +30,7 @@
 
 $config['commands']['preview'] = '';
 $config['commands']['take_picture'] = 'capture %s';
+$config['commands']['take_collage'] = 'capture %s';
 
 $config['picture']['cheese_time'] = '0';
 

admin/wgetcaptureconfig.php

@@ -30,6 +30,7 @@
 
 $config['commands']['preview'] = '';
 $config['commands']['take_picture'] = 'wget -O %s http://' . Environment::getIp() . ':1984/api/frame.jpeg?src=photobooth';
+$config['commands']['take_collage'] = 'wget -O %s http://' . Environment::getIp() . ':1984/api/frame.jpeg?src=photobooth';
 
 $config['picture']['cheese_time'] = '0';
 

api/capture.php

@@ -88,6 +88,8 @@
     } else {
         if ($_POST['style'] === 'custom') {
             $captureHandler->captureCmd = $config['commands']['take_custom'];
+        } elseif ($_POST['style'] === 'collage' && !empty($config['commands']['take_collage'])) {
+            $captureHandler->captureCmd = $config['commands']['take_collage'];
         } else {
             $captureHandler->captureCmd = $config['commands']['take_picture'];
         }

lib/configsetup.inc.php

@@ -3273,6 +3273,13 @@
             'name' => 'commands[take_picture]',
             'value' => htmlentities($config['commands']['take_picture'] ?? ''),
         ],
+        'take_collage_cmd' => [
+            'view' => 'expert',
+            'type' => 'input',
+            'placeholder' => $defaultConfig['commands']['take_collage'],
+            'name' => 'commands[take_collage]',
+            'value' => htmlentities($config['commands']['take_collage'] ?? ''),
+        ],
         'pre_photo_cmd' => [
             'view' => 'expert',
             'type' => 'input',

resources/lang/en.json

@@ -112,6 +112,7 @@
   "commands:print_cmd": "Print command",
   "commands:reboot_cmd": "Reboot command",
   "commands:shutdown_cmd": "Shutdown command",
+  "commands:take_collage_cmd": "Take collage image command",
   "commands:take_picture_cmd": "Take picture command",
   "commands:take_video_cmd": "Command to take a video",
   "confirm": "confirm",
@@ -385,6 +386,7 @@
   "manual:commands:print_cmd": "Command line which is executed while pressing the \"Print\" button.",
   "manual:commands:reboot_cmd": "Command used to initiate reboot via button - example <code>/sbin/shutdown -r now</code>.",
   "manual:commands:shutdown_cmd": "Command used to initiate shutdown via button - example <code>/sbin/shutdown -h now</code>.",
+  "manual:commands:take_collage_cmd": "Command line which is executed while pressing the \"Take Collage\" button. On Linux you can for example use <a href=\"http://www.gphoto.org\"  target=\"_blank\">gphoto2</a> to take pictures, on Windows you can use <a href=\"http://digicamcontrol.com\"  target=\"_blank\">digiCamControl</a>. If empty, the take picture command is used for collage image capture too.",
   "manual:commands:take_picture_cmd": "Command line which is executed while pressing the \"Take Pic\" button. On Linux you can for example use <a href=\"http://www.gphoto.org\"  target=\"_blank\">gphoto2</a> to take pictures, on Windows you can use <a href=\"http://digicamcontrol.com\"  target=\"_blank\">digiCamControl</a>.",
   "manual:commands:take_video_cmd": "Command line which is executed while pressing the \"Take Video\" button.",
   "manual:custom:custom_btn_text": "Enter a text which is visible on the custom picture button.",

src/Configuration/Section/CommandsConfiguration.php

@@ -13,6 +13,7 @@ public static function getNode(): NodeDefinition
         $commands = [
             'windows' => [
                 'take_picture'  => 'digicamcontrol\CameraControlCmd.exe /capture /filename %s',
+                'take_collage'  => '',
                 'take_video'    => '',
                 'take_custom'   => '',
                 'print'         => 'rundll32 C:\WINDOWS\system32\shimgvw.dll,ImageView_PrintTo %s Printer_Name',
@@ -27,6 +28,7 @@ public static function getNode(): NodeDefinition
             ],
             'linux' => [
                 'take_picture'  => 'gphoto2 --capture-image-and-download --filename=%s',
+                'take_collage'  => '',
                 'take_video'    => 'python3 cameracontrol.py -v %s --vlen 3 --vframes 4',
                 'take_custom'   => 'python3 cameracontrol.py --chromaImage=/var/www/html/resources/img/bg.jpg --chromaColor 00ff00 --chromaSensitivity 0.4 --chromaBlend 0.1 --capture-image-and-download %s',
                 'print'         => 'lp -o landscape -o fit-to-page %s',
@@ -55,6 +57,7 @@ public static function getNode(): NodeDefinition
             ->ignoreExtraKeys()
             ->children()
                 ->scalarNode('take_picture')->defaultValue($defaults['take_picture'])->end()
+                ->scalarNode('take_collage')->defaultValue($defaults['take_collage'])->end()
                 ->scalarNode('take_custom')->defaultValue($defaults['take_custom'])->end()
                 ->scalarNode('take_video')->defaultValue($defaults['take_video'])->end()
                 ->scalarNode('print')->defaultValue($defaults['print'])->end()