general: make database optional, read images from images folder if di…

…sabled Change-Id: I7dea6d8ea35eff98f7919aa0010db7432b43fc65
andi34 · Mar 10, 2021 · f89982c · f89982c
1 parent 478c603
commit f89982c
Show file tree

Hide file tree

Showing 11 changed files with 94 additions and 11 deletions.
diff --git a/api/applyEffects.php b/api/applyEffects.php
@@ -213,8 +213,10 @@
 imagedestroy($imageResource);
 
 // insert into database
-if ($_POST['style'] !== 'chroma' || ($_POST['style'] === 'chroma' && $config['live_keying']['show_all'] === true)) {
-    appendImageToDB($file);
+if ($config['database']['enabled']) {
+    if ($_POST['style'] !== 'chroma' || ($_POST['style'] === 'chroma' && $config['live_keying']['show_all'] === true)) {
+        appendImageToDB($file);
+    }
 }
 
 // Change permissions

diff --git a/api/chromakeying/save.php b/api/chromakeying/save.php
@@ -6,7 +6,18 @@
 require_once '../../lib/resize.php';
 
 if ($config['picture']['naming'] === 'numbered') {
-    $images = getImagesFromDB();
+    if ($config['database']['enabled']) {
+        $images = getImagesFromDB();
+    } else {
+        $directory = $config['foldersAbs']['images'];
+        $dh = opendir($directory);
+
+        while (false !== ($filename = readdir($dh))) {
+            $files[] = $filename;
+        }
+        closedir($dh);
+        $images = preg_grep('/\.(jpg|jpeg|JPG|JPEG)$/i', $files);
+    }
     $img_number = count($images);
     $files = str_pad(++$img_number, 4, '0', STR_PAD_LEFT);
     $name = $files . '.jpg';
@@ -44,7 +55,9 @@
 imagedestroy($imageResource);
 
 // insert into database
-appendImageToDB($file);
+if ($config['database']['enabled']) {
+    appendImageToDB($file);
+}
 
 // Change permissions
 chmod($filename_photo, octdec($picture_permissions));

diff --git a/api/deletePhoto.php b/api/deletePhoto.php
@@ -59,7 +59,9 @@
     }
 }
 
