Revert "Building Speech Strings"

This reverts commit fda4b47.

Author: VaMaster

api.php

@@ -5,7 +5,7 @@
 require_once dirname(__FILE__) . '/php/fetchers.php';
 require_once dirname(__FILE__) . '/php/body.php';
 require_once dirname(__FILE__) . '/php/JsonXmlElement.php';
-require_once dirname(__FILE__) . '/php/helpers/dialogFlow/DialogFlow.php';
+require_once dirname(__FILE__) . '/php/dialogFlow/DialogFlow.php';
 require_once dirname(__FILE__) . '/php/multiCurl.php';
 
 use digitalhigh\DialogFlow\DialogFlow;
@@ -2883,7 +2883,6 @@ function mapApiRequest($request)
             break;
         case 'help':
         case 'welcome.help':
-        case 'helpRequest':
             write_log("Help request!!", "INFO");
             break;
         default:
@@ -3360,8 +3359,6 @@ function buildQueryInfo($params)
         case 'recent':
             $mediaType = $params['type'] ?? false;
             write_log("Media type is $mediaType");
-            $result['media'] = fetchHubList($type, $mediaType);
-            $results['type'] = $mediaType;
             break;
         case 'ondeck':
             $mediaType = 'show';
@@ -3569,18 +3566,10 @@ function buildSpeech($params, $results)
         $speech = buildSpeechWelcome();
         $wait = true;
     }
