essential-actions

[OBS] - Bumped version to 2.0.0, lots of work on SetCurrentProfile

Download Browse

+128 −53

Author

Debayan Sutradhar (rnayabed) 2021-04-10 00:59

Committer

Debayan Sutradhar (rnayabed) 2021-04-10 00:59

Hash ef9f1c46af1fad379ab785d2097c4192e9ec77cd

Parent d765e22a771e6dc163f593bd1bf5866f27a00b6b

Reference git #essential-actions/ef9f1c46af1fad379ab785d2097c4192e9ec77cd

Modified Files

List

Side by side diff

Inline diff

M obssuite/mother/pom.xml

+1 −1

<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0"

xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<groupId>com.stream-pi</groupId>

<artifactId>obssuite_motheraction</artifactId>

<build>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-jar-plugin</artifactId>

<phase>package</phase>

<goals>

</goals>

</execution>

</executions>

</plugin>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-compiler-plugin</artifactId>

</configuration>

</plugin>

</plugins>

</build>

<ActionAPIVersion>1.0.0-SNAPSHOT</ActionAPIVersion>

<UtilVersion>1.0.0-SNAPSHOT</UtilVersion>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.source>11</maven.compiler.source>

<maven.compiler.target>11</maven.compiler.target>

</properties>

<groupId>com.stream-pi</groupId>

<version>${UtilVersion}</version>

</dependency>

<groupId>com.stream-pi</groupId>

<artifactId>action-api</artifactId>

<version>${ActionAPIVersion}</version>

</dependency>

<groupId>net.twasi</groupId>

<artifactId>obs-websocket-java</artifactId>

<version>${OBSWebsocketJavaVersion}</version>

</dependency>

<groupId>org.eclipse.jetty.websocket</groupId>

<artifactId>websocket-client</artifactId>

</dependency>

<groupId>com.google.code.gson</groupId>

</dependency>

</dependencies>

</project>

M obssuite/mother/src/main/java/mother/Mother.java

+7 −4

package mother;

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

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.NormalAction;

import com.stream_pi.util.version.Version;

import com.stream_pi.util.exception.MinorException;

import mother.motherconnection.MotherConnection;

import javafx.scene.control.Button;

public class Mother extends NormalAction

