added new CMD and PARAMETERS (Mesh-Node stuff) and smaller things

Author: fquirin

src/main/java/net/b07z/sepia/server/core/assistant/CMD.java

@@ -34,6 +34,7 @@ public class CMD {
 	final public static String LISTS = "lists";						//parameters:	type, action, info
 	final public static String LOCATION = "location";					//parameters:	search, poi (like italian restaurant, supermarket etc. ...)
 	final public static String MATCH = "match";						//parameters: 	info
+	final public static String MESH_NODE_PLUGIN = "mesh_node_plugin";		//parameters: 	node_url, node_plugin_name, node_plugin_data, reply_success, reply_fail 
 	final public static String MOBILITY = "mobility";					//parameters:	location_start, location_end, type, time
 	final public static String MOVIES = "movies";						//parameters:	search, type (genre), info (actor,director)
 	final public static String MUSIC = "music";						//parameters:	search, type (genre), info (artist?)

src/main/java/net/b07z/sepia/server/core/assistant/PARAMETERS.java

@@ -104,10 +104,17 @@ public class PARAMETERS {
 	final public static String LIST_TYPE = "list_type";			//type of list (e.g. shopping, todo, ...)
 	final public static String LIST_SUBTYPE = "list_subtype";	//sub-type aka name of list (e.g. my great ..., my macys ...)
 
+	//MESH NODE PLUGIN
+	final public static String MESH_NODE_URL = "node_url";					//URL to mesh node
+	final public static String MESH_NODE_PLUGIN_NAME = "node_plugin_name";	//name of mesh node plugin
+	final public static String MESH_NODE_PLUGIN_DATA = "node_plugin_data";	//data (e.g. as JSON string) for node plugin
+	
 	//------------ control parameters -------------
 
 	//CHATS and QUESTIONS
-	final public static String REPLY = "reply";					//a reply the assistant should give submitted as parameter from client
+	final public static String REPLY = "reply";					//a reply the assistant should give submitted as parameter from client (for certain services that use it)
+	final public static String REPLY_SUCCESS = "reply_success";				//a reply used for success (for certain services that use it)
+	final public static String REPLY_FAIL = "reply_fail";					//a reply used for fail (for certain services that use it)
 	final public static String ANY_ANSWER = "any_answer";		//if you don't have a particular parameter that is missing but you ask a previously undefined question you can store the answer here. Maybe add dialog_state to it.
 
 	//CUSTOM SERVICES (do we still need this?)

src/main/java/net/b07z/sepia/server/core/tools/FilesAndStreams.java

@@ -102,9 +102,9 @@ public static List<String> getLinesFromStream(InputStream stream, Charset charse
 	}
 
 	/**
-	 * Get an ArrayList of "File"s from a directory path.
+	 * Get an List of "File"s from a directory path.
 	 * @param directoryName - path to directory
-	 * @param files - ArrayList of files to populate (or null -> creates ArrayList)
+	 * @param files - List of files to populate (or null -> creates ArrayList)
 	 * @param doSubfolders - include sub-folders?
 	 * @return list or null
 	 */
@@ -114,23 +114,68 @@ public static List<File> directoryToFileList(String directoryName, List<File> fi
 			files = new ArrayList<>();
 		}
 
-	    // get all the files from a directory
+	    //get all the files from a directory
 	    File[] fList = directory.listFiles();
 	    if (fList == null){
 	    	return null;
 	    }
 	    //System.out.println(directory.list().length);		//debug
-	    for (File file : fList) {
-	        if (file.isFile()) {
+	    for (File file : fList){
+	        if (file.isFile()){
 	            files.add(file);
 	            //System.out.println(file.toString());		//debug
-	        } else if (file.isDirectory() & doSubfolders) {
+	        }else if (file.isDirectory() & doSubfolders){
 	        	//listAllFiles(file.getAbsolutePath(), files, doSubfolders);
 	        	directoryToFileList(file.getPath(), files, doSubfolders);
 	        }
 	    }
 		return files;
 	}
+	/**
+	 * Get an List of directories at path. Will skip files.
+	 * @param path - path to search for directories
+	 * @param directories - List of files to populate (or null -> creates ArrayList)
+	 * @return list or null
+	 */
+	public static List<File> getDirectoriesAtPath(String path, List<File> directories) {
+		File directory = new File(path);
+		if (directories == null){
+			directories = new ArrayList<>();
+		}
+	
+	    //get everything at path
+	    File[] fList = directory.listFiles();
+	    if (fList == null){
+	    	return null;
+	    }
+	    //System.out.println(directory.list().length);		//debug
+	    for (File file : fList){
+	        if (!file.isFile()){
+	        	directories.add(file);
+	            //System.out.println(file.toString());		//debug
+	        }
+	    }
+		return directories;
+	}
+	
+	/**
+	 * Delete folder with all of it's content. This is necessary because Java's internal file.delete()
+	 * cannot delete non-empty folders.
+	 * @param folder - folder to delete
+	 */
+	public static void deleteFolder(File folder) {
+	    File[] files = folder.listFiles();
+	    if(files!=null) { //some JVMs return null for empty dirs
+	        for(File f: files) {
+	            if(f.isDirectory()) {
+	                deleteFolder(f);
+	            } else {
+	                f.delete();
+	            }
+	        }
+	    }
+	    folder.delete();
+	}
 
 	/**
 	 * Read file and return as list.

src/main/java/net/b07z/sepia/server/core/users/AuthenticationAssistAPI.java

@@ -63,14 +63,14 @@ public boolean authenticate(JSONObject info) {
 
 		//Status?
 		if (!Connectors.httpSuccess(response)){
-			log.warn("No success in auth response for user '" + userid + "', returning false: " + response);
+			log.warn("Authentication ERROR for user '" + userid + "' - original msg.: " + response);
 			errorCode = 3; 			//connection error, wrong parameters?
 			return false;
 		}
 		else{
 			String result = (String) response.get("result");
 			if (result.equals("fail")){
-				log.warn("'fail' in auth response for user '" + userid + "', returning false: " + response);
+				log.warn("Authentication failed for user '" + userid + "' - original msg.: " + response);
 				errorCode = 2;		//authentication failed
 				return false;
 			}