server

Added inbuilt restart function to restart the app.

Download Browse

+47 −5

Author

Debayan Sutradhar (rnayabed) 2021-05-25 21:25

Committer

Debayan Sutradhar (rnayabed) 2021-05-25 21:25

Hash 1dc892c5937336b85accf7b63106008895d6b9d0

Parent 192fd30b7276eba0c0c0ec5f9df6decc1d723d96

Reference git #server/1dc892c5937336b85accf7b63106008895d6b9d0

Modified Files

List

Side by side diff

Inline diff

M src/main/java/com/stream_pi/server/connection/ServerListener.java

+2 −0

package com.stream_pi.server.connection;

import com.stream_pi.action_api.externalplugin.NormalAction;

import com.stream_pi.action_api.externalplugin.ToggleAction;

import com.stream_pi.server.window.dashboard.ClientAndProfileSelectorPane;

import com.stream_pi.server.window.dashboard.DashboardBase;

import com.stream_pi.server.window.settings.SettingsBase;

import com.stream_pi.util.exception.SevereException;

import javafx.stage.Stage;

public interface ServerListener

{

boolean onNormalActionClicked(NormalAction action, String profileID);

boolean onToggleActionClicked(ToggleAction action, boolean toggle, String profileID);

void clearTemp();

void init();

void restart();

void othInit();

Stage getStage();

DashboardBase getDashboardBase();

SettingsBase getSettingsBase();

void initLogger() throws SevereException;

}

M src/main/java/com/stream_pi/server/controller/Controller.java

+17 −3

package com.stream_pi.server.controller;

import com.stream_pi.action_api.action.Action;

import com.stream_pi.action_api.action.PropertySaver;

import com.stream_pi.action_api.action.ServerConnection;

import com.stream_pi.action_api.externalplugin.NormalAction;

import com.stream_pi.action_api.externalplugin.ToggleAction;

import com.stream_pi.action_api.externalplugin.ToggleExtras;

import com.stream_pi.server.Main;

import com.stream_pi.server.action.ExternalPlugins;

import com.stream_pi.server.client.Client;

import com.stream_pi.server.client.ClientProfile;

import com.stream_pi.server.connection.ClientConnection;

import com.stream_pi.server.connection.ClientConnections;

import com.stream_pi.server.connection.MainServer;

import com.stream_pi.server.info.ServerInfo;

import com.stream_pi.server.io.Config;

import com.stream_pi.server.window.Base;

import com.stream_pi.server.window.dashboard.DashboardBase;

import com.stream_pi.server.window.dashboard.DonatePopupContent;

import com.stream_pi.server.window.dashboard.actiongridpane.ActionBox;

import com.stream_pi.server.window.firsttimeuse.FirstTimeUse;

import com.stream_pi.server.window.settings.SettingsBase;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertListener;

import com.stream_pi.util.alert.StreamPiAlertType;

import com.stream_pi.util.exception.*;

import javafx.animation.Animation;

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.scene.image.Image;

import javafx.stage.Modality;

import javafx.stage.Stage;

import javafx.stage.WindowEvent;

import javafx.util.Duration;

import java.awt.MenuItem;

import java.awt.PopupMenu;

import java.awt.SystemTray;

import java.awt.Toolkit;

import java.awt.TrayIcon;

import java.net.SocketAddress;

import java.util.Objects;

import java.util.Random;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executors;

import java.util.logging.Level;

public class Controller extends Base implements PropertySaver, ServerConnection, ToggleExtras

{

private ExecutorService executor = Executors.newCachedThreadPool();

private MainServer mainServer;

private Animation openSettingsAnimation;

private Animation closeSettingsAnimation;

public Controller(){

mainServer = null;

}

public void setupDashWindow() throws SevereException

{

try

{

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

}

catch (Exception e)

{

e.printStackTrace();

throw new SevereException(e.getMessage());

}

@Override

public void init()

{

try

{

initBase();

setupDashWindow();

setupSettingsWindowsAnimations();

ExternalPlugins.getInstance().setPropertySaver(this);

ExternalPlugins.getInstance().setToggleExtras(this);

ExternalPlugins.getInstance().setServerConnection(this);

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

openSettingsAnimation.play();

});

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

closeSettingsAnimation.play();

});

getSettingsBase().getThemesSettings().setController(this);

mainServer = new MainServer(this, this);

if(getConfig().isFirstTimeUse())

{

Stage stage = new Stage();

Scene s = new Scene(new FirstTimeUse(this, this),

getConfig().getStartupWindowWidth(), getConfig().getStartupWindowHeight());

stage.setScene(s);

stage.getIcons().add(new Image(Objects.requireNonNull(Main.class.getResourceAsStream("app_icon.png"))));

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() && SystemTray.isSupported())

minimiseApp();

else

getStage().show();

}

catch(MinorException e)

{

handleMinorException(e);

}

executor.execute(new Task<Void>() {

@Override

protected Void call()

{

try

{

getSettingsBase().getGeneralSettings().loadDataFromConfig();

//themes

getSettingsBase().getThemesSettings().setThemes(getThemes());

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

getSettingsBase().getThemesSettings().loadThemes();

//clients

getSettingsBase().getClientsSettings().loadData();

try

{

//Plugins

Platform.runLater(()->{

getDashboardBase().getPluginsPane().clearData();

getDashboardBase().getPluginsPane().loadOtherActions();

});

ExternalPlugins.setPluginsLocation(getConfig().getPluginsPath());

ExternalPlugins.getInstance().init();

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

getSettingsBase().getPluginsSettings().loadPlugins();

}

catch (MinorException e)

{

getSettingsBase().getPluginsSettings().showPluginInitError();

handleMinorException(e);

}

//Server

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

mainServer.start();

}

catch (SevereException e)

{

handleSevereException(e);

}

return null;

}

});

}

