server

Made appropriate changes with new ActionAPI, renamed StreamPi to Stream-Pi, Updated license

Download Browse

+38 −27

Author

Debayan Sutradhar (rnayabed) 2021-01-31 22:33

Committer

Debayan Sutradhar (rnayabed) 2021-01-31 22:33

Hash faf84fb26aa2ce8a3a4ba5493c203e5fcac3d313

Parent 22d4bf50faee09b02e7f2fa43af2259ef60a89df

Reference git #server/faf84fb26aa2ce8a3a4ba5493c203e5fcac3d313

Modified Files

List

Side by side diff

Inline diff

M src/main/java/com/StreamPi/Server/Connection/ClientConnection.java

+1 −1

package com.StreamPi.Server.Connection;

import com.StreamPi.ActionAPI.Action.Action;

import com.StreamPi.ActionAPI.Action.ActionType;

import com.StreamPi.ActionAPI.Action.DisplayTextAlignment;

import com.StreamPi.ActionAPI.Action.Location;

import com.StreamPi.ActionAPI.ActionProperty.ClientProperties;

import com.StreamPi.ActionAPI.ActionProperty.Property.Property;

import com.StreamPi.ActionAPI.ActionProperty.Property.Type;

import com.StreamPi.ActionAPI.NormalAction.NormalAction;

import com.StreamPi.ActionAPI.OtherActions.CombineAction;

import com.StreamPi.ActionAPI.OtherActions.FolderAction;

import com.StreamPi.Server.Action.NormalActionPlugins;

import com.StreamPi.Server.Client.Client;

import com.StreamPi.Server.Client.ClientProfile;

import com.StreamPi.Server.Client.ClientTheme;

import com.StreamPi.Server.Info.ServerInfo;

import com.StreamPi.Server.Window.ExceptionAndAlertHandler;

import com.StreamPi.Util.Alert.StreamPiAlert;

import com.StreamPi.Util.Alert.StreamPiAlertType;

import com.StreamPi.Util.Exception.MinorException;

import com.StreamPi.Util.Exception.SevereException;

import com.StreamPi.Util.Exception.StreamPiException;

import com.StreamPi.Util.Platform.Platform;

import com.StreamPi.Util.Platform.ReleaseStatus;

import com.StreamPi.Util.Version.Version;

import javafx.concurrent.Task;

import java.io.ByteArrayOutputStream;

import java.io.DataInputStream;

import java.io.DataOutputStream;

import java.io.IOException;

import java.net.ServerSocket;

import java.net.Socket;

import java.net.SocketException;

import java.net.SocketTimeoutException;

import java.nio.ByteBuffer;

import java.nio.charset.Charset;

import java.nio.charset.StandardCharsets;

import java.util.ArrayList;

import java.util.List;

import java.util.Random;

import java.util.UUID;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.logging.Level;

import java.util.logging.Logger;

import java.util.stream.Stream;