-    if ($params['intent'] == 'helpRequest') {
+    if ($params['intent'] == 'help' || $params['intent'] == 'welcome.help') {
         $help = buildSpeechHelp();
         $speech = $help[0];
-        if ($_SESSION['amazonRequest'] ?? false) {
-            $sugs = [];
-            foreach($help[1] as $sug) array_push($sugs, "'$sug'");
-            $strings = join(", ",$sugs);
-            $speech .= $strings;
-        } else {
-            $suggestions = $help[1];
-        }
-
+        $suggestions = $help[1];
         $wait = true;
     }
     write_log("Cards?: " . json_encode($cards));
@@ -3707,20 +3696,7 @@ function buildSpeechInfoQuery($params, $cards)
 
 function buildSpeechNoResults($request)
 {
-    write_log("Request: ".json_encode($request));
     $title = is_string($request) ? $request : ($request['request'] ?? $request['type'] ?? 'that request');
-    if (isset($request['infoRequests'])) {
-        $type = $request['infoRequests'];
-        if ($type == 'recent') {
-            if ($request['type'] == 'movie') {
-                $title = "recent movies";
-            } else {
-                $title = "recent shows";
-            }
-        }
-        if ($type == 'ondeck') $title = "on deck items";
-        if ($type == 'airings') $title = "upcoming shows";
-    }
     write_log("No results for request '$request'");
     $array = lang('speechNoInfoResultsArray');
     do {
@@ -3767,14 +3743,10 @@ function buildSpeechHelp()
     $show = ($_SESSION['sickEnabled'] ?? false) || ($_SESSION['sonarrEnabled'] ?? false);
     $music = ($_SESSION['headphonesEnabled'] ?? false) || ($_SESSION['lidarrEnabled'] ?? false);
     $dvr = $_SESSION['plexDvrId'] ?? false;
-    $movieSuggestions = $appSuggestions['movie'];
-    $showSuggestions = $appSuggestions['show'];
-    $musicSuggestions = $appSuggestions['music'];
-    $dvrSuggestions = $appSuggestions['dvr'];
-    if ($movie) array_push($helpSuggestions, $movieSuggestions[array_rand($movieSuggestions)]);
-    if ($show) array_push($helpSuggestions, $showSuggestions[array_rand($showSuggestions)]);
-    if ($music) array_push($helpSuggestions, $musicSuggestions[array_rand($musicSuggestions)]);
-    if ($dvr) array_push($helpSuggestions, $dvrSuggestions['array_rand($dvrSuggestions']);
+    if ($movie) $helpSuggestions = array_merge($helpSuggestions, $appSuggestions['movie']);
+    if ($show) $helpSuggestions = array_merge($helpSuggestions, $appSuggestions['show']);
+    if ($music) $helpSuggestions = array_merge($helpSuggestions, $appSuggestions['music']);
+    if ($dvr) $helpSuggestions = array_merge($helpSuggestions, $appSuggestions['dvr']);
     $helpSuggestions[] = "Cancel";
     $suggestions = $helpSuggestions;
     return [

composer.phar

@@ -1,30 +1,19 @@
 <?php
 namespace digitalhigh;
-require_once dirname(__FILE__) . "/ConfigException.php";
 use mysqli;
-require_once(dirname(__FILE__) . "/util.php");
+require_once(dirname(__FILE__)."/util.php");
 class DbConfig {
 
 
-    /**
-     * DbConfig constructor.
-     * @throws ConfigException
-     */
-    public function __construct()
+	public function __construct()
 	{
 		$this->connection = $this->connect();
 		if ($this->connection === false) {
-			throw new ConfigException("Error connecting to database!!");
+			write_log("Error connecting to db.","ERROR");
 		}
 		return ($this->connection !== false);
 	}
 
-
-	public function isValid()
-    {
-        return ($this->connection ? true : false);
-    }
-
 	protected $connection;
 
 	protected function connect() {

php/helpers/configs/DbConfig.php php/DbConfig.php

@@ -1,7 +1,4 @@
 <?php
-namespace digitalhigh;
-require_once dirname(__FILE__) . "/ConfigException.php";
-use ArrayObject;
 
 class JsonConfig extends ArrayObject {
 
@@ -12,44 +9,19 @@ class JsonConfig extends ArrayObject {
 
     public $data;
 
-    /**
-     * JsonConfig constructor.
-     * @param $filename - The file to use.
-     * @param bool $secure - Whether or not to add a "Access denied flag" to the file. (Needs to be .php)
-     * @throws ConfigException - Pukes all over you if the file can't be written to.
-     */
     public function __construct($filename, $secure=true)
     {
         $this->fileName = $filename;
         $this->header = ";<?php die('Access denied');?>";
         $this->secure = $secure;
 
         $this->data = [];
-        $this->cache = [];
 
-        if (!$this->validate()) throw new ConfigException("Error accessing specified config file.");
-
-        $data = $this->read();
-        if (is_array($data)) {
-            $this->data = $data;
-            $this->cache = $data;
-        } else {
-            throw new ConfigException("Error reading data from file.");
+        if (file_exists($filename)) {
+            $this->read();
         }
     }
 
-    public function isValid() {
-        return ($this->read ? true : false);
-    }
-
-    /**
-     * @param $section
-     * @param $data
-     * @param null $selector
-     * @param null $search
-     * @param bool $new
-     * @throws ConfigException
-     */
     public function set($section, $data, $selector=null, $search=null, $new=false) {
         write_log("Trying to set data for $section with sel of $selector and sea of $search: ".json_encode($data),"ALERT");
         $temp = $this->data[$section] ?? [];
@@ -81,7 +53,7 @@ public function set($section, $data, $selector=null, $search=null, $new=false) {
     }
 
     public function get($section, $keys=false, $selector=null, $search=null) {
-        $data = $this->cache[$section] ?? [];
+        $data = $this->data[$section] ?? [];
         if ($data) {
             if ($selector && $search) {
                 $results = [];
@@ -112,12 +84,6 @@ public function get($section, $keys=false, $selector=null, $search=null) {
         return $data;
     }
 
-    /**
-     * @param $section
-     * @param null $selectors
-     * @param null $values
-     * @throws ConfigException
-     */
     public function delete($section, $selectors=null, $values=null) {
         $sectionData = $this->data[$section] ?? false;
         if ($sectionData) {
@@ -153,73 +119,25 @@ public function delete($section, $selectors=null, $values=null) {
         }
     }
 
-    protected function validate() {
-        if (!file_exists($this->fileName)) {
-            if (touch($this->fileName)) {
-                if (chmod($this->fileName,0666)) {
-                    write_log("Creating file at path '$this->fileName'.","INFO");
-                    $data = $this->header . PHP_EOL .json_encode([],JSON_PRETTY_PRINT);
-                    if (file_put_contents($this->fileName,$data)) {
-                        return true;
-                    }
-                }
-            }
-        } else {
-            return is_writable($this->fileName);
-        }
-        return false;
-    }
-
     protected function read() {
-        $path = $this->fileName;
-        if (!file_exists($path)) {
-            write_log("File doesn't exist?");
-            return false;
-        }
-        $file = fopen($path,'r');
-        $data = fread($file,filesize($path));
-        fclose($file);
-
-        if ($data !== false) {
+        $data = file_get_contents($this->fileName);
+        if ($data) {
             $data = str_replace($this->header, "", $data);
-            $data = json_decode($data,true);
+            $data = trim($data) ? json_decode($data, true) : [];
         }
-
-        return $data;
+        if (!$data) {
+            write_log("Error reading data.","WARN");
+            $data = [];
+        }
+        $this->data = $data;
     }
 
-    /**
-     * @return mixed
-     * @throws ConfigException
-     */
     protected function save() {
         $data = json_encode($this->data,JSON_PRETTY_PRINT);
         $output = $this->header . PHP_EOL . $data;
-        $i = 0;
-        do {
-            $result = $this->write($output);
-            $i++;
-        } while (!$result && $i >=5);
-
-        if (!$result) {
-            throw New ConfigException("Error saving file, this is bad!!");
-        } else {
-            $this->cache = $this->data;
-        }
-        return $result;
-    }
-
-    protected function write($contents) {
-        $path = $this->fileName;
-        $fp = fopen($path, 'w+');
-        if(!flock($fp, LOCK_EX))
-        {
-            return false;
-        }
-        $result = fwrite($fp, $contents);
-        flock($fp, LOCK_UN);
-        fclose($fp);
-        return $result !== false;
+        $success = file_put_contents($this->fileName,$output,LOCK_EX);
+        if (!$success) write_log("Save " . ($success ? 'was' : 'was not') . ' successful.',($success ? "INFO": "ALERT"));
+        return $success;
     }
 
 }

php/helpers/configs/JsonConfig.php php/JsonConfig.php

@@ -1,9 +1,9 @@
 <?php
 require_once dirname(__FILE__) . '/vendor/autoload.php';
 require_once dirname(__FILE__) . '/webApp.php';
-require_once dirname(__FILE__) . '/helpers/fetchers/digitalhigh/watcher/src/Watcher.php';
-require_once dirname(__FILE__) . '/helpers/fetchers/digitalhigh/lidarr/src/Lidarr.php';
-require_once dirname(__FILE__) . '/helpers/fetchers/digitalhigh/headphones/src/Headphones.php';
+require_once dirname(__FILE__) . '/fetchers/digitalhigh/watcher/src/Watcher.php';
+require_once dirname(__FILE__) . '/fetchers/digitalhigh/lidarr/src/Lidarr.php';
+require_once dirname(__FILE__) . '/fetchers/digitalhigh/headphones/src/Headphones.php';
 require_once dirname(__FILE__) . '/util.php';
 require_once dirname(__FILE__) . '/multiCurl.php';
 use Kryptonit3\CouchPotato\CouchPotato;

rw/db.conf.sample.php php/db.conf.sample.php

@@ -47,7 +47,7 @@
 		]
 	},
 	"errorHelpSuggestionsArray": [
-		"Here are some suggestions you can try.",
+		"Below are some suggestions you can try.",
 		"Here are some possible commands.",
 		"Sure, why don't you try one of these?"
 	],

php/helpers/dialogFlow/DialogFlow.php php/dialogFlow/DialogFlow.php

@@ -1,10 +1,10 @@
 <?php
 require_once dirname(__FILE__). '/util.php';
 require_once dirname(__FILE__) . '/vendor/autoload.php';
-require_once dirname(__FILE__) . '/helpers/git/GitUpdate.php';
+require_once dirname(__FILE__) . '/git/GitUpdate.php';
 $useDb = file_exists(dirname(__FILE__) . "/db.conf.php");
 
-require_once dirname(__FILE__) . ($useDb ? '/helpers/configs/DbConfig.php' : '/helpers/configs/JsonConfig.php');
+require_once dirname(__FILE__) . ($useDb ? '/DbConfig.php' : '/JsonConfig.php');
 checkDefaults();
 use digitalhigh\GitUpdate;
 $isWebapp = isWebApp();
@@ -25,31 +25,17 @@ function updateUserPreferenceArray($data) {
     writeSessionArray($data);
 }
 
-function initConfig() {
-    if (isset($_SESSION['config'])) {
-        $config = $_SESSION['config'];
-    } else {
-        $error = false;
-        $useDb = file_exists(dirname(__FILE__) . "/db.conf.php");
-        $configFile = file_build_path(dirname(__FILE__), "..", "rw", "config.php");
-        try {
-            $config = $useDb ? new \digitalhigh\DbConfig() : new \digitalhigh\JsonConfig($configFile);
-        } catch (\digitalhigh\ConfigException $e) {
-            write_log("An exception occurred creating the configuration. '$e'","ERROR");
-            $error = true;
-        }
-        if (!$error) writeSession('config',$config);
-    }
-    return $config;
-}
-
 function setPreference($section, $data, $selector=null, $search=null, $new=false) {
-    $config = initConfig();
+    $useDb = file_exists(dirname(__FILE__) . "/db.conf.php");
+    $configFile = file_build_path(dirname(__FILE__), "..","rw","config.php");
+    $config = $useDb ? new \digitalhigh\DbConfig() : new JsonConfig($configFile);
     $config->set($section, $data, $selector, $search, $new);
 }
 
 function getPreference($section, $keys=false, $default=false, $selector=null, $search=null,$single=true) {
-    $config = initConfig();
+    $useDb = file_exists(dirname(__FILE__) . "/db.conf.php");
+    $configFile = file_build_path(dirname(__FILE__), "..","rw","config.php");
+    $config = $useDb ? new \digitalhigh\DbConfig() : new JsonConfig($configFile);
     $data = $config->get($section, $keys, $selector, $search);
     $ignore = false;
     //if ($section == 'general') write_log("Raw data: ".json_encode($data));
@@ -63,11 +49,14 @@ function getPreference($section, $keys=false, $default=false, $selector=null, $s
         $data = $default;
     }
     if ($single && !is_string($data))  $data = (count($data) == 1) ? $data[0] : $data;
+    //if ($section == 'commands') write_log("Outgoing data: ".json_encode($data));
     return $data;
 }
 
 function deleteData($section, $selector=null, $value=null) {
-    $config = initConfig();
+    $useDb = file_exists(dirname(__FILE__) . "/db.conf.php");
+    $configFile = file_build_path(dirname(__FILE__), "..","rw","config.php");
+    $config = $useDb ? new \digitalhigh\DbConfig() : new JsonConfig($configFile);
     $config->delete($section, $selector, $value);
 }