server

Cleanup, Refactored

Download Browse

+22 −34

Author

Debayan Sutradhar (rnayabed) 2021-06-03 21:53

Committer

Debayan Sutradhar (rnayabed) 2021-06-03 21:53

Hash 9c417df97ac590af43caa93451e61707630e4e6d

Parent 79701717dd07da2e0a4163efab58c8a6c21f4a96

Reference git #server/9c417df97ac590af43caa93451e61707630e4e6d

Modified Files

List

Side by side diff

Inline diff

M src/main/java/com/stream_pi/server/Main.java

+3 −2

Stream-Pi - Free & Open-Source Modular Cross-Platform Programmable Macropad

This program is free software: you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation, either version 3 of the License, or

(at your option) any later version.

This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

GNU General Public License for more details.

Written by : Debayan Sutradhar (rnayabed)

package com.stream_pi.server;

import com.stream_pi.server.controller.Controller;

import com.stream_pi.server.info.ServerInfo;

import com.stream_pi.server.info.StartupFlags;

import javafx.application.Application;

import javafx.scene.Scene;

import javafx.stage.Stage;

public class Main extends Application {

/**

* First method to be called

* This method first parses all the available command line arguments passed.

* Then a new instance of controller is created, and then initialised.

public void start(Stage stage) {

for(String eachArg : getParameters().getRaw())

{

if(!eachArg.startsWith("-DStream-Pi"))

continue;

String[] r = eachArg.split("=");

String arg = r[0];

String val = r[1];

if(arg.equals("-DStream-Pi.startupRunnerFileName"))

ServerInfo.getInstance().setRunnerFileName(val);

StartupFlags.RUNNER_FILE_NAME = val;

else if(arg.equals("-DStream-Pi.startupMode"))

ServerInfo.getInstance().setStartMinimised(val.equals("min"));

StartupFlags.START_MINIMISED = val.equals("min");

}

Controller d = new Controller();

Scene s = new Scene(d);

stage.setScene(s);

d.setHostServices(getHostServices());

d.init();

}

/**

* This is a fallback. Called in some JVMs.

* This method just sends the command line arguments to JavaFX Application

public static void main(String[] args)

{

launch(args);

}

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

+2 −1

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.info.StartupFlags;

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.setMinHeight(500);

stage.setMinWidth(700);

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

if(StartupFlags.START_MINIMISED && 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;

}

onQuitApp();

ExternalPlugins.getInstance().shutDownActions();

Platform.exit();

}

catch (SevereException e)

{

handleSevereException(e);

}

catch (MinorException e)

{

handleMinorException(e);

}

public void onQuitApp()

{

try

{

if(getConfig() != null)

{

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

getConfig().setRightDividerPositions(getDashboardBase().getDividerPositions());

getConfig().setLeftDividerPositions(getDashboardBase().getLeftSplitPane().getDividerPositions());

getConfig().save();

}

catch (SevereException e)

{

handleSevereException(e);

}

stopServerAndAllConnections();

executor.shutdown();

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

closeLogger();

}

private void stopServerAndAllConnections()

{

if(mainServer!=null)

mainServer.stopListeningForConnections();

ClientConnections.getInstance().disconnectAll();

}

@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.getShortMessage(), 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.getShortMessage(), 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 void onNormalActionClicked(NormalAction action, String profileID, SocketAddress socketAddress)

{

try

{

action.onActionClicked();

}

catch (MinorException e)

{

sendActionFailed(e, socketAddress, profileID, action.getID());

}

@Override

public synchronized void onToggleActionClicked(ToggleAction action, boolean toggle, String profileID, SocketAddress socketAddress)

{

try

{

if(toggle)

{

action.onToggleOn();

}

else

{

action.onToggleOff();

}

catch (MinorException e)

{

sendActionFailed(e, socketAddress, profileID, action.getID());

}

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

}

@Override

public void sendActionFailed(MinorException exception, SocketAddress socketAddress, String profileID, String actionID)

{

if(exception.getTitle() != null)

{

exception.setShortMessage(exception.getTitle()+"\n"+exception.getShortMessage());

}

exception.setTitle("Error while running action");

handleMinorException(exception);

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

@Override

protected Void call()

{

try {

ClientConnections.getInstance().getClientConnectionBySocketAddress(socketAddress)

.sendActionFailed(profileID, actionID);

}

catch (SevereException e)

{

handleSevereException(e);

}

return null;

}

});

}

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/info/ServerInfo.java

+1 −23

ServerInfo.java

Stores basic information about the server - name, platform type

Contributors: Debayan Sutradhar (@dubbadhar)

package com.stream_pi.server.info;

import com.stream_pi.util.platform.Platform;

import com.stream_pi.util.platform.ReleaseStatus;

import com.stream_pi.util.version.Version;

public class ServerInfo {

private Version version;

private final ReleaseStatus releaseStatus;

private final Platform platform;

private String prePath;

private Version minThemeSupportVersion;

private Version minPluginSupportVersion;

private Version commStandardVersion;

private static ServerInfo instance = null;

private String runnerFileName = null;

private boolean startMinimised = false;

private ServerInfo()

{

version = new Version(1,0,0);

minThemeSupportVersion = new Version(1,0,0);

minPluginSupportVersion = new Version(1,0,0);

commStandardVersion = new Version(1,0,0);

releaseStatus = ReleaseStatus.EA;

prePath = System.getProperty("user.home")+"/Stream-Pi/Server/";

String osName = System.getProperty("os.name").toLowerCase();

if(osName.contains("windows"))

platform = Platform.WINDOWS;

else if (osName.contains("linux"))

platform = Platform.LINUX;

else if (osName.contains("mac"))

platform = Platform.MAC;

else

platform = Platform.UNKNOWN;

}

public String getPrePath() {

return prePath;

}

public void setStartMinimised(boolean startMinimised)

{

this.startMinimised = startMinimised;

}

public boolean isStartMinimised()

{

return startMinimised;

}

public void setRunnerFileName(String runnerFileName)

{

this.runnerFileName = runnerFileName;

}

public String getRunnerFileName()

{

return runnerFileName;

}

public static synchronized ServerInfo getInstance()

{

if(instance == null)

{

instance = new ServerInfo();

}

return instance;

}

public Platform getPlatform()

{

return platform;

}

public Version getVersion() {

return version;

}

public ReleaseStatus getReleaseStatus()

{

return releaseStatus;

}

public Version getMinThemeSupportVersion()

{

return minThemeSupportVersion;

}

public Version getMinPluginSupportVersion()

{

return minPluginSupportVersion;

}

public Version getCommStandardVersion()

{

return commStandardVersion;

}

A src/main/java/com/stream_pi/server/info/StartupFlags.java

+7 −0

package com.stream_pi.server.info;

public class StartupFlags

{

public static String RUNNER_FILE_NAME = null;

public static boolean START_MINIMISED = false;

}

M src/main/java/com/stream_pi/server/window/settings/About/ContactTab.java

+6 −6

package com.stream_pi.server.window.settings.About;

import com.stream_pi.util.contactlinks.ContactLinks;

import javafx.application.HostServices;

import javafx.geometry.Insets;

import javafx.scene.control.Hyperlink;

import javafx.scene.control.ScrollPane;

import javafx.scene.layout.VBox;

public class ContactTab extends ScrollPane

{

private final HostServices hostServices;

public ContactTab(HostServices hostServices)

{

this.hostServices = hostServices;

getStyleClass().add("about_contact_tab_scroll_pane");

Hyperlink github = new Hyperlink("GitHub");

github.setOnAction(event -> openWebpage("https://github.com/Stream-Pi"));

github.setOnAction(event -> openWebpage(ContactLinks.getGitHub()));

Hyperlink discord = new Hyperlink("Discord");

discord.setOnAction(event -> openWebpage("https://discord.gg/BExqGmk"));

discord.setOnAction(event -> openWebpage(ContactLinks.getDiscord()));

Hyperlink website = new Hyperlink("Website");

website.setOnAction(event -> openWebpage("https://stream-pi.com"));

website.setOnAction(event -> openWebpage(ContactLinks.getWebsite()));

Hyperlink twitter = new Hyperlink("Twitter");

twitter.setOnAction(event -> openWebpage("https://twitter.com/Stream_Pi"));

twitter.setOnAction(event -> openWebpage(ContactLinks.getTwitter()));

Hyperlink matrix = new Hyperlink("Matrix");

matrix.setOnAction(event -> openWebpage("https://matrix.to/#/#stream-pi_general:matrix.org"));

matrix.setOnAction(event -> openWebpage(ContactLinks.getMatrix()));

VBox vBox = new VBox(github, discord, website, twitter, matrix);

vBox.setSpacing(10.0);

setContent(vBox);

}

public void openWebpage(String url)

{

hostServices.showDocument(url);

}

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

+3 −2

package com.stream_pi.server.window.settings;

import com.stream_pi.server.connection.ServerListener;

import com.stream_pi.server.info.StartupFlags;

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.uihelper.HBoxWithSpaceBetween;

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.controlsfx.control.ToggleSwitch;

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 ToggleSwitch startOnBootToggleSwitch;

private final HBoxWithSpaceBetween startOnBootHBox;

private final ToggleSwitch minimizeToSystemTrayOnCloseToggleSwitch;

private final HBoxWithSpaceBetween minimizeToSystemTrayOnCloseHBox;

private final ToggleSwitch showAlertsPopupToggleSwitch;

private final HBoxWithSpaceBetween showAlertsPopupHBox;

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

startOnBootToggleSwitch = new ToggleSwitch();

startOnBootHBox = new HBoxWithSpaceBetween("Start on Boot", startOnBootToggleSwitch);

startOnBootHBox.managedProperty().bind(startOnBootHBox.visibleProperty());

minimizeToSystemTrayOnCloseToggleSwitch = new ToggleSwitch();

minimizeToSystemTrayOnCloseHBox = new HBoxWithSpaceBetween("Minimise To Tray On Close", minimizeToSystemTrayOnCloseToggleSwitch);

showAlertsPopupToggleSwitch = new ToggleSwitch();

showAlertsPopupHBox = new HBoxWithSpaceBetween("Show Popup On Alert", showAlertsPopupToggleSwitch);

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

minimizeToSystemTrayOnCloseHBox,

startOnBootHBox,

showAlertsPopupHBox

);

serverNameTextField.setPrefWidth(200);

saveButton = new Button("Save");

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

getChildren().addAll(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()+"");

minimizeToSystemTrayOnCloseToggleSwitch.setSelected(config.getMinimiseToSystemTrayOnClose());

showAlertsPopupToggleSwitch.setSelected(config.isShowAlertsPopup());

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

});

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 = minimizeToSystemTrayOnCloseToggleSwitch.isSelected();

boolean showAlertsPopup = showAlertsPopupToggleSwitch.isSelected();

boolean startOnBoot = startOnBootToggleSwitch.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)

if(StartupFlags.RUNNER_FILE_NAME == 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()));

startAtBoot.create(new File(StartupFlags.RUNNER_FILE_NAME));

}

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

StreamPiAlert.setIsShowPopup(showAlertsPopup);

config.setShowAlertsPopup(showAlertsPopup);

config.setStartupOnBoot(startOnBoot);

config.save();

loadDataFromConfig();

if(toBeReloaded)

{

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

});

}

return null;

}

}).start();

}

Public

server

Clone or download

Cleanup, Refactored

Modified Files