{

public Mother()

{

setName("OBS Plugin");

setCategory("OBS");

setVisibilityInPluginsPane(false);

setAuthor("rnayabed");

setHelpLink("https://github.com/Stream-Pi/EssentialActions");

setVersion(new Version(1,1,0));

setVersion(MotherConnection.VERSION);

connectDisconnectButton = new Button("Connect");

setServerSettingsButtonBar(connectDisconnectButton);

}

@Override

public void onActionClicked()

{

}

private Button connectDisconnectButton;

@Override

public void initProperties() throws Exception

{

Property urlProperty = new Property("url", Type.STRING);

urlProperty.setDisplayName("URL");

urlProperty.setDefaultValueStr("ws://localhost:4444");

urlProperty.setCanBeBlank(false);

Property passwordProperty = new Property("pass", Type.STRING);

passwordProperty.setControlType(ControlType.TEXT_FIELD_MASKED);

passwordProperty.setDisplayName("Password");

Property connectOnStartupProperty = new Property("connect_on_startup", Type.BOOLEAN);

connectOnStartupProperty.setDisplayName("Connect On Startup");

connectOnStartupProperty.setDefaultValueBoolean(false);

addServerProperties(

urlProperty,

passwordProperty,

connectOnStartupProperty

);

}

@Override

public void initAction() throws Exception {

public void initAction() throws Exception

{

MotherConnection.setPass(getPassword());

MotherConnection.setUrl(getURL());

MotherConnection.setConnectDisconnectButton(connectDisconnectButton);

connectDisconnectButton.setOnAction(action->{

try

{

if(MotherConnection.getRemoteController() == null)

{

connect(getURL(), getPassword());

}

else

{

MotherConnection.getRemoteController().disconnect();

}

catch (Exception e)

{

e.printStackTrace();

}

});

if(isConnectOnStartup() && firstRun)

{

connect(getURL(), getPassword());

}

firstRun = false;

}

private boolean firstRun = true;

private String getURL() throws MinorException

{

return getServerProperties().getSingleProperty("url").getStringValue();

}

private String getPassword() throws MinorException

{

return getServerProperties().getSingleProperty("pass").getStringValue();

}

private boolean isConnectOnStartup() throws MinorException

{

return getServerProperties().getSingleProperty("connect_on_startup").getBoolValue();

}

private void connect(String url, String pass)

{

MotherConnection.setPass(pass);

MotherConnection.setUrl(url);

new OBSActionConnectionTask(connectDisconnectButton, true);

new OBSActionConnectionTask(true, null, null, null);

}

@Override

public void onShutDown()

{

if(MotherConnection.getRemoteController() != null)

{

MotherConnection.getRemoteController().disconnect();

}

M obssuite/mother/src/main/java/mother/OBSActionConnectionTask.java

+33 −12

package mother;

import mother.motherconnection.MotherConnection;

import javafx.application.Platform;

import javafx.concurrent.Task;

import javafx.scene.control.Button;

import net.twasi.obsremotejava.OBSRemoteController;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertType;

public class OBSActionConnectionTask extends Task<Void>

{

private Runnable onFailToConnectRunnable = null;

private Runnable onConnectRunnable = null;

private Runnable onDisconnectRunnable = null;

String url, pass;

public OBSActionConnectionTask(boolean runAsync, Runnable onFailToConnectRunnable,

Button connectDisconnectButton;

Runnable onConnectRunnable, Runnable onDisconnectRunnable)

public OBSActionConnectionTask(Button connectDisconnectButton,

boolean runAsync)

{

this.url = MotherConnection.getUrl();

this.onFailToConnectRunnable = onFailToConnectRunnable;

this.pass = MotherConnection.getPass();

this.onConnectRunnable = onConnectRunnable;

this.connectDisconnectButton = connectDisconnectButton;

this.onDisconnectRunnable = onDisconnectRunnable;

if(runAsync)

{

new Thread(this).start();

}

else

{

call();

}

@Override

protected Void call()

{

try

{

String url = MotherConnection.getUrl();

String pass = MotherConnection.getPass();

setConnectDisconnectButtonDisable(true);

if(!url.startsWith("ws://"))

{

new StreamPiAlert("Invalid URL","Please fix URL and try again", StreamPiAlertType.ERROR).show();

return null;

}

if(pass.isEmpty() || pass.isBlank())

pass = null;

OBSRemoteController obsRemoteController = new OBSRemoteController(url, false, pass);

if(obsRemoteController.isFailed())

{

new StreamPiAlert("Unable to Connect to OBS", "Is it even running? Make sure the websocket plugin is installed. Check Credentials too", StreamPiAlertType.ERROR).show();

}

obsRemoteController.registerConnectionFailedCallback(message->{

setConnectDisconnectButtonText("Connect");

new StreamPiAlert("Unable to Connect", "Unable to establish connection to WebSocket with provided crendentials\n\n"+

"Detailed Error : "+message, StreamPiAlertType.ERROR).show();

MotherConnection.setRemoteController(null);

if(onFailToConnectRunnable != null)

{

onFailToConnectRunnable.run();

onFailToConnectRunnable = null;

}

});

obsRemoteController.registerDisconnectCallback(()->{

setConnectDisconnectButtonText("Connect");

MotherConnection.setRemoteController(null);

if(onDisconnectRunnable != null)

{

onDisconnectRunnable.run();

onDisconnectRunnable = null;

}

});

obsRemoteController.registerConnectCallback(onConnect->{

setConnectDisconnectButtonText("Disconnect");

MotherConnection.setRemoteController(obsRemoteController);

if(onConnectRunnable != null)

{

onConnectRunnable.run();

onConnectRunnable = null;

}

});

}

catch (Exception e)

{

new StreamPiAlert("Unable to Connect", "Unable to establish connection to WebSocket with provided crendentials", StreamPiAlertType.ERROR).show();

MotherConnection.setRemoteController(null);

e.printStackTrace();

}

finally

{

setConnectDisconnectButtonDisable(false);

}

return null;

}

private void setConnectDisconnectButtonText(String text)

{

if(connectDisconnectButton == null)

if(MotherConnection.getConnectDisconnectButton() == null)

return;

Platform.runLater(()-> connectDisconnectButton.setText(text));

Platform.runLater(()-> MotherConnection.getConnectDisconnectButton().setText(text));

}

private void setConnectDisconnectButtonDisable(boolean disable)

{

if(connectDisconnectButton == null)

if(MotherConnection.getConnectDisconnectButton() == null)

return;

Platform.runLater(()-> connectDisconnectButton.setDisable(disable));

Platform.runLater(()-> MotherConnection.getConnectDisconnectButton().setDisable(disable));

}

M obssuite/mother/src/main/java/mother/motherconnection/MotherConnection.java

+26 −4

package mother.motherconnection;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertType;

import com.stream_pi.util.version.Version;

import javafx.scene.control.Button;

import mother.OBSActionConnectionTask;

import net.twasi.obsremotejava.OBSRemoteController;

import net.twasi.obsremotejava.callbacks.Callback;

public class MotherConnection

{

private static OBSRemoteController obsRemoteController = null;

public static final Version VERSION = new Version(2,0,0);

private static String url = null;

private static String pass = null;

private static Button connectDisconnectButton = null;

public static void setConnectDisconnectButton(Button connectDisconnectButton)

{

MotherConnection.connectDisconnectButton = connectDisconnectButton;

}

public static Button getConnectDisconnectButton()

{

return connectDisconnectButton;

}

public static void setUrl(String url) {

MotherConnection.url = url;

}

public static void setPass(String pass) {

MotherConnection.pass = pass;

}

public static String getUrl() {

return url;

}

public static String getPass() {

return pass;

}

public void connect()

public static void connect()

{

connect(true);

connect(true, null, null, null);

}

public void connect(boolean runAsync)

public static void connect(Runnable onConnectRunnable)

{

new OBSActionConnectionTask( null, runAsync);

connect(true, null, onConnectRunnable, null);

}

public static void connect(boolean runAsync, Runnable onFailToConnectRunnable,

Runnable onConnectRunnable, Runnable onDisconnectRunnable)

{

new OBSActionConnectionTask(runAsync, onFailToConnectRunnable,

onConnectRunnable, onDisconnectRunnable);

}

public static OBSRemoteController getRemoteController()

{

return obsRemoteController;

}

public static void setRemoteController(OBSRemoteController obsRemoteController)

{

MotherConnection.obsRemoteController = obsRemoteController;

}

public static Callback getDefaultCallBack(String head, String content)

{

return response ->

{

if(response.getStatus().equals("error"))

{

new StreamPiAlert(head, content, StreamPiAlertType.ERROR).show();

}

};

}

M obssuite/setcurrentprofile/pom.xml

+2 −2

<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0"

xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<groupId>com.stream-pi</groupId>

<artifactId>obssuite_setcurrentprofileaction</artifactId>

<build>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-jar-plugin</artifactId>

<phase>package</phase>

<goals>

</goals>

</execution>

</executions>

</plugin>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-compiler-plugin</artifactId>

</configuration>

</plugin>

</plugins>

</build>

<ActionAPIVersion>1.0.0-SNAPSHOT</ActionAPIVersion>

<UtilVersion>1.0.0-SNAPSHOT</UtilVersion>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.source>11</maven.compiler.source>

<maven.compiler.target>11</maven.compiler.target>

</properties>

<groupId>com.stream-pi</groupId>

<version>${UtilVersion}</version>

</dependency>

<groupId>com.stream-pi</groupId>

<artifactId>action-api</artifactId>

<version>${ActionAPIVersion}</version>

</dependency>

<groupId>com.stream-pi</groupId>

<artifactId>obssuite_motheraction</artifactId>

<version>${OBSSuiteMotherVersion}</version>

</dependency>

</dependencies>

</project>

M obssuite/setcurrentprofile/src/main/java/setcurrentprofile/SetCurrentProfile.java

+59 −30

package setcurrentprofile;

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.NormalAction;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertType;

import com.stream_pi.util.version.Version;

import com.stream_pi.util.exception.MinorException;

import mother.motherconnection.MotherConnection;

import net.twasi.obsremotejava.OBSRemoteController;

public class SetCurrentProfile extends NormalAction

{

public SetCurrentProfile() {

setName("Set Current Profile");

setCategory("OBS");

setVisibilityInServerSettingsPane(false);

setAuthor("rnayabed");

setVersion(new Version(1, 0, 0));

setVersion(MotherConnection.VERSION);

}

@Override

public void initProperties() throws Exception {

public void initProperties() throws Exception

// TODO Auto-generated method stub

{

Property currentProfileProperty = new Property("profile", Type.STRING);

Property currentProfileProperty = new Property("current_profile", Type.STRING);

currentProfileProperty.setDisplayName("Profile Name");

Property autoConnectProperty = new Property("auto_connect", Type.BOOLEAN);

autoConnectProperty.setDefaultValueBoolean(true);

autoConnectProperty.setDisplayName("Auto Connect if not connected");

addClientProperties(currentProfileProperty);

addClientProperties(currentProfileProperty, autoConnectProperty);

}

@Override

public void initAction() throws Exception {

public void onActionClicked() throws Exception

// TODO Auto-generated method stub

{

}

String profile = getClientProperties().getSingleProperty("profile").getStringValue();

@Override

if(profile.isBlank())

public void onActionClicked() throws Exception {

{

// TODO Auto-generated method stub

throw new MinorException("Blank Profile Name","No Profile Name specified");

}

OBSRemoteController controller = MotherConnection.getRemoteController();

if (MotherConnection.getRemoteController() == null)

if (controller == null) {

{

new StreamPiAlert("Is OBS Connected?",

boolean autoConnect = getClientProperties().getSingleProperty(

"It seems there is no connection to OBS, please connect it in Settings", StreamPiAlertType.WARNING)

"auto_connect"

.show();

).getBoolValue();

} else {

controller.setCurrentProfile(getClientProperties().getSingleProperty("current_profile").getStringValue(), MotherConnection.getDefaultCallBack(

if(autoConnect)

"Unable to Set Current Profile","Failed to set current profile"

{

));

MotherConnection.connect(()->setProfile(profile));

}

else

{

new StreamPiAlert("Is OBS Connected?",

"It seems there is no connection to OBS, please connect it in Settings", StreamPiAlertType.WARNING)

.show();

}

else

{

setProfile(profile);

}

@Override

public void setProfile(String profile)

public void onShutDown() throws Exception {

{

// TODO Auto-generated method stub

MotherConnection.getRemoteController().setCurrentProfile(profile, setCurrentProfileResponse -> {

String status = setCurrentProfileResponse.getStatus();

String error = setCurrentProfileResponse.getError();

if(status.equals("error"))

{

String content;

if(error.equals("profile does not exist"))

{

content = "Profile "+profile+" does not exist.";

}

else

{

content = error;

}

new StreamPiAlert("OBS",content, StreamPiAlertType.ERROR).show();

}

});

}

Public

essential-actions

Clone or download

[OBS] - Bumped version to 2.0.0, lots of work on SetCurrentProfile

Modified Files