-deleteImageFromDB($file);
+if ($config['database']['enabled']) {
+    deleteImageFromDB($file);
+}
 
 echo json_encode([
     'success' => true,

diff --git a/api/takePic.php b/api/takePic.php
@@ -57,7 +57,18 @@ function takePicture($filename) {
 if (!empty($_POST['file']) && preg_match('/^[a-z0-9_]+\.jpg$/', $_POST['file'])) {
     $name = $_POST['file'];
 } elseif ($config['picture']['naming'] === 'numbered') {
-    $images = getImagesFromDB();
+    if ($config['database']['enabled']) {
+        $images = getImagesFromDB();
+    } else {
+        $directory = $config['foldersAbs']['images'];
+        $dh = opendir($directory);
+
+        while (false !== ($filename = readdir($dh))) {
+            $files[] = $filename;
+        }
+        closedir($dh);
+        $images = preg_grep('/\.(jpg|jpeg|JPG|JPEG)$/i', $files);
+    }
     $img_number = count($images);
     $files = str_pad(++$img_number, 4, '0', STR_PAD_LEFT);
     $name = $files . '.jpg';

diff --git a/config/config.inc.php b/config/config.inc.php
@@ -27,6 +27,7 @@
 // control time in milliseconds until Photobooth reloads automatically
 $config['picture']['time_to_live'] = '90000';
 $config['picture']['preview_before_processing'] = true;
+$config['database']['enabled'] = true;
 $config['database']['file'] = 'db';
 
 

diff --git a/gallery.php b/gallery.php
@@ -12,7 +12,19 @@
 	exit(json_encode($resp));
 }
 
-$images = getImagesFromDB();
+if ($config['database']['enabled']) {
+	$images = getImagesFromDB();
+} else {
+	$directory = $config['foldersAbs']['images'];
+	$dh = opendir($directory);
+
+	while (false !== ($filename = readdir($dh))) {
+		$files[] = $filename;
+	}
+	closedir($dh);
+	$images = preg_grep('/\.(jpg|jpeg|JPG|JPEG)$/i', $files);
+}
+
 $imagelist = ($config['gallery']['newest_first'] === true) ? array_reverse($images) : $images;
 ?>
 <!DOCTYPE html>
@@ -101,4 +113,4 @@
 	<script src="node_modules/@andreasremdt/simple-translator/dist/umd/translator.min.js"></script>
 	<script type="text/javascript" src="resources/js/i18n.js"></script>
 </body>
-</html>
+</html>
diff --git a/index.php b/index.php
@@ -5,7 +5,19 @@
 require_once('lib/db.php');
 require_once('lib/filter.php');
 
-$images = getImagesFromDB();
+if ($config['database']['enabled']) {
+	$images = getImagesFromDB();
+} else {
+	$directory = $config['foldersAbs']['images'];
+	$dh = opendir($directory);
+
+	while (false !== ($filename = readdir($dh))) {
+		$files[] = $filename;
+	}
+	closedir($dh);
+	$images = preg_grep('/\.(jpg|jpeg|JPG|JPEG)$/i', $files);
+}
+
 $imagelist = ($config['gallery']['newest_first'] === true) ? array_reverse($images) : $images;
 
 if ($config['ui']['style'] === 'modern') {

diff --git a/lib/configsetup.inc.php b/lib/configsetup.inc.php
@@ -208,6 +208,12 @@
             'name' => 'picture[preview_before_processing]',
             'value' => $config['picture']['preview_before_processing'],
         ],
+        'database_enabled' => [
+            'view' => 'expert',
+            'type' => 'checkbox',
+            'name' => 'database[enabled]',
+            'value' => $config['database']['enabled'],
+        ],
         'database_file' => [
             'view' => 'expert',
             'type' => 'input',

diff --git a/livechroma.php b/livechroma.php
@@ -4,7 +4,18 @@
 require_once('lib/config.php');
 require_once('lib/db.php');
 
-$images = getImagesFromDB();
+if ($config['database']['enabled']) {
+	$images = getImagesFromDB();
+} else {
+	$directory = $config['foldersAbs']['images'];
+	$dh = opendir($directory);
+
+	while (false !== ($filename = readdir($dh))) {
+		$files[] = $filename;
+	}
+	closedir($dh);
+	$images = preg_grep('/\.(jpg|jpeg|JPG|JPEG)$/i', $files);
+}
 $imagelist = ($config['gallery']['newest_first'] === true) ? array_reverse($images) : $images;
 
 if ($config['ui']['style'] === 'modern') {

diff --git a/resources/lang/en.json b/resources/lang/en.json
@@ -96,6 +96,7 @@
   "gallery_no_image": "The gallery is still empty. Take some pictures!",
   "general": "General",
   "general:adminpanel_view": "Admin Options",
+  "general:database_enabled": "Use database for images",
   "general:database_file": "Database file name",
   "general:dev_enabled": "Dev-Mode",
   "general:dev_error_messages": "Show error messages",
@@ -212,6 +213,7 @@
   "manual:gallery:pswp_tapToToggleControls": "If enabled, the visibility of controls / buttons is switched by tapping.",
   "manual:gallery:pswp_zoomEl": "If enabled, PhotoSwipe zoom button is visible inside gallery.",
   "manual:general:adminpanel_view": "Allows to set different views in the admin panel with more (Expert View) or less (Basic View) options accessible",
+  "manual:general:database_enabled": "If enabled, images will be added to a database which is used by the gallery. If disabled, gallery will read the images folder for images - this could reduce the performance.",
   "manual:general:database_file": "Name of the database file.",
   "manual:general:dev_enabled": "Enables development mode. Sample pictures will be used instead taking a picture.",
   "manual:general:dev_error_messages": "If enabled real error messages are shown on error.",

diff --git a/slideshow/index.php b/slideshow/index.php
@@ -4,7 +4,18 @@
 require_once('../lib/db.php');
 require_once('../lib/filter.php');
 
-$images = getImagesFromDB();
+if ($config['database']['enabled']) {
+	$images = getImagesFromDB();
+} else {
+	$directory = $config['foldersAbs']['images'];
+	$dh = opendir($directory);
+
+	while (false !== ($filename = readdir($dh))) {
+		$files[] = $filename;
+	}
+	closedir($dh);
+	$images = preg_grep('/\.(jpg|jpeg|JPG|JPEG)$/i', $files);
+}
 $imagelist = array_reverse($images);
 
 ?>