Feature: add filesync

README.md

@@ -207,3 +207,4 @@ If you like my work and like to keep me motivated you can buy me a coconut water
 - [joiyco](https://github.com/joiyco)
 - [EccoB](https://github.com/EccoB)
 - [couz74](https://github.com/couz74)
+- [thatonedude3470](https://github.com/thatonedude3470)

api/admin.php

@@ -99,7 +99,8 @@
 
     if ($os === 'windows') {
         $newConfig['remotebuzzer_enabled'] = false;
-    }
+        $newConfig['synctodrive_enabled'] = false;
+	}
 
     $content = "<?php\n\$config = ". var_export(arrayRecursiveDiff($newConfig, $defaultConfig), true) . ";";
 
@@ -112,7 +113,8 @@
     }
 }
 
-require_once('../lib/remotebuzzer_config.php');
+/* Kill service daemons after config has changed */
+require_once('../lib/services_stop.php');
 
 function arrayRecursiveDiff($aArray1, $aArray2)
 {

config/config.inc.php

@@ -233,6 +233,7 @@
 $config['exiftool']['msg'] = null;
 $config['preview']['cmd'] = null;
 $config['preview']['killcmd'] = null;
+$config['nodebin']['cmd'] = null;
 
 
 // R E M O T E   B U Z Z E R
@@ -241,10 +242,16 @@
 $config['remotebuzzer_collagetime'] = '2';
 $config['remotebuzzer_port'] = 14711;
 $config['remotebuzzer_pin'] = 40;
-$config['remotebuzzer_nodebin'] = '/usr/bin/node';
+$config['remotebuzzer_collagetime'] = '2'; // control time to distinguish picture from collage
 
 
 // R E S E T
 $config['reset_remove_images'] = true;
 $config['reset_remove_mailtxt'] = true;
 $config['reset_remove_config'] = true;
+
+
+ // S Y N C  T O  U S B  S T I C K
+$config['synctodrive_enabled'] = false;
+$config['synctodrive_target'] = 'photobooth'; //Default target for the sync script
+$config['synctodrive_interval'] = 300;

faq/faq.md

@@ -363,3 +363,14 @@ If you run into any errors setting up your hotspot we can remove all the setting
 sudo ./setup-network.sh --clean
 ```
 
+### Automatic picture syncing to USB stick
+
+This feature will automatically and in regular intervals copy (sync) new pictures to a plugged-in USB stick. Currently works on Raspberry PI OS only.
+
+Use the `install-raspbian.sh` script to get the operating system setup in place. The target USB device is selected through the admin panel
+
+A USB drive / stick can be identified either by the USB stick label (e.g. `photobooth`), the operating system specific USB device name (e.g. `/dev/sda1`) or the USB device system subsystem name (e.g. `sda`). The preferred method would be the USB stick label (for use of a single USB stick) or the very specific USB device name, for different USB stick use. The default config will look for a drive with the label photobooth. The script only supports one single USB stick connected at a time
+
+Pictures will be synced to the USB stick matched by the pattern, as long as it is  mounted (aka USB stick is plugged in)
+
+Debugging: switch on dev settings for server logs to be written to the `data/tmp` directory of the photobooth installation (i.e. `data/tmp/synctodrive_server.log`).

gulpfile.js

@@ -14,7 +14,7 @@ gulp.task('sass', function () {
 gulp.task('js', function () {
   return gulp
     .src('./src/js/**/*.js')
-    .pipe(babel({ presets: ['@babel/env'] }))
+    .pipe(babel({ presets: ['@babel/env'], ignore: [ "src/js/sync-to-drive.js", "src/js/remotebuzzer_server.js" ] }))
     .pipe(gulp.dest('./resources/js'));
 });
 
@@ -23,4 +23,4 @@ gulp.task('watch', function () {
   gulp.watch('./src/js/*.js', gulp.series('js'));
 });
 
-gulp.task('default', gulp.parallel('sass', 'js'));
+gulp.task('default', gulp.parallel('sass', 'js'));

index.php

@@ -242,6 +242,6 @@
 	<script src="node_modules/@andreasremdt/simple-translator/dist/umd/translator.min.js"></script>
 	<script type="text/javascript" src="resources/js/i18n.js"></script>
 
-	<?php require_once('lib/remotebuzzer_server.php'); ?>
+	<?php require_once('lib/services_start.php'); ?>
 </body>
 </html>

install-raspbian.sh

@@ -53,6 +53,8 @@ COMMON_PACKAGES=(
     'php-gd'
     'php-zip'
     'yarn'
+    'rsync'
+    'udisks2'
 )
 
 apache_webserver() {
@@ -317,6 +319,37 @@ cat >> /boot/config.txt  << EOF
 dtoverlay=gpio-no-irq
 EOF
 
+echo -e "\033[0;33m### Sync to USB - this feature will automatically copy (sync) new pictures to a USB stick."
+echo -e "### The actual configuration will be done in the admin panel but we need to setup Raspberry Pi OS first"
+read -p "### Would you like to enable the USB sync file backup? [y/N] " -n 1 -r
+echo -e "\033[0m"
+if [[ $REPLY =~ ^[Yy]$ ]]
+then
+    info "### Disabling automount for pi user"
+
+    mkdir -p /home/pi/.config/pcmanfm/LXDE-pi/
+    cat >> /home/pi/.config/pcmanfm/LXDE-pi/pcmanfm.conf <<EOF
+[volume]
+mount_on_startup=0
+mount_removable=0
+autorun=0
+EOF
+
+    chown -R pi:pi /home/pi/.config/pcmanfm
+
+    info "### Adding polkit rule so www-data can (un)mount drives"
+
+    cat >> /etc/polkit-1/localauthority/50-local.d/udisks2.pkla <<EOF
+[Allow www-data to mount drives with udisks2]
+Identity=unix-user:www-data
+Action=org.freedesktop.udisks2.filesystem-mount*;org.freedesktop.udisks2.filesystem-unmount*
+ResultAny=yes
+ResultInactive=yes
+ResultActive=yes
+EOF
+
+fi
+
 info "### Congratulations you finished the install process."
 info "### Have fun with your Photobooth, but first restart your Pi."
 

lib/config.php

@@ -22,6 +22,9 @@
         'preview' => [
             'cmd' => '',
             'killcmd' => '',
+        ],
+        'nodebin' => [
+            'cmd' => '',
         ]
     ],
     'linux' => [
@@ -40,6 +43,9 @@
         'preview' => [
             'cmd' => 'gphoto2 --stdout --capture-movie | ffmpeg -i - -vcodec rawvideo -pix_fmt yuv420p -threads 0 -f v4l2 /dev/video0 > /dev/null 2>&1 & echo $!',
             'killcmd' => 'killall gphoto2 && sleep 1',
+        ],
+        'nodebin' => [
+            'cmd' => '/usr/bin/node',
         ]
     ],
 ];
@@ -75,10 +81,12 @@
 $config['exiftool']['msg'] = $cmds[$os]['exiftool']['msg'];
 $config['preview']['cmd'] = $cmds[$os]['preview']['cmd'];
 $config['preview']['killcmd'] = $cmds[$os]['preview']['killcmd'];
+$config['nodebin']['cmd'] = $cmds[$os]['nodebin']['cmd'];
 
 $config['collage_limit'] = 4;
 
-$config['remotebuzzer_logfile'] = 'io_server.log';
+$config['remotebuzzer_logfile'] = 'remotebuzzer_server.log';
+$config['synctodrive_logfile'] = 'synctodrive_server.log';
 
 $defaultConfig = $config;
 

lib/configsetup.inc.php

@@ -1087,6 +1087,12 @@
 			'placeholder' => 'preview_killcmd',
 			'name' => 'preview[killcmd]',
 			'value' => htmlentities($config['preview']['killcmd'])
+		],
+		'nodebin_cmd' => [
+			'type' => 'input',
+			'placeholder' => 'nodebin_cmd',
+			'name' => 'nodebin[cmd]',
+			'value' => htmlentities($config['nodebin']['cmd'])
 		]
 	],
 	'remotebuzzer' => [
@@ -1118,18 +1124,41 @@
 			'name' => 'remotebuzzer_pin',
 			'value' => $config['remotebuzzer_pin']
 		],
-		'nodebin' => [
-			'type' => 'input',
-			'placeholder' => $defaultConfig['remotebuzzer_nodebin'],
-			'name' => 'remotebuzzer_nodebin',
-			'value' => $config['remotebuzzer_nodebin']
- 		],
 		'logfile' => [
 			'type' => 'hidden',
 			'name' => 'remotebuzzer_logfile',
 			'value' => $config['remotebuzzer_logfile']
 		]
- 	],
+	],
+	'synctodrive' => [
+		'platform' => 'linux',
+		'synctodrive_enabled' => [
+			'type' => 'checkbox',
+			'name' => 'synctodrive_enabled',
+			'value' => $config['synctodrive_enabled']
+		],
+		'target' => [
+			'type' => 'input',
+			'placeholder' => $defaultConfig['synctodrive_target'],
+			'name' => 'synctodrive_target',
+			'value' => $config['synctodrive_target']
+		],
+		'interval' => [
+			'type' => 'range',
+			'placeholder' => $defaultConfig['synctodrive_interval'],
+			'name' => 'synctodrive_interval',
+			'value' => $config['synctodrive_interval'],
+			'range_min' => 10,
+			'range_max' => 600,
+			'range_step' => 1,
+			'unit' => 'seconds'
+		],
+		'logfile' => [
+			'type' => 'hidden',
+			'name' => 'synctodrive_logfile',
+			'value' => $config['synctodrive_logfile']
+		]
+	],
 	'reset' => [
 		'remove_images' => [
 			'type' => 'checkbox',

lib/services_start.php

@@ -0,0 +1,59 @@
+<?php
+
+require_once(__DIR__ . '/config.php');
+
+function processIsRunning ($pName, $pidFile) {
+        if (file_exists($pidFile))
+        {
+                exec("pgrep -F ".$pidFile, $output, $return);
+                if ($return == 0) { return true; } // process is active
+                unlink ($pidFile); // remove stale PID file
+        }
+
+        exec("pgrep -a -f ".$pName, $output, $return);
+        return count($output)-1 ? true : false ; // true if process is active
+}
+
+
+if ($config['remotebuzzer_enabled']) {
+        $connection = @fsockopen('127.0.0.1', $config['remotebuzzer_port']);
+
+        if (! is_resource($connection))
+        {
+                if ($config['dev'])
+                {
+                        $logfile = $config['foldersAbs']['tmp']."/".$config['remotebuzzer_logfile'];
+                }
+                else
+                { $logfile = "/dev/null"; }
+
+                print ("\t<!-- Remote Buzzer enabled --- starting server -->\n");
+
+                proc_close(proc_open ($config['nodebin']['cmd']." resources/js/remotebuzzer_server.js 1>>".$logfile." 2>&1 &", array(), $foo));
+
+        } else {
+               print ("\t<!-- Remote Buzzer Enabled --- server already started (port in use) -->\n");
+        }
+
+        print("\t<script type=\"text/javascript\" src=\"node_modules/socket.io-client/dist/socket.io.slim.js\"></script>\n");
+}
+
+if ($config['synctodrive_enabled']) {
+            if ($config['dev']) {
+                 $logfile = $config['foldersAbs']['tmp']."/".$config['synctodrive_logfile'];
+            }
+            else {
+                 $logfile = "/dev/null";
+            }
+
+            if ( processIsRunning("sync-to-drive.js",$config['foldersAbs']['tmp'].'/synctodrive_server.pid'))
+            {
+               print ("\t<!-- Sync To Drive enabled --- server already active -->\n");
+            }
+            else
+            {
+               print ("\t<!-- Sync To Drive enabled --- starting server -->\n");
+               proc_close(proc_open ($config['nodebin']['cmd']." resources/js/sync-to-drive.js 1>>".$logfile." 2>&1 &", array(), $foo));
+            }
+}
+?>

lib/services_stop.php

@@ -0,0 +1,33 @@
+<?php
+/* check PID file and if found, kill process and delete PID file */
+
+require_once(__DIR__ . '/config.php');
+
+function killProcessIfActive($pName, $pidFile, $logfileName, $killSig)
+{
+        global $config;
+
+        exec("pgrep -f ".$pName,$pids);
+
+        if (count($pids) > 1) {
+           foreach ($pids as $procPID) {
+                if ($config['dev'])
+                {
+                        $logfile = $config['foldersAbs']['tmp']."/".$logfileName;
+                        $fp = fopen($logfile, 'a');//opens file in append mode.
+                        fwrite($fp, "Service Control [ config ]: Photobooth config has changed, killed processes by name ".$pName." -> PID ".$procPID."\n");
+                        fclose($fp);
+                }
+
+                posix_kill($procPID, $killSig);
+           }
+        }
+
+        if (file_exists($pidFile)) { unlink ($pidFile); }
+
+}
+
+killProcessIfActive('remotebuzzer_server.js','../'.$config['folders']['tmp'].'/remotebuzzer_server.pid',$config['remotebuzzer_logfile'], 9);
+killProcessIfActive('sync-to-drive.js','../'.$config['folders']['tmp'].'/synctodrive_server.pid',$config['synctodrive_logfile'], 15);
+
+?>

manual/index.php

@@ -49,6 +49,10 @@
 								echo '<div class="panel-body">';
 
 								foreach($fields as $key => $field) {
+									if ($key == 'platform') {
+									   continue;
+									   };
+
 									echo '<div class="form-row">';
 									switch($field['type']) {
 										case 'checkbox':