From 3a4b781d4e8386d90f5457798bbae3af5bdc6418 Mon Sep 17 00:00:00 2001
From: EccoB <eikob@web.de>
Date: Fri, 23 Oct 2020 21:19:49 +0200
Subject: [PATCH 1/3] Implemented continous check for new pictures in
 gallery.php

---
 gallery.php                         | 11 ++++++++
 lib/db.php                          |  7 +++++
 resources/js/gallery_updatecheck.js | 42 +++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 resources/js/gallery_updatecheck.js

diff --git a/gallery.php b/gallery.php
index 432a514e1..82eba9c7c 100644
--- a/gallery.php
+++ b/gallery.php
@@ -3,6 +3,16 @@
 require_once('lib/config.php');
 require_once('lib/db.php');
 
+// Check if there is a request for the status of the database
+if (isset($_GET['status'])){
+	// Request for DB-Status,
+	// Currently reports back the DB-Size to give the Client the ability
+	// to detect changes
+	$resp = array('dbsize'=>getDBSize());
+	exit(json_encode($resp));
+
+}
+
 $images = getImagesFromDB();
 $imagelist = ($config['newest_first'] === true) ? array_reverse($images) : $images;
 ?>
@@ -88,6 +98,7 @@
 	<script type="text/javascript" src="resources/js/theme.js"></script>
 	<script type="text/javascript" src="resources/js/core.js"></script>
 	<script type="text/javascript" src="resources/lang/<?php echo $config['language']; ?>.js"></script>
+	<script type="text/javascript" src="resources/js/gallery_updatecheck.js"></script>
 	<script>
 		$(function() {
 			let reloadElement = $('<a class="gallery__reload">');
diff --git a/lib/db.php b/lib/db.php
index 8f398e284..c0d21e7a8 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -34,3 +34,10 @@ function isImageInDB($filename) {
 
 	return in_array($filename, $images);
 }
+
+function getDBSize(){
+	if(file_exists(DB_FILE)){
+		return (int) filesize(DB_FILE);
+	}
+	return 0;
+}
diff --git a/resources/js/gallery_updatecheck.js b/resources/js/gallery_updatecheck.js
new file mode 100644
index 000000000..cf9ccb981
--- /dev/null
+++ b/resources/js/gallery_updatecheck.js
@@ -0,0 +1,42 @@
+/*
+This script checks for new pictures in regular intervals.
+If changes are detected, the page will automatically be reloaded.
+
+Needs:
+jQuery
+photoBooth Javascript
+
+Remarks:
+- Not made for highly demanded pages (as pages is requested regulary
+and would pile up in high load with thausend of users)
+- Instead of reloading, adding the pictures directly would be an
+improvement, but would need further changes in gallery-templates
+
+*/
+
+var lastDBSize=-1;		 //Size of the DB - is used to determine changes
+var interval = 1000 * 5; // Interval, the pages is checked (/ms)
+var ajaxurl="gallery.php/?status"; //URL to request for changes
+
+/*
+This function will be called if there are new pictures
+*/
+function dbUpdated(){
+	console.log("DB is updated - refreshing");
+	//location.reload(true); //Alternative
+	photoBooth.reloadPage();
+}
+
+
+var checkForUpdates = function() {
+  $.getJSON({url: ajaxurl, success: 
+	  
+	  function(result){
+		var currentDBSize=result['dbsize'];
+		if(lastDBSize!=currentDBSize && lastDBSize !=-1){
+			dbUpdated();
+		}
+		lastDBSize=currentDBSize;
+    }});
+};
+setInterval(checkForUpdates, interval);

From a26cd491a1e85ca2320cdd5cbd0823c3e44986cc Mon Sep 17 00:00:00 2001
From: EccoB <eikob@web.de>
Date: Mon, 26 Oct 2020 00:02:23 +0100
Subject: [PATCH 2/3] Gallery won't be refreshed after any user interaction -
 Added public function to check for pending Timeouts in core.js - Added check
 using that function in gallery update check

---
 resources/js/core.js                | 5 +++++
 resources/js/gallery_updatecheck.js | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/resources/js/core.js b/resources/js/core.js
index 6080ade76..ee578303a 100644
--- a/resources/js/core.js
+++ b/resources/js/core.js
@@ -51,6 +51,11 @@ const photoBooth = (function () {
         window.location.reload();
     }
 
+    // Returns true when timeOut is pending
+    public.isTimeOutPending = function(){
+		return (typeof timeOut !== 'undefined');
+	}
+
     // timeOut function
     public.resetTimeOut = function () {
         clearTimeout(timeOut);
diff --git a/resources/js/gallery_updatecheck.js b/resources/js/gallery_updatecheck.js
index cf9ccb981..b9bad4aa3 100644
--- a/resources/js/gallery_updatecheck.js
+++ b/resources/js/gallery_updatecheck.js
@@ -15,7 +15,7 @@ improvement, but would need further changes in gallery-templates
 */
 
 var lastDBSize=-1;		 //Size of the DB - is used to determine changes
-var interval = 1000 * 5; // Interval, the pages is checked (/ms)
+var interval = 1000 * 5; // Interval, the page is checked (/ms)
 var ajaxurl="gallery.php/?status"; //URL to request for changes
 
 /*
@@ -29,8 +29,9 @@ function dbUpdated(){
 
 
 var checkForUpdates = function() {
-  $.getJSON({url: ajaxurl, success: 
-	  
+	if(photoBooth.isTimeOutPending())
+		return;	//If there is user interaction, do not check for updates
+	$.getJSON({url: ajaxurl, success:
 	  function(result){
 		var currentDBSize=result['dbsize'];
 		if(lastDBSize!=currentDBSize && lastDBSize !=-1){

From 08e36cc54f5213b31073d8f2c1f4b23a2434720e Mon Sep 17 00:00:00 2001
From: EccoB <eikob@web.de>
Date: Mon, 26 Oct 2020 22:08:47 +0100
Subject: [PATCH 3/3] Corrected wrong url for ajax-request

---
 resources/js/gallery_updatecheck.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/gallery_updatecheck.js b/resources/js/gallery_updatecheck.js
index b9bad4aa3..355819bb4 100644
--- a/resources/js/gallery_updatecheck.js
+++ b/resources/js/gallery_updatecheck.js
@@ -16,7 +16,7 @@ improvement, but would need further changes in gallery-templates
 
 var lastDBSize=-1;		 //Size of the DB - is used to determine changes
 var interval = 1000 * 5; // Interval, the page is checked (/ms)
-var ajaxurl="gallery.php/?status"; //URL to request for changes
+var ajaxurl="gallery.php?status"; //URL to request for changes
 
 /*
 This function will be called if there are new pictures