From 01095093d7c8fb8b977fdab23f3343224af9e5f5 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Mon, 25 Sep 2023 14:29:53 +0200
Subject: [PATCH] prepared Task Executer

---
 api.php          |  2 +-
 index.php        |  6 ++++-
 taskExecuter.php | 65 +++++++++++++++++++++++++++---------------------
 3 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/api.php b/api.php
index 0bbd465..54d8e42 100644
--- a/api.php
+++ b/api.php
@@ -61,7 +61,7 @@ $requests_to_do = Array();
     }
 $taskdata  = Array();
 $taskdata['requests'] = $requests_to_do;
-$taskdata['email'] = 'roman.schenk37@gmail.com';
+$taskdata['email'] = $_POST['email'];
 $taskString = json_encode($taskdata);
 if(!is_dir($taskDir)){
     mkdir($taskDir, 0755, true);
diff --git a/index.php b/index.php
index 8719a1f..554f52b 100644
--- a/index.php
+++ b/index.php
@@ -135,7 +135,11 @@ include "zefixAPI.php";
                 <input type="checkbox" id="phonetischeSuche" name="phonetischeSuche" disabled>
                 <label for="phonetischeSuche">Phonetische Suche (noch in Entwicklung)</label><br><br>
 
-                <input type="submit" value="Suchergebnisse exportieren">
+                <label for="email">Ihre E-Mail Adresse:</label>
+                <p>Das aufbereiten der Daten kann lange dauern. Sie einen Download-Link per E-Mail sobald die Daten bereit sind.</p>
+                <input type="text" id="firma" name="firma" required><br><br>
+
+                <input type="submit" value="Export starten">
             </form>
 
             <script>
diff --git a/taskExecuter.php b/taskExecuter.php
index 61d5f62..217c89a 100644
--- a/taskExecuter.php
+++ b/taskExecuter.php
@@ -1,8 +1,9 @@
 <?php
 
-$maxExecutionTime =
+$maxExecutionTime = 80;
 $taskDir = 'tasks';
-phpinfo();
+$latesEndTime = time() + $maxExecutionTime;
+
 function doRequest($task)
 {
     echo "doing Request: ".json_encode($task);
@@ -12,37 +13,45 @@ function sendEmail($emailAddress, $filename)
 {
     echo "sending ".$filename." too ".$emailAddress;
 }
-if(is_dir($taskDir)) {
-    $taskfiles = scandir($taskDir);
-    $taskfiles = array_diff($taskfiles, array('.', '..'));
-    sort($taskfiles);
-    if(count($taskfiles) > 0) {
-        $taskString = file_get_contents($taskDir.'/'.$taskfiles[0]);
-        $task = json_decode($taskString, true);
+// Stop executing bevore reaching PHP Max Execution Time
+while($latesEndTime - time() > 60){
+    // If the directory for Tasks is already created
+    if(is_dir($taskDir)) {
+        $taskfiles = scandir($taskDir);
+        $taskfiles = array_diff($taskfiles, array('.', '..'));
+        sort($taskfiles);
+        // if there are any taks which are older then 2 Minutes. To be sure the file writing process is finished.
+        if(count($taskfiles) > 0 && intval(explode("-", $taskfiles[0])[0]) + 120 < time()) {
+            $taskString = file_get_contents($taskDir.'/'.$taskfiles[0]);
+            $task = json_decode($taskString, true);
 
-        // if there are any requests to do, do the first
-        if(count($task['requests']) > 0) {
-            doRequest($task['requests'][0]);
-            echo "Request done";
-            array_shift($task['requests']);
-            $taskString = json_encode($task);
-            $taskfile = fopen($taskDir.'/'.$taskfiles[0], 'w');
-            if($taskfile){
-                fwrite($taskfile, $taskString);
-                fclose($taskfile);
+            // if there are any requests to do, do the first
+            if(count($task['requests']) > 0) {
+                doRequest($task['requests'][0]);
+                echo "Request done";
+                array_shift($task['requests']);
+                $taskString = json_encode($task);
+                $taskfile = fopen($taskDir.'/'.$taskfiles[0], 'w');
+                if($taskfile){
+                    fwrite($taskfile, $taskString);
+                    fclose($taskfile);
+                }
             }
-        }
-        // if there are no Requests left, send the E-Mail
+            // if there are no Requests left, send the E-Mail
         else {
-            sendEmail($task['email'], $taskDir.'/'.$taskfiles[0]);
-            echo "Email sent";
-            unlink($taskDir.'/'.$taskfiles[0]);
+                sendEmail($task['email'], $taskDir.'/'.$taskfiles[0]);
+                echo "Email sent";
+                unlink($taskDir.'/'.$taskfiles[0]);
+                echo "Task File deleted";
+            }
+        } else {
+            // acutal Time - start time
+            echo "nothing to do after: ".strval(time() - ($latesEndTime - $maxExecutionTime));
+            echo "sleeping 10 seconds";
+            sleep(10);
         }
-    } else {
-        echo "Task dir Empty";
     }
-} else {
-    echo "no Task dir";
 }
 
+
 ?>
\ No newline at end of file