private void setupSettingsWindowsAnimations()

{

Node settingsNode = getSettingsBase();

Node dashboardNode = getDashboardBase();

openSettingsAnimation = createOpenSettingsAnimation(settingsNode, dashboardNode);

closeSettingsAnimation = createCloseSettingsAnimation(settingsNode, dashboardNode);

}

public void onCloseRequest(WindowEvent event)

{

try

{

if(Config.getInstance().getMinimiseToSystemTrayOnClose() &&

SystemTray.isSupported())

{

minimiseApp();

event.consume();

return;

}

getConfig().setStartupWindowSize(getWidth(), getHeight());

getConfig().save();

onQuitApp();

ExternalPlugins.getInstance().shutDownActions();

Platform.exit();

}

catch (SevereException e)

{

handleSevereException(e);

}

catch (MinorException e)

{

handleMinorException(e);

}

public void onQuitApp()

{

stopServerAndAllConnections();

executor.shutdown();

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

closeLogger();

}

private void stopServerAndAllConnections()

{

if(mainServer!=null)

mainServer.stopListeningForConnections();

ClientConnections.getInstance().disconnectAll();

executor.shutdown();

}

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

closeLogger();

@Override

public void restart()

{

getLogger().info("Restarting ...");

stopServerAndAllConnections();

Platform.runLater(this::init);

}

public void minimiseApp() throws MinorException

{

try

{

SystemTray systemTray = SystemTray.getSystemTray();

if(getTrayIcon() == null)

initIconTray(systemTray);

systemTray.add(getTrayIcon());

getStage().hide();

getStage().setOnShown(windowEvent -> {

systemTray.remove(getTrayIcon());

});

}

catch(Exception e)

{

throw new MinorException(e.getMessage());

}

public void initIconTray(SystemTray systemTray)

{

Platform.setImplicitExit(false);

PopupMenu popup = new PopupMenu();

MenuItem exitItem = new MenuItem("Exit");

exitItem.addActionListener(l->{

systemTray.remove(getTrayIcon());

onQuitApp();

Platform.exit();

});

popup.add(exitItem);

TrayIcon trayIcon = new TrayIcon(

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

"Stream-Pi Server",

popup

);

trayIcon.addActionListener(l-> Platform.runLater(()-> {

getStage().show();

getStage().setAlwaysOnTop(true);

getStage().setAlwaysOnTop(false);

}));

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);

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);

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, String profileID)