public class ClientConnection extends Thread{

private Socket socket;

private ServerListener serverListener;

private AtomicBoolean stop = new AtomicBoolean(false);

private DataInputStream dis;

private DataOutputStream dos;

private Logger logger;

private Client client = null;

private ExceptionAndAlertHandler exceptionAndAlertHandler;

public ClientConnection(Socket socket, ServerListener serverListener, ExceptionAndAlertHandler exceptionAndAlertHandler)

{

this.exceptionAndAlertHandler = exceptionAndAlertHandler;

//actionIconsToBeSent = new ArrayList__();

this.socket = socket;

this.serverListener = serverListener;

logger = Logger.getLogger(ClientConnection.class.getName());

try

{

dis = new DataInputStream(socket.getInputStream());

dos = new DataOutputStream(socket.getOutputStream());

} catch (IOException e) {

e.printStackTrace();

exceptionAndAlertHandler.handleMinorException(new MinorException("Unable to start socket streams"));

}

start();

}

public synchronized void exit()

{

if(stop.get())

return;

logger.info("Stopping ...");

try

{

if(socket !=null)

{

logger.info("Stopping connection "+socket.getRemoteSocketAddress());

disconnect();

}

catch (SevereException e)

{

e.printStackTrace();

exceptionAndAlertHandler.handleSevereException(e);

}

public synchronized void exitAndRemove()

{

exit();

removeConnection();

serverListener.clearTemp();

}

public void removeConnection()

{

ClientConnections.getInstance().removeConnection(this);

}

public void writeToStream(String text) throws SevereException

{

/*try

{

logger.debug(text);

dos.writeUTF(text);

dos.flush();

}

catch (IOException e)

{

e.printStackTrace();

throw new SevereException("Unable to write to IO Stream!");

}*/

try

{

byte[] txtBytes = text.getBytes();

Thread.sleep(50);

dos.writeUTF("string:: ::");

dos.flush();

dos.writeInt(txtBytes.length);

dos.flush();

write(txtBytes);

dos.flush();

}

catch (IOException | InterruptedException e)

{

e.printStackTrace();

throw new SevereException("Unable to write to IO Stream!");

}

public void sendIcon(String profileID, String actionID, byte[] icon) throws SevereException

{

try

{

logger.info("Sending action Icon...");

//Thread.sleep(50);

System.out.println("1");

dos.writeUTF("action_icon::"+profileID+"!!"+actionID+"!!::"+icon.length);

System.out.println("2");

dos.flush();

System.out.println("3");

dos.writeInt(icon.length);

System.out.println("4");

dos.flush();

System.out.println("5");

write(icon);

System.out.println("6");

dos.flush();

System.out.println("7");

}

catch (IOException e)

{

e.printStackTrace();

throw new SevereException("Unable to write to IO Stream!");

}

public void write(byte[] array) throws SevereException

{

try

{

dos.write(array);

}

catch (IOException e)

{

e.printStackTrace();

throw new SevereException("Unable to write to IO Stream!");

}

public void initAfterConnectionQueryReceive(String[] arr) throws StreamPiException

{

logger.info("Setting up Client object ...");

Version clientVersion;

Version commsStandard;

Version themesStandard;

ReleaseStatus releaseStatus;

try

{

clientVersion = new Version(arr[1]);

releaseStatus = ReleaseStatus.valueOf(arr[2]);

commsStandard = new Version(arr[3]);

themesStandard = new Version(arr[4]);

}

catch (MinorException e)

{

exitAndRemove();

throw new MinorException(e.getShortMessage()+" (Client '"+socket.getRemoteSocketAddress()+"' )");

}

if(!commsStandard.isEqual(ServerInfo.getInstance().getCommStandardVersion()))

{

String errTxt = "Server and Client Communication standards do not match. Make sure you are on the latest version of server and client.\n" +

"Server Comms. Standard : "+ServerInfo.getInstance().getCommStandardVersion().getText()+

"\nClient Comms. Standard : "+commsStandard.getText();

disconnect(errTxt);

throw new MinorException(errTxt);

}

client = new Client(clientVersion, releaseStatus, commsStandard, themesStandard, arr[5], Platform.valueOf(arr[8]), socket.getRemoteSocketAddress());

client.setStartupDisplayWidth(Double.parseDouble(arr[6]));

client.setStartupDisplayHeight(Double.parseDouble(arr[7]));

client.setDefaultProfileID(arr[9]);

client.setDefaultThemeFullName(arr[10]);

//call get profiles command.

serverListener.clearTemp();

}

public synchronized Client getClient()

{

return client;

}

@Override

public void run() {

try {

initAfterConnectionQuerySend();

} catch (SevereException e) {

e.printStackTrace();

exceptionAndAlertHandler.handleSevereException(e);

exitAndRemove();

return;

}

try

{

while(!stop.get())

{

String msg = "";

try

{

String raw = dis.readUTF();

int length = dis.readInt();

System.out.println("SIZE TO READ : "+length);

String[] precursor = raw.split("::");

String inputType = precursor[0];

String secondArg = precursor[1];

ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();

/*int count;

int chunkSize = 512;

while (length>0)

{

if(chunkSize > length)

chunkSize = length;

else

chunkSize = 512;

byte[] buffer = new byte[chunkSize];

count = dis.read(buffer);

System.out.println(count);

byteArrayOutputStream.write(buffer);

length-=count;

}*/

/*byte[] buffer = new byte[8192];

int read;

while((read = dis.read(buffer)) != -1){

System.out.println("READ : "+read);

byteArrayOutputStream.write(buffer, 0, read);

}

System.out.println("READ : "+byteArrayOutputStream.size());

byteArrayOutputStream.close();

byte[] bArr = byteArrayOutputStream.toByteArray();*/

byte[] bArr = new byte[length];

dis.readFully(bArr);

if(inputType.equals("string"))

{

msg = new String(bArr);

}

else if(inputType.equals("action_icon"))

{

String[] secondArgSep = secondArg.split("!!");

String profileID = secondArgSep[0];

String actionID = secondArgSep[1];

getClient().getProfileByID(profileID).getActionByID(actionID).setIcon(bArr);

//serverListener.clearTemp();

continue;

}

catch (IOException e)

{

logger.log(Level.SEVERE, e.getMessage());

e.printStackTrace();

serverListener.clearTemp();

if(!stop.get())

{

removeConnection();

throw new MinorException("Accidentally disconnected from "+getClient().getNickName()+".");

}

exitAndRemove();

return;

}

logger.info("Received text : '"+msg+"'");

String[] sep = msg.split("::");

String command = sep[0];

switch (command)

{

case "disconnect" : clientDisconnected(msg);

break;

case "client_details" : initAfterConnectionQueryReceive(sep);

getProfilesFromClient();

getThemesFromClient();

break;

case "profiles" : registerProfilesFromClient(sep);

break;

case "profile_details" : registerProfileDetailsFromClient(sep);

break;

case "action_details" : registerActionToProfile(sep);

break;

case "themes": registerThemes(sep);

break;

case "action_clicked": actionClicked(sep[1], sep[2]);

break;

default: logger.warning("Command '"+command+"' does not match records. Make sure client and server versions are equal.");

}

catch (StreamPiException e)

{

e.printStackTrace();

if(e instanceof MinorException)

exceptionAndAlertHandler.handleMinorException((MinorException) e);

else if (e instanceof SevereException)

exceptionAndAlertHandler.handleSevereException((SevereException) e);

}

// commands

public void initAfterConnectionQuerySend() throws SevereException

{

logger.info("Asking client details ...");

writeToStream("get_client_details::");

}

public void disconnect() throws SevereException {

disconnect("");

}

public void disconnect(String message) throws SevereException {

if(stop.get())

return;

stop.set(true);

logger.info("Sending client disconnect message ...");

writeToStream("disconnect::"+message+"::");

try

{

if(!socket.isClosed())

socket.close();

}

catch (IOException e)

{

e.printStackTrace();

throw new SevereException("Unable to close socket");

}

public void clientDisconnected(String message)

{

stop.set(true);

String txt = "Disconnected!";

if(!message.equals("disconnect::::"))

txt = "Message : "+message.split("::")[1];

new StreamPiAlert("Disconnected from "+getClient().getNickName()+".", txt, StreamPiAlertType.WARNING).show();;

exitAndRemove();

}

public void getProfilesFromClient() throws StreamPiException

{

logger.info("Asking client to send profiles ...");

writeToStream("get_profiles::");

}

public void getThemesFromClient() throws StreamPiException

{

logger.info("Asking clients to send themes ...");

writeToStream("get_themes::");

}

public void registerThemes(String[] sep)

{

for(int i =1; i<sep.length;i++)

{

String[] internal = sep[i].split("__");

ClientTheme clientTheme = new ClientTheme(

internal[0],

internal[1],

internal[2],

internal[3]

);

try

{

getClient().addTheme(clientTheme);

}

catch (CloneNotSupportedException e)

{

logger.log(Level.SEVERE, e.getMessage());

e.printStackTrace();

}

public void registerProfilesFromClient(String[] sep) throws StreamPiException

{

logger.info("Registering profiles ...");

int noOfProfiles = Integer.parseInt(sep[1]);

getClient().setTotalNoOfProfiles(noOfProfiles);

for(int i = 2; i<(noOfProfiles + 2); i++)

{

String profileID = sep[i];

getProfileDetailsFromClient(profileID);

}

public void getProfileDetailsFromClient(String ID) throws StreamPiException

{

logger.info("Asking client to send details of profile : "+ID);

writeToStream("get_profile_details::"+ID+"::");

}

public void registerProfileDetailsFromClient(String[] sep)

{

String ID = sep[1];

logger.info("Registering details for profile : "+ID);

String name = sep[2];

int rows = Integer.parseInt(sep[3]);

int cols = Integer.parseInt(sep[4]);

int actionSize = Integer.parseInt(sep[5]);

int actionGap = Integer.parseInt(sep[6]);

ClientProfile clientProfile = new ClientProfile(name, ID, rows, cols, actionSize, actionGap);

logger.info("Added client profile "+clientProfile.getName());

try

{

getClient().addProfile(clientProfile);

}

catch (CloneNotSupportedException e)

{

logger.severe(e.getMessage());

e.printStackTrace();

}

serverListener.clearTemp();

}

/*public void getActionIcon(String profileID, String actionID) throws StreamPiException

{

System.out.println("getting action icon from "+profileID+", "+actionID);

writeToStream("get_action_icon::"+profileID+"::"+actionID);

}*/

public synchronized void registerActionToProfile(String[] sep) throws StreamPiException

{

String profileID = sep[1];

String ID = sep[2];

ActionType actionType = ActionType.valueOf(sep[3]);

//4 - Version

//5 - ModuleName

//display

String bgColorHex = sep[6];

//icon

boolean isHasIcon = sep[7].equals("true");

boolean isShowIcon = sep[8].equals("true");

//text

boolean isShowDisplayText = sep[9].equals("true");

String displayFontColor = sep[10];

String displayText = sep[11];

DisplayTextAlignment displayTextAlignment = DisplayTextAlignment.valueOf(sep[12]);

//location

String row = sep[13];

String col = sep[14];

Location location = new Location(Integer.parseInt(row), Integer.parseInt(col));

Action action = new Action(ID, actionType);

action.setBgColourHex(bgColorHex);

action.setShowIcon(isShowIcon);

action.setHasIcon(isHasIcon);

action.setShowDisplayText(isShowDisplayText);

action.setDisplayTextFontColourHex(displayFontColor);

action.setDisplayText(displayText);

action.setDisplayTextAlignment(displayTextAlignment);

action.setLocation(location);

//client properties

int clientPropertiesSize = Integer.parseInt(sep[15]);

String root = sep[17];

action.setParent(root);

String[] clientPropertiesRaw = sep[16].split("!!");

ClientProperties clientProperties = new ClientProperties();

if(actionType == ActionType.FOLDER)

clientProperties.setDuplicatePropertyAllowed(true);

for(int i = 0;i<clientPropertiesSize; i++)

{

String[] clientPraw = clientPropertiesRaw[i].split("__");

Property property = new Property(clientPraw[0], Type.STRING);

if(clientPraw.length > 1)

property.setRawValue(clientPraw[1]);

clientProperties.addProperty(property);

}

action.setClientProperties(clientProperties);

action.setModuleName(sep[5]);

//set up action

//Action toBeAdded = null;

if(actionType == ActionType.NORMAL)

{

NormalAction actionCopy = NormalActionPlugins.getInstance().getPluginByModuleName(sep[5]);

if(actionCopy == null)

{

action.setInvalid(true);

}

else

{

action.setVersion(new Version(sep[4]));

action.setRepo(actionCopy.getRepo());

//action.setHelpLink(actionCopy.getHelpLink());

if(actionCopy.getVersion().getMajor() != action.getVersion().getMajor())

{

action.setInvalid(true);

}

else

{

action.setName(actionCopy.getName());

ClientProperties finalClientProperties = new ClientProperties();

for(Property property : actionCopy.getClientProperties().get())

{

for(int i = 0;i<action.getClientProperties().getSize();i++)

{

Property property1 = action.getClientProperties().get().get(i);

if (property.getName().equals(property1.getName()))

{

property.setRawValue(property1.getRawValue());

finalClientProperties.addProperty(property);

}

action.setClientProperties(finalClientProperties);

}

try

{

for(Property prop : action.getClientProperties().get())

{

logger.info("G@@@@@ : "+prop.getRawValue());

}

getClient().getProfileByID(profileID).addAction(action);

for(String action1x : getClient().getProfileByID(profileID).getActionsKeySet())

{

Action action1 = getClient().getProfileByID(profileID).getActionByID(action1x);

logger.info("231cc : "+action1.getID());

for(Property prop : action1.getClientProperties().get())

{

logger.info("G@VVVV@@@ : "+prop.getRawValue());

}

catch (CloneNotSupportedException e)

{

e.printStackTrace();

exceptionAndAlertHandler.handleMinorException(new MinorException("Action", "Unable to clone"));

}

public void saveActionDetails(String profileID, Action action) throws SevereException

{

StringBuilder finalQuery = new StringBuilder("save_action_details::");

//failsafes

if(action.getDisplayText().endsWith(":"))

action.setDisplayText(action.getDisplayText()+" ");

finalQuery.append(profileID)

.append("::")

.append(action.getID())

.append("::")

.append(action.getActionType())

.append("::");

if(action.getActionType() == ActionType.NORMAL)

{

finalQuery.append(action.getVersion().getText());

System.out.println("VERSION :sdd "+action.getVersion().getText());

}

finalQuery.append("::");

if(action.getActionType() == ActionType.NORMAL)

finalQuery.append(action.getModuleName());

finalQuery.append("::");

//display

finalQuery.append(action.getBgColourHex())

.append("::");

//icon

finalQuery.append(action.isHasIcon())

.append("::")

.append(action.isShowIcon())

.append("::");

//text

finalQuery.append(action.isShowDisplayText())

.append("::")

.append(action.getDisplayTextFontColourHex())

.append("::")

.append(action.getDisplayText())

.append("::")

.append(action.getDisplayTextAlignment())

.append("::");

//location

if(action.getLocation() == null)

finalQuery.append("-1::-1::");

else

finalQuery.append(action.getLocation().getRow())

.append("::")

.append(action.getLocation().getCol())

.append("::");

//client properties

ClientProperties clientProperties = action.getClientProperties();

finalQuery.append(clientProperties.getSize())

.append("::");

for(Property property : clientProperties.get())

{

finalQuery.append(property.getName())

.append("__")

.append(property.getRawValue())

.append("__");

finalQuery.append("!!");

}

finalQuery.append("::")

.append(action.getParent())

.append("::");

writeToStream(finalQuery.toString());

}

public void deleteAction(String profileID, String actionID) throws SevereException

{

writeToStream("delete_action::"+profileID+"::"+actionID);

}

public void saveClientDetails(String clientNickname, String screenWidth, String screenHeight, String defaultProfileID,

String defaultThemeFullName) throws SevereException

{

writeToStream("save_client_details::"+

clientNickname+"::"+

screenWidth+"::"+

screenHeight+"::"+

defaultProfileID+"::"+

defaultThemeFullName+"::");

client.setNickName(clientNickname);

client.setStartupDisplayWidth(Double.parseDouble(screenWidth));

client.setStartupDisplayHeight(Double.parseDouble(screenHeight));

client.setDefaultProfileID(defaultProfileID);

client.setDefaultThemeFullName(defaultThemeFullName);

}

public void saveProfileDetails(ClientProfile clientProfile) throws SevereException, CloneNotSupportedException {

if(client.getProfileByID(clientProfile.getID()) !=null)

{

client.getProfileByID(clientProfile.getID()).setName(clientProfile.getName());

client.getProfileByID(clientProfile.getID()).setRows(clientProfile.getRows());

client.getProfileByID(clientProfile.getID()).setCols(clientProfile.getCols());

client.getProfileByID(clientProfile.getID()).setActionSize(clientProfile.getActionSize());

client.getProfileByID(clientProfile.getID()).setActionGap(clientProfile.getActionGap());

}

else

client.addProfile(clientProfile);

writeToStream("save_client_profile::"+

clientProfile.getID()+"::"+

clientProfile.getName()+"::"+

clientProfile.getRows()+"::"+

clientProfile.getCols()+"::"+

clientProfile.getActionSize()+"::"+

clientProfile.getActionGap()+"::");

}

public void deleteProfile(String ID) throws SevereException

{

writeToStream("delete_profile::"+ID+"::");

}

public void actionClicked(String profileID, String actionID) {

try

{

Action action = client.getProfileByID(profileID).getActionByID(actionID);

if(action.getActionType() == ActionType.NORMAL)

{

NormalAction original = NormalActionPlugins.getInstance().getPluginByModuleName(

action.getModuleName()

);

if(original == null)

{

throw new MinorException(

"The Action isn't installed on the server."

);

}

NormalAction normalAction = original.clone();

normalAction.setLocation(action.getLocation());

normalAction.setDisplayText(action.getDisplayText());

normalAction.setID(actionID);

normalAction.setClientProperties(action.getClientProperties());

new Thread(new Task<Void>() {

@Override

protected Void call()

{

try

{

boolean result = serverListener.onNormalActionClicked(normalAction);

if(!result)

{

sendActionFailed(profileID, actionID);

}

catch (SevereException e)

{

exceptionAndAlertHandler.handleSevereException(e);

}

return null;

}

}).start();

}

} catch (Exception e) {

e.printStackTrace();

exceptionAndAlertHandler.handleMinorException(new MinorException(e.getMessage()));

}

public void sendActionFailed(String profileID, String actionID) throws SevereException {

logger.info("Sending failed status ...");

writeToStream("action_failed::"+

profileID+"::"+

actionID+"::");

}

M src/main/java/com/StreamPi/Server/Controller/Controller.java

+3 −3

package com.StreamPi.Server.Controller;

import com.StreamPi.ActionAPI.Action.ServerConnection;

import com.StreamPi.ActionAPI.Action.PropertySaver;

import com.StreamPi.ActionAPI.NormalAction.NormalAction;

import com.StreamPi.Server.Main;

import com.StreamPi.Server.Action.NormalActionPlugins;

import com.StreamPi.Server.Connection.ClientConnections;

import com.StreamPi.Server.Connection.MainServer;

import com.StreamPi.Server.IO.Config;

import com.StreamPi.Server.Info.ServerInfo;

import com.StreamPi.Server.Window.Base;

import com.StreamPi.Server.Window.Dashboard.DonatePopupContent;

import com.StreamPi.Server.Window.FirstTimeUse.FirstTimeUse;

import com.StreamPi.Util.Alert.StreamPiAlert;

import com.StreamPi.Util.Alert.StreamPiAlertListener;

import com.StreamPi.Util.Alert.StreamPiAlertType;

import com.StreamPi.Util.Exception.MinorException;

import com.StreamPi.Util.Exception.SevereException;

import com.StreamPi.Util.IOHelper.IOHelper;

import javafx.animation.Interpolator;

import javafx.animation.KeyFrame;

import javafx.animation.KeyValue;

import javafx.animation.Timeline;

import javafx.application.Platform;

import javafx.concurrent.Task;

import javafx.scene.Node;

import javafx.scene.Scene;

import javafx.stage.Modality;

import javafx.stage.Stage;

import javafx.stage.WindowEvent;

import java.awt.SystemTray;

import javafx.util.Duration;

import java.awt.Toolkit;

import java.awt.TrayIcon;

import java.awt.PopupMenu;

import java.awt.MenuItem;

import java.io.File;

import java.net.InetAddress;

import java.net.UnknownHostException;

import java.util.Random;

import java.util.logging.Level;

public class Controller extends Base implements PropertySaver, ServerConnection

{

MainServer mainServer;

final SystemTray systemTray;

public void setupDashWindow() throws SevereException

{

try

{

getStage().setTitle("StreamPi Server - "+InetAddress.getLocalHost().getCanonicalHostName()+":"+Config.getInstance().getPort()); //Sets title

getStage().setTitle("Stream-Pi Server - "+InetAddress.getLocalHost().getCanonicalHostName()+":"+Config.getInstance().getPort()); //Sets title

getStage().setOnCloseRequest(this::onCloseRequest);

}

catch (UnknownHostException e)

{

e.printStackTrace();

throw new SevereException(e.getMessage());

}

private void checkPrePathDirectory() throws SevereException

{

try {

File filex = new File(ServerInfo.getInstance().getPrePath());

System.out.println("SAX : "+filex.exists());

if(!filex.exists())

{

filex.mkdirs();

IOHelper.unzip(Main.class.getResourceAsStream("Default.obj"), ServerInfo.getInstance().getPrePath());

}

catch (Exception e)

{

e.printStackTrace();

throw new SevereException(e.getMessage());

}

@Override

public void init()

{

try {

checkPrePathDirectory();

initBase();

setupDashWindow();

setupSettingsWindowsAnimations();

NormalActionPlugins.getInstance().setPropertySaver(this);

NormalActionPlugins.getInstance().setServerConnection(this);

getDashboardPane().getPluginsPane().getSettingsButton().setOnAction(event -> {

openSettingsTimeLine.play();

});

getSettingsPane().getCloseButton().setOnAction(event -> {

closeSettingsTimeLine.play();

});

getSettingsPane().getThemesSettings().setController(this);

mainServer = new MainServer(this, this);

if(getConfig().isFirstTimeUse())

{

Stage stage = new Stage();

Scene s = new Scene(new FirstTimeUse(this, this), 512, 300);

stage.setResizable(false);

stage.setScene(s);

stage.setTitle("StreamPi Server Setup");

stage.setTitle("Stream-Pi Server Setup");

stage.initModality(Modality.APPLICATION_MODAL);

stage.setOnCloseRequest(event->Platform.exit());

stage.show();

}

else

{

if(getConfig().isAllowDonatePopup())

{

if(new Random().nextInt(5) == 3)

new DonatePopupContent(getHostServices(), this).show();

}

othInit();

}

catch (SevereException e)

{

handleSevereException(e);

}

@Override

public void othInit()

{

try

{

if(ServerInfo.getInstance().isStartMinimised())

minimiseApp();

else

getStage().show();

}

catch(MinorException e)

{

handleMinorException(e);

}

new Thread(new Task<Void>() {

@Override

protected Void call()

{

try

{

getSettingsPane().getGeneralSettings().loadDataFromConfig();

//themes

getSettingsPane().getThemesSettings().setThemes(getThemes());

getSettingsPane().getThemesSettings().setCurrentThemeFullName(getCurrentTheme().getFullName());

getSettingsPane().getThemesSettings().loadThemes();

//clients

getSettingsPane().getClientsSettings().loadData();

try

{

//Plugins

Platform.runLater(()->{

getDashboardPane().getPluginsPane().clearData();

getDashboardPane().getPluginsPane().loadOtherActions();

});

NormalActionPlugins.setPluginsLocation(getConfig().getPluginsPath());

NormalActionPlugins.getInstance().init();

Platform.runLater(()->getDashboardPane().getPluginsPane().loadData());

getSettingsPane().getPluginsSettings().loadPlugins();

}

catch (MinorException e)

{

getSettingsPane().getPluginsSettings().showPluginInitError();

handleMinorException(e);

}

//Server

mainServer.setPort(getConfig().getPort());

mainServer.start();

}

catch (SevereException e)

{

handleSevereException(e);

}

return null;

}

}).start();

}

private void setupSettingsWindowsAnimations()

{

Node settingsNode = getSettingsPane();

Node dashboardNode = getDashboardPane();

openSettingsTimeLine = new Timeline();

openSettingsTimeLine.setCycleCount(1);

openSettingsTimeLine.getKeyFrames().addAll(

new KeyFrame(Duration.millis(0.0D),

new KeyValue(settingsNode.opacityProperty(),

0.0D, Interpolator.EASE_IN),

new KeyValue(settingsNode.scaleXProperty(),

1.1D, Interpolator.EASE_IN),

new KeyValue(settingsNode.scaleYProperty(),

1.1D, Interpolator.EASE_IN),

new KeyValue(settingsNode.scaleZProperty(),

1.1D, Interpolator.EASE_IN)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(settingsNode.opacityProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleXProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleYProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleZProperty(),

1.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(0.0D),

new KeyValue(dashboardNode.opacityProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleXProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleYProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleZProperty(),

1.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(dashboardNode.opacityProperty(),

0.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleXProperty(),

0.9D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleYProperty(),

0.9D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleZProperty(),

0.9D, Interpolator.LINEAR))

);

openSettingsTimeLine.setOnFinished(event1 -> {

settingsNode.toFront();

});

closeSettingsTimeLine = new Timeline();

closeSettingsTimeLine.setCycleCount(1);

closeSettingsTimeLine.getKeyFrames().addAll(

new KeyFrame(Duration.millis(0.0D),

new KeyValue(settingsNode.opacityProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleXProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleYProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleZProperty(),

1.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(settingsNode.opacityProperty(),

0.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleXProperty(),

1.1D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleYProperty(),

1.1D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleZProperty(),

1.1D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(0.0D),

new KeyValue(dashboardNode.opacityProperty(),

0.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleXProperty(),

0.9D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleYProperty(),

0.9D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleZProperty(),

0.9D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(dashboardNode.opacityProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleXProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleYProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleZProperty(),

1.0D, Interpolator.LINEAR))

);

closeSettingsTimeLine.setOnFinished(event1 -> {

dashboardNode.toFront();

new Thread(new Task<Void>() {

@Override

protected Void call() {

try {

getSettingsPane().getClientsSettings().loadData();

getSettingsPane().getGeneralSettings().loadDataFromConfig();

getSettingsPane().getPluginsSettings().loadPlugins();

getSettingsPane().getThemesSettings().setThemes(getThemes());

getSettingsPane().getThemesSettings().setCurrentThemeFullName(getCurrentTheme().getFullName());

getSettingsPane().getThemesSettings().loadThemes();

getSettingsPane().setDefaultTabToGeneral();

}

catch (SevereException e)

{

handleSevereException(e);

}

catch (MinorException e)

{

handleMinorException(e);

}

return null;

}

}).start();

});

}

private Timeline openSettingsTimeLine;

private Timeline closeSettingsTimeLine;

public Controller(){

systemTray = SystemTray.getSystemTray();

mainServer = null;

}

public void onCloseRequest(WindowEvent event)

{

try

{

if(Config.getInstance().getCloseOnX())

{

getConfig().setStartupWindowSize(

getWidth(),

getHeight()

);

getConfig().save();

onQuitApp();

NormalActionPlugins.getInstance().shutDownActions();

Platform.exit();

}

else

{

minimiseApp();

event.consume();

}

catch (SevereException e)

{

handleSevereException(e);

}

catch (MinorException e)

{

handleMinorException(e);

}

finally

{

closeLogger();

}

public void onQuitApp()

{

if(mainServer!=null)

mainServer.stopListeningForConnections();

ClientConnections.getInstance().disconnectAll();

getLogger().info("Shutting down ...");

}

public void minimiseApp() throws MinorException

{

try

{

if(SystemTray.isSupported())

{

if(getTrayIcon() == null)

initIconTray();

systemTray.add(getTrayIcon());

//getStage().setIconified(true);

getStage().hide();

}

else

{

new StreamPiAlert("System Tray Error", "Your System does not support System Tray", StreamPiAlertType.ERROR).show();

}

catch(Exception e)

{

throw new MinorException(e.getMessage());

}

public void initIconTray()

{

Platform.setImplicitExit(false);

PopupMenu popup = new PopupMenu();

MenuItem showItem = new MenuItem("Show");

showItem.addActionListener(l->{

systemTray.remove(getTrayIcon());

Platform.runLater(()->{

//getStage().setIconified(false);

getStage().show();

});

MenuItem exitItem = new MenuItem("Exit");

exitItem.addActionListener(l->{

systemTray.remove(getTrayIcon());

onQuitApp();

Platform.exit();

});

popup.add(showItem);

popup.addSeparator();

popup.add(exitItem);

TrayIcon trayIcon = new TrayIcon(

Toolkit.getDefaultToolkit().getImage(Main.class.getResource("app_icon.png")),

"StreamPi Server",

"Stream-Pi Server",

popup

);

trayIcon.setImageAutoSize(true);

this.trayIcon = trayIcon;

}

private TrayIcon trayIcon = null;

public TrayIcon getTrayIcon()

{

return trayIcon;

}

@Override

public void handleMinorException(MinorException e) {

getLogger().log(Level.SEVERE, e.getMessage());

e.printStackTrace();

Platform.runLater(()-> new StreamPiAlert(e.getTitle(), e.getShortMessage(), StreamPiAlertType.WARNING).show());

}

@Override

public void handleSevereException(SevereException e) {

getLogger().log(Level.SEVERE, e.getMessage());

e.printStackTrace();

Platform.runLater(()->{

StreamPiAlert alert = new StreamPiAlert(e.getTitle(), e.getShortMessage(), StreamPiAlertType.ERROR);

alert.setOnClicked(new StreamPiAlertListener()

{

@Override

public void onClick(String txt)

{

onQuitApp();

Platform.exit();

}

});

alert.show();

});

}

@Override

public synchronized boolean onNormalActionClicked(NormalAction action) {

try{

getLogger().info("Action "+action.getID()+" clicked!");

action.onActionClicked();

return true;

}

catch (Exception e)

{

handleMinorException(new MinorException(

"Action Execution Failed!",

"Error running Action at ["+action.getLocation().getRow()+","+action.getLocation().getCol()+"] ("+action.getDisplayText()+")\n"+

"Check stacktrace/log to know what exactly happened\n\nMessage : \n"+e.getMessage() )

);

return false;

}

@Override

public void clearTemp() {

Platform.runLater(() -> {

getDashboardPane().getClientDetailsPane().refresh();

getDashboardPane().getActionGridPane().clear();

getDashboardPane().getActionDetailsPane().clear();

getSettingsPane().getClientsSettings().loadData();

});

}

@Override

public void saveServerProperties() {

try {

NormalActionPlugins.getInstance().saveServerSettings();

getSettingsPane().getPluginsSettings().loadPlugins();

} catch (MinorException e) {

e.printStackTrace();

handleMinorException(e);

}

@Override

public com.StreamPi.Util.Platform.Platform getPlatform() {

return ServerInfo.getInstance().getPlatformType();

}

M src/main/java/com/StreamPi/Server/Info/License.java

+2 −2

package com.StreamPi.Server.Info;

public class License {

public static String getLicense()

{

return "StreamPi - Free & Opensource Modular Cross-Platform Programmable Macropad\n" +

return "Stream-Pi - Free & Opensource Modular Cross-Platform Programmable Macropad\n" +

"\n" +

"This program is free software: you can redistribute it and/or modify\n" +

"it under the terms of the GNU General Public License as published by\n" +

"the Free Software Foundation, either version 3 of the License, or\n" +

"(at your option) any later version.\n" +

"\n" +

"This program is distributed in the hope that it will be useful,\n" +

"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +

"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +

"GNU General Public License for more details.\n" +

"\n\n"+

"Opensource Libraries used :\n"+

"1. JavaFX - GNU General Public License with Classpath Exception\nhttp://openjdk.java.net/legal/gplv2+ce.html\n\n"+

"2. JSON - The JSON License\nhttps://www.json.org/license.html\n\n"+

"3. Ikonli - Apache License\nhttps://github.com/kordamp/ikonli/blob/master/LICENSE\n\n";

}

M src/main/java/com/StreamPi/Server/Window/Dashboard/PluginsPane.java

+2 −5

package com.StreamPi.Server.Window.Dashboard;

import com.StreamPi.ActionAPI.Action.Action;

import com.StreamPi.ActionAPI.Action.ActionType;

import com.StreamPi.ActionAPI.Action.DisplayTextAlignment;

import com.StreamPi.ActionAPI.ActionProperty.Property.Property;

import com.StreamPi.ActionAPI.ActionProperty.Property.Type;

import com.StreamPi.ActionAPI.NormalAction.NormalAction;

import com.StreamPi.ActionAPI.OtherActions.CombineAction;

import com.StreamPi.ActionAPI.OtherActions.FolderAction;

import com.StreamPi.Server.Action.NormalActionPlugins;

import javafx.application.HostServices;

import javafx.event.EventHandler;

import javafx.geometry.Insets;

import javafx.geometry.Pos;

import javafx.scene.CacheHint;

import javafx.scene.Node;

import javafx.scene.control.*;

import javafx.scene.image.ImageView;

import javafx.scene.input.ClipboardContent;

import javafx.scene.input.Dragboard;

import javafx.scene.input.MouseEvent;

import javafx.scene.input.TransferMode;

import javafx.scene.layout.*;

import javafx.scene.paint.Paint;

import org.kordamp.ikonli.javafx.FontIcon;

import java.util.ArrayList;

import java.util.HashMap;

public class PluginsPane extends VBox {

private Button settingsButton;

public PluginsPane(HostServices hostServices)

{

setMinWidth(250);

getStyleClass().add("plugins_pane");

setPadding(new Insets(10));

setSpacing(10.0);

this.hostServices = hostServices;

initUI();

}

private Accordion pluginsAccordion;

public void initUI()

{

pluginsAccordion = new Accordion();

pluginsAccordion.setCache(true);

Region r = new Region();

VBox.setVgrow(r, Priority.ALWAYS);

settingsButton = new Button();

FontIcon cog = new FontIcon("fas-cog");

settingsButton.setGraphic(cog);

HBox settingsHBox = new HBox(settingsButton);

settingsHBox.setAlignment(Pos.CENTER_RIGHT);

getChildren().addAll(new Label("Plugins"), pluginsAccordion, r, settingsHBox);

}

public Button getSettingsButton()

{

return settingsButton;

}

public void clearData()

{

pluginsAccordion.getPanes().clear();

}

public void loadData()

{

HashMap<String, ArrayList<NormalAction>> sortedPlugins = NormalActionPlugins.getInstance().getSortedPlugins();

for(String eachCategory : sortedPlugins.keySet())

{

VBox vBox = new VBox();

vBox.setSpacing(5);

TitledPane pane = new TitledPane(eachCategory, vBox);

for(NormalAction eachAction : sortedPlugins.get(eachCategory))

{

if(!eachAction.isVisibleInPluginsPane())

continue;

Button eachNormalActionPluginButton = new Button();

HBox.setHgrow(eachNormalActionPluginButton, Priority.ALWAYS);

eachNormalActionPluginButton.setMaxWidth(Double.MAX_VALUE);

eachNormalActionPluginButton.setAlignment(Pos.CENTER_LEFT);

Node graphic = eachAction.getServerButtonGraphic();

if(graphic == null)

{

FontIcon cogs = new FontIcon("fas-cogs");

cogs.getStyleClass().add("dashboard_plugins_pane_action_icon");

eachNormalActionPluginButton.setGraphic(cogs);

}

else

{

if(graphic instanceof FontIcon)

{

FontIcon fi = (FontIcon) graphic;

eachNormalActionPluginButton.setGraphic(fi);

}

else if(graphic instanceof ImageView)

{

ImageView iv = (ImageView) graphic;

iv.getStyleClass().add("dashboard_plugins_pane_action_icon_imageview");

iv.setPreserveRatio(false);

eachNormalActionPluginButton.setGraphic(iv);

}

eachNormalActionPluginButton.setText(eachAction.getName());

eachNormalActionPluginButton.setOnDragDetected(mouseEvent -> {

Dragboard db = eachNormalActionPluginButton.startDragAndDrop(TransferMode.ANY);

ClipboardContent content = new ClipboardContent();

content.put(Action.getDataFormat(), createFakeAction(eachAction, "Untitled Action"));

db.setContent(content);

mouseEvent.consume();

});

HBox hBox = new HBox(eachNormalActionPluginButton);

hBox.setSpacing(5.0);

hBox.setAlignment(Pos.TOP_LEFT);

HBox.setHgrow(eachNormalActionPluginButton, Priority.ALWAYS);

if(eachAction.getRepo() != null) {

if(eachAction.getHelpLink() != null) {

Button helpButton = new Button();

FontIcon questionIcon = new FontIcon("fas-question");

questionIcon.getStyleClass().add("dashboard_plugins_pane_action_help_icon");

helpButton.setGraphic(questionIcon);

helpButton.setOnAction(event -> hostServices.showDocument(eachAction.getHelpLink()));

helpButton.setOnAction(event -> {

hostServices.showDocument(eachAction.getRepo());

});

hBox.getChildren().add(helpButton);

}

vBox.getChildren().add(hBox);

}

if(vBox.getChildren().size() > 0)

pluginsAccordion.getPanes().add(pane);

}

private HostServices hostServices;

public Action createFakeAction(Action action, String displayText)

{

Action newAction = new Action(action.getActionType());

if(action.getActionType() == ActionType.NORMAL)

{

newAction.setModuleName(action.getModuleName());

newAction.setVersion(action.getVersion());

newAction.setName(action.getName());

}

newAction.setClientProperties(action.getClientProperties());

for(Property property : newAction.getClientProperties().get())

{

if(property.getType() == Type.STRING || property.getType() == Type.INTEGER || property.getType() == Type.DOUBLE)

property.setRawValue(property.getDefaultRawValue());

}

// newAction.setLocation(location);

newAction.setIDRandom();

newAction.setShowDisplayText(true);

newAction.setDisplayText(displayText);

newAction.setDisplayTextAlignment(DisplayTextAlignment.CENTER);

newAction.setShowIcon(false);

newAction.setHasIcon(false);

//action.setParent(root);

newAction.setBgColourHex("");

newAction.setDisplayTextFontColourHex("");

return newAction;

}

public void loadOtherActions()

{

VBox vBox = new VBox();

Button folderActionButton = new Button("Folder");

folderActionButton.setMaxWidth(Double.MAX_VALUE);

folderActionButton.setAlignment(Pos.CENTER_LEFT);

FontIcon folder = new FontIcon("fas-folder");

folderActionButton.setGraphic(folder);

folderActionButton.setOnDragDetected(mouseEvent -> {

Dragboard db = folderActionButton.startDragAndDrop(TransferMode.ANY);

ClipboardContent content = new ClipboardContent();

content.put(Action.getDataFormat(), createFakeAction(new FolderAction(), "Untitled Folder"));

db.setContent(content);

mouseEvent.consume();

});

Button combineActionButton = new Button("Combine");

combineActionButton.setMaxWidth(Double.MAX_VALUE);

combineActionButton.setAlignment(Pos.CENTER_LEFT);

FontIcon list = new FontIcon("fas-list");

combineActionButton.setGraphic(list);

combineActionButton.setOnDragDetected(mouseEvent -> {

Dragboard db = combineActionButton.startDragAndDrop(TransferMode.ANY);

ClipboardContent content = new ClipboardContent();

content.put(Action.getDataFormat(), createFakeAction(new CombineAction(), "Untitled Combine"));

db.setContent(content);

mouseEvent.consume();

});

vBox.getChildren().addAll(folderActionButton, combineActionButton);

vBox.setSpacing(5);

TitledPane pane = new TitledPane("StreamPi", vBox);

pluginsAccordion.getPanes().add(pane);

pluginsAccordion.setCache(true);

pluginsAccordion.setCacheHint(CacheHint.SPEED);

}

M src/main/java/com/StreamPi/Server/Window/Settings/PluginsSettings.java

+5 −9

package com.StreamPi.Server.Window.Settings;

import com.StreamPi.Server.UIPropertyBox.UIPropertyBox;

import com.StreamPi.ActionAPI.ActionProperty.Property.ControlType;

import com.StreamPi.ActionAPI.ActionProperty.Property.Property;

import com.StreamPi.ActionAPI.ActionProperty.Property.Type;

import com.StreamPi.ActionAPI.NormalAction.NormalAction;

import com.StreamPi.Server.Action.NormalActionPlugins;

import com.StreamPi.Server.Connection.ServerListener;

import com.StreamPi.Server.Window.ExceptionAndAlertHandler;

import com.StreamPi.Util.Exception.MinorException;

import com.StreamPi.Util.FormHelper.SpaceFiller;

import com.StreamPi.Util.FormHelper.SpaceFiller.FillerType;

import org.kordamp.ikonli.javafx.FontIcon;

import javafx.application.HostServices;

import javafx.application.Platform;

import javafx.geometry.Insets;

import javafx.geometry.Pos;

import javafx.scene.Node;

import javafx.scene.control.*;

import javafx.scene.layout.HBox;

import javafx.scene.layout.Priority;

import javafx.scene.layout.Region;

import javafx.scene.layout.VBox;

import java.util.ArrayList;

import java.util.List;

import java.util.logging.Logger;

public class PluginsSettings extends VBox {

private VBox pluginsSettingsVBox;

private ServerListener serverListener;

private Logger logger;

private ExceptionAndAlertHandler exceptionAndAlertHandler;

private HostServices hostServices;

public PluginsSettings(ExceptionAndAlertHandler exceptionAndAlertHandler, HostServices hostServices)

{

getStyleClass().add("plugins_settings");

this.hostServices = hostServices;

this.exceptionAndAlertHandler = exceptionAndAlertHandler;

pluginProperties = new ArrayList<>();

logger = Logger.getLogger(PluginsSettings.class.getName());

setPadding(new Insets(10));

pluginsSettingsVBox = new VBox();

pluginsSettingsVBox.setSpacing(10.0);

pluginsSettingsVBox.setAlignment(Pos.TOP_CENTER);

ScrollPane scrollPane = new ScrollPane();

scrollPane.getStyleClass().add("plugins_settings_scroll_pane");

scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);

scrollPane.maxWidthProperty().bind(widthProperty().multiply(0.8));

pluginsSettingsVBox.prefWidthProperty().bind(scrollPane.widthProperty().subtract(25));

scrollPane.setContent(pluginsSettingsVBox);

VBox.setVgrow(scrollPane, Priority.ALWAYS);

setAlignment(Pos.TOP_CENTER);

saveButton = new Button("Save");

saveButton.setOnAction(event -> onSaveButtonClicked());

HBox hBox = new HBox(saveButton);

hBox.setAlignment(Pos.CENTER_RIGHT);

getChildren().addAll(scrollPane, hBox);

}

private Button saveButton;

public void onSaveButtonClicked()

{

try {

//form validation

StringBuilder finalErrors = new StringBuilder();

for (PluginProperties p : pluginProperties)

{

StringBuilder errors = new StringBuilder();

for(int j = 0; j < p.getServerPropertyUIBox().size(); j++)

{

UIPropertyBox serverProperty = p.getServerPropertyUIBox().get(j);

Node controlNode = serverProperty.getControlNode();

if (serverProperty.getControlType() == ControlType.TEXT_FIELD)

{

String value = ((TextField) controlNode).getText();

if(serverProperty.getType() == Type.INTEGER)

{

try

{

Integer.parseInt(value);

}

catch (NumberFormatException e)

{

errors.append(" -> ").append(serverProperty.getDisplayName()).append(" must be integer.\n");

}

else

{

if(value.isBlank() && !serverProperty.isCanBeBlank())

errors.append(" -> ").append(serverProperty.getDisplayName()).append(" cannot be blank.\n");

}

if(!errors.toString().isBlank())

{

finalErrors.append(" * ").append(p.getName()).append("\n").append(errors.toString()).append("\n");

}

if(!finalErrors.toString().isEmpty())

{

throw new MinorException("Form Validation Errors",

"Please rectify the following errors and try again \n"+finalErrors.toString());

}

//save

for (PluginProperties pp : pluginProperties) {

for (int j = 0; j < pp.getServerPropertyUIBox().size(); j++) {

UIPropertyBox serverProperty = pp.getServerPropertyUIBox().get(j);

String rawValue = serverProperty.getRawValue();

NormalActionPlugins.getInstance().getActionFromIndex(pp.getIndex())

.getServerProperties().get()

.get(serverProperty.getIndex()).setRawValue(rawValue);

}

NormalActionPlugins.getInstance().saveServerSettings();

NormalActionPlugins.getInstance().initPlugins();

}

catch (MinorException e)

{

e.printStackTrace();

exceptionAndAlertHandler.handleMinorException(e);

}

private ArrayList<PluginProperties> pluginProperties;

public void showPluginInitError()

{

Platform.runLater(()->{

pluginsSettingsVBox.getChildren().add(new Label("Plugin init error. Resolve issues and restart."));

saveButton.setVisible(false);

});

}

public void loadPlugins() throws MinorException {

pluginProperties.clear();

List<NormalAction> actions = NormalActionPlugins.getInstance().getPlugins();

System.out.println("asdasdasdasd"+actions.size());

Platform.runLater(()-> pluginsSettingsVBox.getChildren().clear());

if(actions.size() == 0)

{

Platform.runLater(()->{

pluginsSettingsVBox.getChildren().add(new Label("No Plugins Installed."));

saveButton.setVisible(false);

});

return;

}

else

{

Platform.runLater(()->saveButton.setVisible(true));

}

for(int i = 0; i<actions.size(); i++)

{

NormalAction action = actions.get(i);

if(!action.isVisibleInServerSettingsPane())

continue;

Label headingLabel = new Label(action.getName());

headingLabel.getStyleClass().add("settings_plugins_each_action_heading");

HBox headerHBox = new HBox(headingLabel, new SpaceFiller(FillerType.HBox));

HBox headerHBox = new HBox(headingLabel);

if (action.getRepo()!=null)

if (action.getHelpLink()!=null)

{

Button helpButton = new Button();

FontIcon questionIcon = new FontIcon("fas-question");

questionIcon.getStyleClass().add("dashboard_plugins_pane_action_help_icon");

questionIcon.getStyleClass().add("settings_plugins_plugin_help_icon");

helpButton.setGraphic(questionIcon);

helpButton.setOnAction(event -> hostServices.showDocument(action.getHelpLink()));

headerHBox.getChildren().addAll(new SpaceFiller(FillerType.HBox),helpButton);

helpButton.setOnAction(event -> {

hostServices.showDocument(action.getRepo());

});

headerHBox.getChildren().add(helpButton);

}

Label authorLabel = new Label(action.getAuthor());

Label moduleLabel = new Label(action.getModuleName());

Label versionLabel = new Label("Version : "+action.getVersion().getText());

VBox serverPropertiesVBox = new VBox();

serverPropertiesVBox.setSpacing(10.0);

List<Property> serverProperties = action.getServerProperties().get();

ArrayList<UIPropertyBox> serverPropertyArrayList = new ArrayList<>();

for(int j =0; j<serverProperties.size(); j++)

{

Property eachProperty = serverProperties.get(j);

if(!eachProperty.isVisible())

continue;

Label label = new Label(eachProperty.getDisplayName());

Region region = new Region();

HBox.setHgrow(region, Priority.ALWAYS);

HBox hBox = new HBox(label, new SpaceFiller(SpaceFiller.FillerType.HBox));

//hBox.setId(j+"");

Node controlNode = null;

if(eachProperty.getControlType() == ControlType.COMBO_BOX)

{

ComboBox<String> comboBox = new ComboBox<>();

comboBox.getItems().addAll(eachProperty.getListValue());

comboBox.getSelectionModel().select(eachProperty.getSelectedIndex());

hBox.getChildren().add(comboBox);

controlNode = comboBox;

}

else if(eachProperty.getControlType() == ControlType.TEXT_FIELD)

{

TextField textField = new TextField(eachProperty.getRawValue());

hBox.getChildren().add(textField);

controlNode = textField;

}

else if(eachProperty.getControlType() == ControlType.TOGGLE)

{

ToggleButton toggleButton = new ToggleButton();

toggleButton.setSelected(eachProperty.getBoolValue());

if(eachProperty.getBoolValue())

toggleButton.setText("ON");

else

toggleButton.setText("OFF");

toggleButton.selectedProperty().addListener((observableValue, aBoolean, t1) -> {

if(t1)

toggleButton.setText("ON");

else

toggleButton.setText("OFF");

});

hBox.getChildren().add(toggleButton);

controlNode = toggleButton;

}

else if(eachProperty.getControlType() == ControlType.SLIDER_DOUBLE)

{

Slider slider = new Slider();

slider.setValue(eachProperty.getDoubleValue());

slider.setMax(eachProperty.getMaxDoubleValue());

slider.setMin(eachProperty.getMinDoubleValue());

hBox.getChildren().add(slider);

controlNode = slider;

}

else if(eachProperty.getControlType() == ControlType.SLIDER_INTEGER)

{

Slider slider = new Slider();

slider.setValue(eachProperty.getIntValue());

slider.setMax(eachProperty.getMaxIntValue());

slider.setMin(eachProperty.getMinIntValue());

slider.setBlockIncrement(1.0);

slider.setSnapToTicks(true);

hBox.getChildren().add(slider);

controlNode = slider;

}

UIPropertyBox serverProperty = new UIPropertyBox(j, eachProperty.getDisplayName(), controlNode, eachProperty.getControlType(), eachProperty.getType(), eachProperty.isCanBeBlank());

serverPropertyArrayList.add(serverProperty);

serverPropertiesVBox.getChildren().add(hBox);

}

PluginProperties pp = new PluginProperties(i, serverPropertyArrayList, action.getName());

pluginProperties.add(pp);

Region region1 = new Region();

region1.setPrefHeight(5);

Platform.runLater(()->{

VBox vBox = new VBox();

vBox.setSpacing(5.0);

vBox.getChildren().addAll(headerHBox, authorLabel, moduleLabel, versionLabel, serverPropertiesVBox);

if(action.getButtonBar()!=null)

vBox.getChildren().add(new HBox(new SpaceFiller(SpaceFiller.FillerType.HBox), action.getButtonBar()));

vBox.getChildren().add(region1);

//vBox.setId(i+"");

vBox.getStyleClass().add("settings_plugins_each_action");

pluginsSettingsVBox.getChildren().add(vBox);

});

}

public class PluginProperties

{

private int index;

private ArrayList<UIPropertyBox> serverProperty;

private String name;

public PluginProperties(int index, ArrayList<UIPropertyBox> serverProperty, String name)

{

this.index = index;

this.serverProperty = serverProperty;

this.name = name;

}

public String getName()

{

return name;

}

public int getIndex() {

return index;

}

public ArrayList<UIPropertyBox> getServerPropertyUIBox() {

return serverProperty;

}

M src/main/java/com/StreamPi/Server/Window/Settings/SettingsBase.java

+1 −2

package com.StreamPi.Server.Window.Settings;

import com.StreamPi.Server.Connection.ServerListener;

import com.StreamPi.Server.Window.ExceptionAndAlertHandler;

import com.StreamPi.ThemeAPI.Theme;

import javafx.application.HostServices;

import javafx.geometry.Insets;

import javafx.geometry.Pos;

import javafx.scene.CacheHint;

import javafx.scene.control.*;

import javafx.scene.layout.Priority;

import javafx.scene.layout.VBox;

public class SettingsBase extends VBox {

private TabPane tabPane;

private GeneralSettings generalSettings;

private PluginsSettings pluginsSettings;

private ThemesSettings themesSettings;

private ClientsSettings clientsSettings;

private Button closeButton;

private HostServices hostServices;

private ExceptionAndAlertHandler exceptionAndAlertHandler;

public SettingsBase(HostServices hostServices, ExceptionAndAlertHandler exceptionAndAlertHandler,

ServerListener serverListener)

{

this.exceptionAndAlertHandler = exceptionAndAlertHandler;

this.hostServices = hostServices;

tabPane = new TabPane();

tabPane.setTabClosingPolicy(TabPane.TabClosingPolicy.UNAVAILABLE);

VBox.setVgrow(tabPane, Priority.ALWAYS);

Tab generalSettingsTab = new Tab("General");

generalSettings = new GeneralSettings(exceptionAndAlertHandler, serverListener, hostServices);

generalSettingsTab.setContent(generalSettings);

Tab pluginsSettingsTab = new Tab("Plugins");

pluginsSettings = new PluginsSettings(exceptionAndAlertHandler, hostServices);

pluginsSettingsTab.setContent(pluginsSettings);

Tab themesSettingsTab = new Tab("Themes");

themesSettings = new ThemesSettings();

themesSettings = new ThemesSettings(hostServices);

themesSettingsTab.setContent(themesSettings);

Tab clientsSettingsTab = new Tab("Clients");

clientsSettings = new ClientsSettings(exceptionAndAlertHandler, serverListener);

clientsSettingsTab.setContent(clientsSettings);

Tab aboutTab = new Tab("About");

aboutTab.setContent(new About(hostServices));

tabPane.getTabs().addAll(generalSettingsTab, pluginsSettingsTab, themesSettingsTab, clientsSettingsTab, aboutTab);

setAlignment(Pos.TOP_RIGHT);

closeButton = new Button("Close");

VBox.setMargin(closeButton, new Insets(10.0));

getChildren().addAll(tabPane, closeButton);

setCache(true);

setCacheHint(CacheHint.SPEED);

}

public void setDefaultTabToGeneral()

{

tabPane.getSelectionModel().selectFirst();

}

public Button getCloseButton()

{

return closeButton;

}

public GeneralSettings getGeneralSettings()

{

return generalSettings;

}

public PluginsSettings getPluginsSettings()

{

return pluginsSettings;

}

public ThemesSettings getThemesSettings()

{

return themesSettings;

}

public ClientsSettings getClientsSettings()

{

return clientsSettings;

}

M src/main/java/com/StreamPi/Server/Window/Settings/ThemesSettings.java

+24 −5

package com.StreamPi.Server.Window.Settings;

import com.StreamPi.ActionAPI.Action.Action;

import com.StreamPi.ActionAPI.ActionProperty.Property.ControlType;

import com.StreamPi.ActionAPI.ActionProperty.Property.Property;

import com.StreamPi.ActionAPI.NormalAction.NormalAction;

import com.StreamPi.Server.Action.NormalActionPlugins;

import com.StreamPi.Server.Connection.ServerListener;

import com.StreamPi.Server.Controller.Controller;

import com.StreamPi.Server.IO.Config;

import com.StreamPi.ThemeAPI.Theme;

import com.StreamPi.ThemeAPI.Themes;

import com.StreamPi.Util.Exception.MinorException;

import com.StreamPi.Util.Exception.SevereException;

import com.StreamPi.Util.FormHelper.SpaceFiller;

import javafx.application.HostServices;

import javafx.application.Platform;

import javafx.concurrent.Task;

import javafx.geometry.Insets;

import javafx.geometry.Pos;

import javafx.scene.control.*;

import javafx.scene.layout.HBox;

import javafx.scene.layout.Priority;

import javafx.scene.layout.Region;

import javafx.scene.layout.VBox;

import org.kordamp.ikonli.javafx.FontIcon;

import java.util.ArrayList;

import java.util.List;

import java.util.logging.Logger;

public class ThemesSettings extends VBox

{

private VBox themesSettingsVBox;

private Controller controller;

private Logger logger;

private HostServices hostServices;

public ThemesSettings()

public ThemesSettings(HostServices hostServices)

{

this.hostServices = hostServices;

getStyleClass().add("themes_settings");

logger = Logger.getLogger(ThemesSettings.class.getName());

setPadding(new Insets(10));

themesSettingsVBox = new VBox();

themesSettingsVBox.setSpacing(10.0);

themesSettingsVBox.setAlignment(Pos.TOP_CENTER);

ScrollPane scrollPane = new ScrollPane();

scrollPane.getStyleClass().add("themes_settings_scroll_pane");

scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);

scrollPane.maxWidthProperty().bind(widthProperty().multiply(0.8));

themesSettingsVBox.prefWidthProperty().bind(scrollPane.widthProperty().subtract(10));

scrollPane.setContent(themesSettingsVBox);

VBox.setVgrow(scrollPane, Priority.ALWAYS);

setAlignment(Pos.TOP_CENTER);

getChildren().addAll(scrollPane);

toggleButtons = new ArrayList<>();

}

public void setController(Controller controller)

{

this.controller = controller;

}

private Themes themes;

private String currentThemeFullName;

public void setThemes(Themes themes)

{

this.themes = themes;

}

public void setCurrentThemeFullName(String currentThemeFullName)

{

this.currentThemeFullName = currentThemeFullName;

}

private ArrayList<ToggleButton> toggleButtons;

public void loadThemes()

{

toggleButtons.clear();

Platform.runLater(()-> themesSettingsVBox.getChildren().clear());

for(int i = 0; i<themes.getThemeList().size(); i++)

{

Theme theme = themes.getThemeList().get(i);

VBox vBox = new VBox();

vBox.setSpacing(5.0);

Label shortNameLabel = new Label(theme.getShortName());

shortNameLabel.getStyleClass().add("settings_themes_each_theme_heading");

Label authorLabel = new Label(theme.getAuthor());

Label fullNameLabel = new Label(theme.getFullName());

HBox topRowHBox = new HBox(shortNameLabel);

if(theme.getWebsite() != null)

{

Button helpButton = new Button();

FontIcon questionIcon = new FontIcon("fas-question");

questionIcon.getStyleClass().add("settings_themes_theme_help_icon");

helpButton.setGraphic(questionIcon);

helpButton.setOnAction(event -> hostServices.showDocument(theme.getWebsite()));

topRowHBox.getChildren().addAll(new SpaceFiller(SpaceFiller.FillerType.HBox), helpButton);

}

Label versionLabel = new Label("Version : "+theme.getVersion().getText());

ToggleButton toggleButton = new ToggleButton();

toggleButton.setSelected(theme.getFullName().equals(currentThemeFullName));

toggleButton.setId(theme.getFullName());

if(theme.getFullName().equals(currentThemeFullName))

{

toggleButton.setText("ON");

toggleButton.setSelected(true);

toggleButton.setDisable(true);

}

else

{

toggleButton.setText("OFF");

}

toggleButton.setOnAction(event -> {

ToggleButton toggleButton1 = (ToggleButton) event.getSource();

toggleButton.setText("ON");

try {

Config.getInstance().setCurrentThemeFullName(toggleButton1.getId());

Config.getInstance().save();

for(ToggleButton toggleButton2 : toggleButtons)

{

if(toggleButton2.getId().equals(Config.getInstance().getCurrentThemeFullName()))

{

toggleButton2.setDisable(true);

toggleButton2.setText("ON");

toggleButton2.setSelected(true);

}

else

{

toggleButton2.setDisable(false);

toggleButton2.setText("OFF");

toggleButton2.setSelected(false);

}

controller.initThemes();

}

catch (SevereException e)

{

controller.handleSevereException(e);

}

});

HBox hBox = new HBox(toggleButton);

Region region1 = new Region();

region1.setPrefHeight(5);

hBox.setAlignment(Pos.TOP_RIGHT);

vBox.getChildren().addAll(shortNameLabel, authorLabel, versionLabel, fullNameLabel, hBox, region1);

VBox vBox = new VBox(topRowHBox, authorLabel, versionLabel, fullNameLabel, hBox, region1);

vBox.setSpacing(5.0);

vBox.getStyleClass().add("settings_themes_each_theme");

Platform.runLater(()->themesSettingsVBox.getChildren().add(vBox));

toggleButtons.add(toggleButton);

}

Public

server

Clone or download

Made appropriate changes with new ActionAPI, renamed StreamPi to Stream-Pi, Updated license

Modified Files