{

try{

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

action.onActionClicked();

return true;

}

catch (Exception e)

{

e.printStackTrace();

//check if its windows UAC related

if(e.getMessage().contains("operation requires elevation"))

{

handleMinorException(new MinorException(

"Action Execution Failed!",

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

"This action requires higher UAC privileges. Re-launch Stream-Pi Server with 'Administrator Privileges' in order to run this command.")

);

}

else

{

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 boolean onToggleActionClicked(ToggleAction action, boolean toggle, String profileID)

{

try{

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

if(toggle)

{

action.onToggleOn();

}

else

{

action.onToggleOff();

}

// ActionBox actionBox = getDashboardBase().getActionGridPane().getActionBoxByIDAndProfileID(

// action.getID(),

// profileID

// );

// if(actionBox != null)

// {

// Platform.runLater(()->actionBox.init(toggle));

// }

return true;

}

catch (Exception e)

{

e.printStackTrace();

//check if its windows UAC related

if(e.getMessage().contains("operation requires elevation"))

{

handleMinorException(new MinorException(

"Action Execution Failed!",

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

"This action requires higher UAC privileges. Re-launch Stream-Pi Server with 'Administrator Privileges' in order to run this command.")

);

}

else

{

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(() -> {

getDashboardBase().getClientAndProfileSelectorPane().refresh();

getDashboardBase().getActionGridPane().clear();

getDashboardBase().getActionGridPane().setFreshRender(true);

getDashboardBase().getActionDetailsPane().clear();

getSettingsBase().getClientsSettings().loadData();

});

}

@Override

public void saveServerProperties()

{

try

{

ExternalPlugins.getInstance().saveServerSettings();

getSettingsBase().getPluginsSettings().loadPlugins();

} catch (MinorException e) {

e.printStackTrace();

handleMinorException(e);

}

private void saveClientActionMain(String profileID, String actionID, SocketAddress socketAddress, boolean sendIcons)

{

try {

ClientConnection clientConnection = ClientConnections.getInstance().getClientConnectionBySocketAddress(socketAddress);

ClientProfile clientProfile = clientConnection.getClient().getProfileByID(profileID);

Action action = clientProfile.getActionByID(actionID);

clientConnection.saveActionDetails(profileID, action);

if(sendIcons && action.isHasIcon())

{

saveAllIcons(profileID, actionID, socketAddress, false);

}

Platform.runLater(()->{

try {

ActionBox actionBox = getDashboardBase().getActionGridPane().getActionBoxByIDAndProfileID(

action.getID(),

profileID

);

if(actionBox != null)

{

Platform.runLater(actionBox::init);

}

if(getDashboardBase().getActionDetailsPane().getAction() != null)

{

// This block is executed when no Action is selected.

if(getDashboardBase().getActionDetailsPane().getAction().getID().equals(actionID))

{

getDashboardBase().getActionDetailsPane().setAction(action);

getDashboardBase().getActionDetailsPane().refresh();

}

catch (Exception e)

{

e.printStackTrace();

}

});

}

catch (SevereException e)

{

handleSevereException(e);

}

@Override

public void saveClientAction(String profileID, String actionID, SocketAddress socketAddress, boolean sendIcons, boolean runAsync)

{

if(runAsync)

{

executor.execute(new Task<Void>() {

@Override

protected Void call()

{

saveClientActionMain(profileID, actionID, socketAddress, sendIcons);

return null;

}

});

}

else

{

saveClientActionMain(profileID, actionID, socketAddress, sendIcons);

}

@Override

public void saveAllIcons(String profileID, String actionID, SocketAddress socketAddress)

{

saveAllIcons(profileID, actionID, socketAddress, true);

}

public void saveAllIcons(String profileID, String actionID, SocketAddress socketAddress, boolean async)

{

if(async)

{

executor.execute(new Task<Void>() {

@Override

protected Void call()

{

saveAllIconsMain(profileID, actionID, socketAddress);

return null;

}

});

}

else

{

saveAllIconsMain(profileID, actionID, socketAddress);

}

private void saveAllIconsMain(String profileID, String actionID, SocketAddress socketAddress)

{

try {

ClientConnection clientConnection = ClientConnections.getInstance().getClientConnectionBySocketAddress(socketAddress);

ClientProfile clientProfile = clientConnection.getClient().getProfileByID(profileID);

Action action = clientProfile.getActionByID(actionID);

for(String eachState : action.getIcons().keySet())

{

clientConnection.sendIcon(profileID, actionID, eachState,

action.getIcon(eachState));

}

catch (SevereException e)

{

handleSevereException(e);

}

@Override

public void saveIcon(String state, String profileID, String actionID, SocketAddress socketAddress) {

executor.execute(new Task<Void>() {

@Override

protected Void call()

{

try {

ClientConnection clientConnection = ClientConnections.getInstance().getClientConnectionBySocketAddress(socketAddress);

ClientProfile clientProfile = clientConnection.getClient().getProfileByID(profileID);

Action action = clientProfile.getActionByID(actionID);

clientConnection.sendIcon(profileID, actionID, state, action.getIcon(state));

}

catch (SevereException e)

{

handleSevereException(e);

}

return null;

}

});

}

@Override

public com.stream_pi.util.platform.Platform getPlatform() {

return ServerInfo.getInstance().getPlatform();

}

private Animation createOpenSettingsAnimation(Node settingsNode, Node dashboardNode) {

Timeline 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(e -> settingsNode.toFront());

return openSettingsTimeline;

}

private Animation createCloseSettingsAnimation(Node settingsNode, Node dashboardNode) {

Timeline 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();

executor.execute(new Task<Void>() {

@Override

protected Void call() {

try {

getSettingsBase().getClientsSettings().loadData();

getSettingsBase().getGeneralSettings().loadDataFromConfig();

getSettingsBase().getPluginsSettings().loadPlugins();

getSettingsBase().getThemesSettings().setThemes(getThemes());

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

getSettingsBase().getThemesSettings().loadThemes();

getSettingsBase().setDefaultTabToGeneral();

}

catch (SevereException e)

{

handleSevereException(e);

}

catch (MinorException e)

{

handleMinorException(e);

}

return null;

}

});

return closeSettingsTimeline;

}

@Override

public void setToggleStatus(boolean currentStatus, String profileID, String actionID, SocketAddress clientSocketAddress)

throws MinorException

{

ClientConnection clientConnection = ClientConnections.getInstance().getClientConnectionBySocketAddress(

clientSocketAddress

);

if(clientConnection == null)

throw new ClientNotFoundException("setToggleStatus failed because no client found with given socket address");

new Thread(new Task<Void>() {

@Override

protected Void call()

{

try

{

clientConnection.setToggleStatus(currentStatus, profileID, actionID);

}

catch (SevereException e)

{

handleSevereException(e);

}

return null;

}

}).start();

}

M src/main/java/com/stream_pi/server/window/Base.java

+1 −0

package com.stream_pi.server.window;

import com.stream_pi.server.connection.ServerListener;

import com.stream_pi.server.io.Config;

import com.stream_pi.server.info.ServerInfo;

import com.stream_pi.server.Main;

import com.stream_pi.server.window.dashboard.DashboardBase;

import com.stream_pi.server.window.settings.SettingsBase;

import com.stream_pi.theme_api.Theme;

import com.stream_pi.theme_api.Themes;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.exception.SevereException;

import com.stream_pi.util.iohelper.IOHelper;

import com.stream_pi.util.loggerhelper.StreamPiLogFallbackHandler;

import com.stream_pi.util.loggerhelper.StreamPiLogFileHandler;

import com.stream_pi.util.platform.Platform;

import javafx.application.HostServices;

import javafx.beans.value.ChangeListener;

import javafx.beans.value.ObservableValue;

import javafx.scene.image.Image;

import javafx.scene.layout.StackPane;

import javafx.scene.text.Font;

import javafx.stage.Stage;

import java.awt.*;

import java.io.File;

import java.util.Objects;

import java.util.logging.Logger;

public abstract class Base extends StackPane implements ExceptionAndAlertHandler, ServerListener {

private Config config;

private ServerInfo serverInfo;

private Stage stage;

private HostServices hostServices;

private SettingsBase settingsBase;

private DashboardBase dashboardBase;

private StackPane alertStackPane;

private StreamPiLogFileHandler logFileHandler = null;

private StreamPiLogFallbackHandler logFallbackHandler = null;

private Logger logger = null;

public Logger getLogger(){

return logger;

}

public void setHostServices(HostServices hostServices)

{

this.hostServices = hostServices;

}

public HostServices getHostServices()

{

return hostServices;

}

@Override

public void initLogger()

{

try

{

if(logFileHandler != null)

return;

closeLogger();

logger = Logger.getLogger("");

if(new File(ServerInfo.getInstance().getPrePath()).getAbsoluteFile().getParentFile().canWrite())

{

String path = ServerInfo.getInstance().getPrePath()+"../stream-pi-server.log";

if(ServerInfo.getInstance().getPlatform() == Platform.ANDROID)

path = ServerInfo.getInstance().getPrePath()+"stream-pi-server.log";

logFileHandler = new StreamPiLogFileHandler(path);

logger.addHandler(logFileHandler);

}

else

{

logFallbackHandler = new StreamPiLogFallbackHandler();

logger.addHandler(logFallbackHandler);

}

catch(Exception e)

{

e.printStackTrace();

logFallbackHandler = new StreamPiLogFallbackHandler();

logger.addHandler(logFallbackHandler);

}

public void closeLogger()

{

if(logFileHandler != null)

logFileHandler.close();

else if(logFallbackHandler != null)

logFallbackHandler.close();

}

public void initBase() throws SevereException

{

stage = (Stage) getScene().getWindow();

getStage().getIcons().clear();

getStage().getIcons().add(new Image(Objects.requireNonNull(Main.class.getResourceAsStream("app_icon.png"))));

getStage().setMinWidth(710);

getStage().setMinHeight(530);

serverInfo = ServerInfo.getInstance();

settingsBase = new SettingsBase(getHostServices(), this, this);

settingsBase.prefWidthProperty().bind(widthProperty());

settingsBase.prefHeightProperty().bind(heightProperty());

dashboardBase = new DashboardBase(this, getHostServices());

dashboardBase.prefWidthProperty().bind(widthProperty());

dashboardBase.prefHeightProperty().bind(heightProperty());

alertStackPane = new StackPane();

alertStackPane.setVisible(false);

StreamPiAlert.setParent(alertStackPane);

getChildren().clear();

getChildren().addAll(alertStackPane);

initLogger();

checkPrePathDirectory();

getChildren().addAll(settingsBase, dashboardBase);

config = Config.getInstance();

initThemes();

stage.setWidth(config.getStartupWindowWidth());

stage.setHeight(config.getStartupWindowHeight());

stage.centerOnScreen();

dashboardBase.toFront();

}

private void checkPrePathDirectory() throws SevereException

{

try

{

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

if(!filex.exists())

{

boolean result = filex.mkdirs();

if(result)

{

Config.unzipToDefaultPrePath();

initLogger();

}

else

{

setPrefSize(300,300);

clearStylesheets();

applyDefaultStylesheet();

applyDefaultIconsStylesheet();

getStage().show();

throw new SevereException("No storage permission. Give it!");

}

catch (Exception e)

{

e.printStackTrace();

throw new SevereException(e.getMessage());

}

public void initThemes() throws SevereException {

clearStylesheets();

registerThemes();

applyDefaultStylesheet();

applyDefaultTheme();

applyDefaultIconsStylesheet();

}

@Override

public Stage getStage()

{

return stage;

}

public void applyDefaultStylesheet()

{

logger.info("Applying default stylesheet ...");

Font.loadFont(Main.class.getResourceAsStream("Roboto.ttf"), 13);

getStylesheets().add(Main.class.getResource("style.css").toExternalForm());

logger.info("... Done!");

}

public void applyDefaultIconsStylesheet()

{

Font.loadFont(Main.class.getResourceAsStream("Roboto.ttf"), 13);

getStylesheets().add(Main.class.getResource("default_icons.css").toExternalForm());

}

public DashboardBase getDashboardBase()

{

return dashboardBase;

}

public SettingsBase getSettingsBase()

{

return settingsBase;

}

public Config getConfig()

{

return config;

}

public ServerInfo getServerInfo()

{

return serverInfo;

}

private Theme currentTheme;

public Theme getCurrentTheme()

{

return currentTheme;

}

public void applyTheme(Theme t)

{

logger.info("Applying theme '"+t.getFullName()+"' ...");

if(t.getFonts() != null)

{

for(String fontFile : t.getFonts())

{

Font.loadFont(fontFile.replace("%20",""), 13);

}

currentTheme = t;

getStylesheets().addAll(t.getStylesheets());

logger.info("... Theme applied successfully!");

}

public void clearStylesheets()

{

getStylesheets().clear();

}

Themes themes;

public void registerThemes() throws SevereException

{

logger.info("Loading themes ...");

themes = new Themes(getConfig().getDefaultThemesPath(), getConfig().getThemesPath(), getConfig().getCurrentThemeFullName(), serverInfo.getMinThemeSupportVersion());

if(!themes.getErrors().isEmpty())

{

StringBuilder themeErrors = new StringBuilder();

for(MinorException eachException : themes.getErrors())

{

themeErrors.append("\n * ").append(eachException.getShortMessage());

}

if(themes.getIsBadThemeTheCurrentOne())

{

if(getConfig().getCurrentThemeFullName().equals(getConfig().getDefaultCurrentThemeFullName()))

{

throw new SevereException("Unable to get default theme ("+getConfig().getDefaultCurrentThemeFullName()+")\n" +

"Please restore the theme or reinstall.");

}

themeErrors.append("\n\nReverted to default theme! (").append(getConfig().getDefaultCurrentThemeFullName()).append(")");

getConfig().setCurrentThemeFullName(getConfig().getDefaultCurrentThemeFullName());

getConfig().save();

}

handleMinorException(new MinorException("Theme Loading issues", themeErrors.toString()));

}

logger.info("...Themes loaded successfully !");

}

public Themes getThemes()

{

return themes;

}

public void applyDefaultTheme()

{

logger.info("Applying default theme ...");

boolean foundTheme = false;

for(Theme t: themes.getThemeList())

{

if(t.getFullName().equals(config.getCurrentThemeFullName()))

{

foundTheme = true;

applyTheme(t);

break;

}

if(!foundTheme)

{

logger.info("Theme not found. reverting to light theme ...");

try {

Config.getInstance().setCurrentThemeFullName("com.streampi.DefaultLight");

Config.getInstance().save();

applyDefaultTheme();

}

catch (SevereException e)

{

handleSevereException(e);

}

M src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnSaveActionTask.java

+3 −1

package com.stream_pi.server.window.dashboard.actiondetailpane;

import java.util.ArrayList;

import java.util.List;

import java.util.logging.Logger;

import com.stream_pi.action_api.action.Action;

import com.stream_pi.action_api.action.ActionType;

import com.stream_pi.action_api.action.DisplayTextAlignment;

import com.stream_pi.action_api.actionproperty.ClientProperties;

import com.stream_pi.action_api.actionproperty.property.Property;

import com.stream_pi.action_api.actionproperty.property.Type;

import com.stream_pi.action_api.externalplugin.ExternalPlugin;

import com.stream_pi.server.client.ClientProfile;

import com.stream_pi.server.connection.ClientConnection;

import com.stream_pi.server.uipropertybox.UIPropertyBox;

import com.stream_pi.server.window.ExceptionAndAlertHandler;

import com.stream_pi.server.window.dashboard.actiongridpane.ActionBox;

import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.exception.SevereException;

import javafx.application.Platform;

import javafx.concurrent.Task;

import javafx.scene.control.Button;

public class OnSaveActionTask extends Task<Void>

{

private Logger logger;

public OnSaveActionTask(ClientConnection connection, Action action, String delayBeforeRunningString, String displayNameText, boolean isCombineChild,

boolean isShowDisplayText, boolean isDefaultDisplayTextColour, String displayTextFontColour, boolean isClearIcon,

boolean isHideDefaultIcon, boolean isHideToggleOffIcon, boolean isHideToggleOnIcon, DisplayTextAlignment displayTextAlignment, boolean isTransparentBackground, String backgroundColour,

CombineActionPropertiesPane combineActionPropertiesPane, ClientProfile clientProfile, boolean sendIcon, ActionBox actionBox,

ArrayList<UIPropertyBox> actionClientProperties, ExceptionAndAlertHandler exceptionAndAlertHandler, Button saveButton, Button deleteButton, Button resetButton,

boolean runOnActionSavedFromServer, boolean runAsync, ActionDetailsPaneListener actionDetailsPaneListener)

{

this.saveButton = saveButton;

this.deleteButton = deleteButton;

this.resetButton = resetButton;

this.delayBeforeRunningString = delayBeforeRunningString;

this.connection = connection;

this.action = action;

this.displayNameText = displayNameText;

this.isCombineChild = isCombineChild;

this.isShowDisplayText = isShowDisplayText;

this.isDefaultDisplayTextColour = isDefaultDisplayTextColour;

this.displayTextFontColour = displayTextFontColour;

this.isClearIcon = isClearIcon;

this.isHideDefaultIcon = isHideDefaultIcon;

this.isHideToggleOffIcon = isHideToggleOffIcon;

this.isHideToggleOnIcon = isHideToggleOnIcon;

this.displayTextAlignment = displayTextAlignment;

this.isTransparentBackground = isTransparentBackground;

this.combineActionPropertiesPane = combineActionPropertiesPane;

this.clientProfile = clientProfile;

this.sendIcon = sendIcon;

this.actionBox = actionBox;

this.exceptionAndAlertHandler = exceptionAndAlertHandler;

this.backgroundColour = backgroundColour;

this.actionClientProperties = actionClientProperties;

this.runOnActionSavedFromServer = runOnActionSavedFromServer;

this.actionDetailsPaneListener = actionDetailsPaneListener;

logger = Logger.getLogger(getClass().getName());

if(runAsync)

new Thread(this).start();

else

runTask();

}

private boolean runOnActionSavedFromServer;

private ActionDetailsPaneListener actionDetailsPaneListener;

private Button saveButton;

private Button deleteButton;

private Button resetButton;

private String delayBeforeRunningString;

private boolean isShowDisplayText;

private boolean isCombineChild;

private String displayNameText;

private boolean isDefaultDisplayTextColour;

private ArrayList<UIPropertyBox> actionClientProperties;

private String displayTextFontColour;

private boolean isClearIcon;

private boolean isHideDefaultIcon;

private boolean isHideToggleOffIcon;

private boolean isHideToggleOnIcon;

private DisplayTextAlignment displayTextAlignment;

private boolean isTransparentBackground;

private String backgroundColour;

private CombineActionPropertiesPane combineActionPropertiesPane;

private ClientProfile clientProfile;

private boolean sendIcon;

private ActionBox actionBox;

private ExceptionAndAlertHandler exceptionAndAlertHandler;

private Action action;

private ClientConnection connection;

private void setSaveDeleteResetButtonState(boolean state)

{

Platform.runLater(()->{

resetButton.setDisable(state);

saveButton.setDisable(state);

deleteButton.setDisable(state);

});

}

private void runTask()

{

action.setDisplayText(displayNameText);

if(!isCombineChild)

{

setSaveDeleteResetButtonState(true);

action.setShowDisplayText(isShowDisplayText);

if(isDefaultDisplayTextColour)

action.setDisplayTextFontColourHex("");

else

{

action.setDisplayTextFontColourHex(displayTextFontColour);

//String fontColour = "#" + displayTextColourPicker.getValue().toString().substring(2);

//action.setDisplayTextFontColourHex(fontColour);

}

if(isClearIcon)

{

action.setIcons(null);

action.setCurrentIconState("");

}

logger.info("isHideDEfaultIcon : "+isHideDefaultIcon);

logger.info("isHideDEfaultIcon : "+isHideToggleOffIcon);

logger.info("isHideDEfaultIcon : "+isHideToggleOnIcon);

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

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

action.getActionType() == ActionType.FOLDER ||

action.getActionType() == ActionType.COMBINE)

{

if(isHideDefaultIcon)

{

action.setCurrentIconState("");

}

else

{

if(action.getIcon("default") != null)

action.setCurrentIconState("default");

}

else if (action.getActionType() == ActionType.TOGGLE)

{

action.setCurrentIconState(isHideToggleOffIcon+"__"+isHideToggleOnIcon);

}

action.setDisplayTextAlignment(displayTextAlignment);

if(isTransparentBackground)

action.setBgColourHex("");

else

{

action.setBgColourHex(backgroundColour);

}

System.out.println("parent : "+action.getParent());

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

{

List<String> finalChildren = combineActionPropertiesPane.getFinalChildren();

System.out.println("2334 "+finalChildren.size());

ClientProperties clientProperties = new ClientProperties();

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

{

Property property = new Property(i+"", Type.STRING);

property.setRawValue(finalChildren.get(i));

clientProperties.addProperty(property);

}

action.getClientProperties().set(clientProperties);

}

else

{

if(action.getActionType() != ActionType.FOLDER)

action.setDelayBeforeExecuting(Integer.parseInt(delayBeforeRunningString));

//properties

for (UIPropertyBox clientProperty : actionClientProperties) {

action.getClientProperties().get().get(clientProperty.getIndex()).setRawValue(clientProperty.getRawValue());

}

try

{

logger.info("Saving action ... "+action.isHasIcon()+"+"+sendIcon);

if(runOnActionSavedFromServer)

{

try

{

if(action instanceof ExternalPlugin)

{

System.out.println(action.getSocketAddressForClient());

((ExternalPlugin) action).onActionSavedFromServer();

}

catch (Exception e)

{

e.printStackTrace();

exceptionAndAlertHandler.handleMinorException(new MinorException("Error","onActionSavedFromServer() failed for "+action.getModuleName()+"\n\n"+e.getMessage()));

}

connection.saveActionDetails(clientProfile.getID(), action);

if(sendIcon)

{

sendAllIcons(clientProfile, action);

}

if(!isCombineChild)

{

Platform.runLater(()->{

actionBox.clear();

actionBox.setAction(action);

//actionBox.baseInit();

actionBox.init();

});

setSaveDeleteResetButtonState(false);

}

clientProfile.removeActionByID(action.getID());

clientProfile.addAction(action);

Platform.runLater(actionDetailsPaneListener::refresh);

}

catch (SevereException e)

{

e.printStackTrace();

exceptionAndAlertHandler.handleSevereException(e);

}

catch (Exception e)

{

e.printStackTrace();

}

private void sendAllIcons(ClientProfile clientProfile, Action action) throws SevereException

{

for(String state : action.getIcons().keySet())

{

System.out.println("Sending icon " +state+" -> "+action.getID()+ "-> "+clientProfile.getID());

connection.sendIcon(clientProfile.getID(), action.getID(), state, action.getIcon(state));

}

@Override

protected Void call() throws Exception

{

runTask();

return null;

}

M src/main/java/com/stream_pi/server/window/settings/GeneralSettings.java

+24 −1

package com.stream_pi.server.window.settings;

import com.stream_pi.server.connection.ServerListener;

import com.stream_pi.server.io.Config;

import com.stream_pi.server.window.ExceptionAndAlertHandler;

import com.stream_pi.server.info.ServerInfo;

import com.stream_pi.theme_api.Themes;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertListener;

import com.stream_pi.util.alert.StreamPiAlertType;

import com.stream_pi.util.checkforupdates.CheckForUpdates;

import com.stream_pi.util.checkforupdates.UpdateHyperlinkOnClick;

import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.exception.SevereException;

import com.stream_pi.util.platform.PlatformType;

import com.stream_pi.util.startatboot.StartAtBoot;

import com.stream_pi.util.version.Version;

import javafx.application.HostServices;

import javafx.application.Platform;

import javafx.concurrent.Task;

import javafx.event.ActionEvent;

import javafx.geometry.Insets;

import javafx.geometry.Pos;

import javafx.scene.control.*;

import javafx.scene.control.Button;

import javafx.scene.control.Label;

import javafx.scene.control.ScrollPane;

import javafx.scene.control.TextField;

import javafx.scene.layout.*;

import javafx.stage.DirectoryChooser;

import org.kordamp.ikonli.javafx.FontIcon;

import java.awt.SystemTray;

import java.io.BufferedReader;

import java.io.File;

import java.io.InputStreamReader;

import java.net.URL;

import java.util.logging.Logger;

public class GeneralSettings extends VBox {

private final TextField serverNameTextField;

private final TextField portTextField;

private final TextField pluginsPathTextField;

private final TextField themesPathTextField;

private final TextField actionGridPaneActionBoxSize;

private final TextField actionGridPaneActionBoxGap;

private final ToggleButton startOnBootToggleButton;

private final ToggleButton minimizeToSystemTrayOnCloseToggleButton;

private final Button saveButton;

private final Button checkForUpdatesButton;

private Logger logger;

private ExceptionAndAlertHandler exceptionAndAlertHandler;

private ServerListener serverListener;

private HostServices hostServices;

public GeneralSettings(ExceptionAndAlertHandler exceptionAndAlertHandler, ServerListener serverListener, HostServices hostServices)

{

this.hostServices = hostServices;

this.exceptionAndAlertHandler = exceptionAndAlertHandler;

this.serverListener = serverListener;

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

serverNameTextField = new TextField();

portTextField = new TextField();

pluginsPathTextField = new TextField();

themesPathTextField = new TextField();

actionGridPaneActionBoxSize = new TextField();

actionGridPaneActionBoxGap = new TextField();

startOnBootToggleButton = new ToggleButton("Start on Boot");

minimizeToSystemTrayOnCloseToggleButton = new ToggleButton("Minimise To Tray On Close");

checkForUpdatesButton = new Button("Check for updates");

checkForUpdatesButton.setOnAction(event->checkForUpdates());

getStyleClass().add("general_settings");

prefWidthProperty().bind(widthProperty());

setAlignment(Pos.CENTER);

setSpacing(5);

getChildren().addAll(

getUIInputBox("Server Name", serverNameTextField),

getUIInputBox("Port", portTextField),

getUIInputBox("Grid Pane - Box Size", actionGridPaneActionBoxSize),

getUIInputBox("Grid Pane - Box Gap", actionGridPaneActionBoxGap),

getUIInputBoxWithDirectoryChooser("Plugins Path", pluginsPathTextField),

getUIInputBoxWithDirectoryChooser("Themes Path", themesPathTextField)

);

serverNameTextField.setPrefWidth(200);

HBox toggleButtons = new HBox(minimizeToSystemTrayOnCloseToggleButton, startOnBootToggleButton);

toggleButtons.setSpacing(10.0);

VBox.setMargin(toggleButtons, new Insets(30, 0 , 0,0));

toggleButtons.setAlignment(Pos.CENTER);

saveButton = new Button("Save");

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

getChildren().addAll(toggleButtons, checkForUpdatesButton, saveButton);

setPadding(new Insets(10));

}

private void checkForUpdates()

{

new CheckForUpdates(checkForUpdatesButton,

PlatformType.SERVER, ServerInfo.getInstance().getVersion(), new UpdateHyperlinkOnClick() {

@Override

public void handle(ActionEvent actionEvent) {

hostServices.showDocument(getURL());

}

});

}

private HBox getUIInputBoxWithDirectoryChooser(String labelText, TextField textField)

{

HBox hBox = getUIInputBox(labelText, textField);

hBox.setSpacing(5.0);

TextField tf = (TextField) hBox.getChildren().get(2);

tf.setPrefWidth(300);

tf.setDisable(true);

Button button = new Button();

FontIcon fontIcon = new FontIcon("far-folder");

button.setGraphic(fontIcon);

button.setOnAction(event -> {

DirectoryChooser directoryChooser = new DirectoryChooser();

try {

File selectedDirectory = directoryChooser.showDialog(getScene().getWindow());

textField.setText(selectedDirectory.getAbsolutePath());

}

catch (NullPointerException e)

{

logger.info("No folder selected");

}

});

hBox.getChildren().add(button);

return hBox;

}

private HBox getUIInputBox(String labelText, TextField textField)

{

textField.setPrefWidth(100);

Label label = new Label(labelText);

Region region = new Region();

HBox.setHgrow(region, Priority.ALWAYS);

return new HBox(label, region, textField);

}

public void loadDataFromConfig() throws SevereException {

Config config = Config.getInstance();

Platform.runLater(()->

{

serverNameTextField.setText(config.getServerName());

portTextField.setText(config.getPort()+"");

pluginsPathTextField.setText(config.getPluginsPath());

themesPathTextField.setText(config.getThemesPath());

actionGridPaneActionBoxSize.setText(config.getActionGridActionSize()+"");

actionGridPaneActionBoxGap.setText(config.getActionGridActionGap()+"");

minimizeToSystemTrayOnCloseToggleButton.setSelected(config.getMinimiseToSystemTrayOnClose());

startOnBootToggleButton.setSelected(config.getStartOnBoot());

});

}

public void save()

{

new Thread(new Task<Void>() {

@Override

protected Void call()

{

try {

boolean toBeReloaded = false;

boolean dashToBeReRendered = false;

Platform.runLater(()->{

saveButton.setDisable(true);

serverNameTextField.setDisable(true);

portTextField.setDisable(true);

minimizeToSystemTrayOnCloseToggleButton.setDisable(true);

startOnBootToggleButton.setDisable(true);

});

String serverNameStr = serverNameTextField.getText();

String serverPortStr = portTextField.getText();

String pluginsPathStr = pluginsPathTextField.getText();

String themesPathStr = themesPathTextField.getText();

String actionGridActionBoxSize = actionGridPaneActionBoxSize.getText();

String actionGridActionBoxGap = actionGridPaneActionBoxGap.getText();

boolean minimizeToSystemTrayOnClose = minimizeToSystemTrayOnCloseToggleButton.isSelected();

boolean startOnBoot = startOnBootToggleButton.isSelected();

Config config = Config.getInstance();

StringBuilder errors = new StringBuilder();

if(serverNameStr.isBlank())

{

errors.append("* Server Name cannot be blank.\n");

}

else

{

if(!config.getServerName().equals(serverNameStr))

{

toBeReloaded = true;

}

int serverPort=-1;

try {

serverPort = Integer.parseInt(serverPortStr);

if (serverPort < 1024)

errors.append("* Server Port must be more than 1024\n");

else if(serverPort > 65535)

errors.append("* Server Port must be lesser than 65535\n");

if(config.getPort()!=serverPort)

{

toBeReloaded = true;

}

catch (NumberFormatException e)

{

errors.append("* Server Port must be integer.\n");

}

int actionSize=-1;

try {

actionSize = Integer.parseInt(actionGridActionBoxSize);

if(config.getActionGridActionSize() != actionSize)

{

dashToBeReRendered = true;

}

catch (NumberFormatException e)

{

errors.append("* action Size must be integer.\n");

}

int actionGap=-1;

try {

actionGap = Integer.parseInt(actionGridActionBoxGap);

if(config.getActionGridActionGap() != actionGap)

{

dashToBeReRendered = true;

}

catch (NumberFormatException e)

{

errors.append("* action Gap must be integer.\n");

}

if(pluginsPathStr.isBlank())

{

errors.append("* Plugins Path must not be blank.\n");

}

else

{

if(!config.getPluginsPath().equals(pluginsPathStr))

{

toBeReloaded = true;

}

if(themesPathStr.isBlank())

{

errors.append("* Themes Path must not be blank.\n");

}

else

{

if(!config.getThemesPath().equals(themesPathStr))

{

toBeReloaded = true;

}

if(!errors.toString().isEmpty())

{

throw new MinorException("Uh Oh!", "Please rectify the following errors and try again :\n"+errors.toString());

}

if(config.getStartOnBoot() != startOnBoot)

{

if(ServerInfo.getInstance().getRunnerFileName() == null)

{

new StreamPiAlert("Uh Oh", "No Runner File Name Specified as startup arguments. Cant set run at boot.", StreamPiAlertType.ERROR).show();

startOnBoot = false;

}

else

{

StartAtBoot startAtBoot = new StartAtBoot(PlatformType.SERVER, ServerInfo.getInstance().getPlatform());

if(startOnBoot)

{

startAtBoot.create(new File(ServerInfo.getInstance().getRunnerFileName()));

}

else

{

boolean result = startAtBoot.delete();

if(!result)

new StreamPiAlert("Uh Oh!", "Unable to delete starter file", StreamPiAlertType.ERROR).show();

}

if(minimizeToSystemTrayOnClose)

{

if(!SystemTray.isSupported())

{

StreamPiAlert alert = new StreamPiAlert("Not Supported", "Tray System not supported on this platform ", StreamPiAlertType.ERROR);

alert.show();

minimizeToSystemTrayOnClose = false;

}

config.setServerName(serverNameStr);

config.setServerPort(serverPort);

config.setActionGridGap(actionGap);

config.setActionGridSize(actionSize);

config.setPluginsPath(pluginsPathStr);

config.setThemesPath(themesPathStr);

config.setMinimiseToSystemTrayOnClose(minimizeToSystemTrayOnClose);

config.setStartupOnBoot(startOnBoot);

config.save();

loadDataFromConfig();

if(toBeReloaded)

{

new StreamPiAlert("Restart","Restart to see changes", StreamPiAlertType.INFORMATION).show();

StreamPiAlert restartPrompt = new StreamPiAlert(

"Warning",

"Stream-Pi Server needs to be restarted for these changes to take effect. Restart?\n" +

"All your current connections will be disconnected.",

StreamPiAlertType.WARNING

);

String yesOption = "Yes";

String noOption = "No";

restartPrompt.setButtons(yesOption, noOption);

restartPrompt.setOnClicked(new StreamPiAlertListener() {

@Override

public void onClick(String s) {

if(s.equals(yesOption))

{

serverListener.restart();

}

});

restartPrompt.show();

}

if(dashToBeReRendered)

{

serverListener.clearTemp();

}

catch (MinorException e)

{

exceptionAndAlertHandler.handleMinorException(e);

}

catch (SevereException e)

{

exceptionAndAlertHandler.handleSevereException(e);

}

finally {

Platform.runLater(()->{

saveButton.setDisable(false);

serverNameTextField.setDisable(false);

portTextField.setDisable(false);

minimizeToSystemTrayOnCloseToggleButton.setDisable(false);

startOnBootToggleButton.setDisable(false);

});

}

return null;

}

}).start();

}

Public

server

Clone or download

Added inbuilt restart function to restart the app.

Modified Files