From: rnayabed <debayansutradhar3@gmail.com>
Date: Sat, 20 Mar 2021 12:09:56 +0530
Subject: Register Actions now creates separate action instances, makes the server more accessible for the action api
---
Register Actions now creates separate action instances, makes the server more accessible for the action api
---


--- 'a/src/main/java/com/stream_pi/server/connection/ClientConnection.java'
+++ b/src/main/java/com/stream_pi/server/connection/ClientConnection.java
@@ -461,25 +461,10 @@ public class ClientConnection extends Th
 
         Location location = new Location(Integer.parseInt(row), Integer.parseInt(col));
 
-
-
-        Action action = new Action(ID, actionType);
-
-        action.setBgColourHex(bgColorHex);
-        action.setCurrentIconState(defaultIconState);
-
-        action.setShowDisplayText(isShowDisplayText);
-        action.setDisplayTextFontColourHex(displayFontColor);
-        action.setDisplayText(displayText);
-        action.setDisplayTextAlignment(displayTextAlignment);
-
-
-        action.setLocation(location);
-
         String root = r[14];
-        action.setParent(root);
 
-        action.setDelayBeforeExecuting(Integer.parseInt(r[15]));
+        int delayBeforeRunning = Integer.parseInt(r[15]);
+
 
         //client properties
 
@@ -498,71 +483,138 @@ public class ClientConnection extends Th
             clientProperties.addProperty(property);
         }
 
-        action.setClientProperties(clientProperties);
-        action.setModuleName(r[4]);
-
         //set up action
 
         //action toBeAdded = null;
 
-        logger.info("Module nAMe : "+r[4]+" __ "+actionType);
+        boolean createBasicAction = false;
 
         if(actionType == ActionType.NORMAL || actionType == ActionType.TOGGLE)
         {
-            ExternalPlugin actionCopy = ExternalPlugins.getInstance().getPluginByModuleName(r[4]);
+            String moduleName = r[4];
+            Version version = new Version(r[3]);
+
+            ExternalPlugin originalAction = ExternalPlugins.getInstance().getPluginByModuleName(moduleName);
 
-            if(actionCopy == null)
+            if(originalAction == null)
             {
-                action.setInvalid(true);
+                createBasicAction = true;
             }
             else
             {
-                action.setVersion(new Version(r[3]));
-
-                //action.setHelpLink(actionCopy.getHelpLink());
-
-                if(actionCopy.getVersion().getMajor() != action.getVersion().getMajor())
+                if(originalAction.getVersion().getMajor() != version.getMajor())
                 {
-                    action.setInvalid(true);
+                    createBasicAction = true;
                 }
                 else
                 {
-                    action.setName(actionCopy.getName());
+                    try
+                    {
+                        ExternalPlugin newPlugin = originalAction.clone();
 
-                    ClientProperties finalClientProperties = new ClientProperties();
+                        newPlugin.setID(ID);
+                        newPlugin.setProfileID(profileID);
+                        newPlugin.setSocketAddressForClient(socket.getRemoteSocketAddress());
 
+                        newPlugin.setBgColourHex(bgColorHex);
+                        newPlugin.setCurrentIconState(defaultIconState);
 
-                    for(Property property : actionCopy.getClientProperties().get())
-                    {
-                        for(int i = 0;i<action.getClientProperties().getSize();i++)
+                        newPlugin.setShowDisplayText(isShowDisplayText);
+                        newPlugin.setDisplayTextFontColourHex(displayFontColor);
+                        newPlugin.setDisplayText(displayText);
+                        newPlugin.setDisplayTextAlignment(displayTextAlignment);
+
+                        newPlugin.setLocation(location);
+
+                        newPlugin.setParent(root);
+
+                        newPlugin.setDelayBeforeExecuting(delayBeforeRunning);
+
+
+                        ClientProperties finalClientProperties = new ClientProperties();
+
+
+                        for(Property property : originalAction.getClientProperties().get())
                         {
-                            Property property1 = action.getClientProperties().get().get(i);
-                            if (property.getName().equals(property1.getName()))
+                            for(int i = 0;i<clientProperties.getSize();i++)
                             {
-                                property.setRawValue(property1.getRawValue());
+                                Property property1 = clientProperties.get().get(i);
+                                if (property.getName().equals(property1.getName()))
+                                {
+                                    property.setRawValue(property1.getRawValue());
 
-                                finalClientProperties.addProperty(property);
+                                    finalClientProperties.addProperty(property);
+                                }
                             }
                         }
-                    }
 
-                    action.setClientProperties(finalClientProperties);
+                        newPlugin.setClientProperties(finalClientProperties);
 
+                        getClient().getProfileByID(profileID).addAction(newPlugin);
+                    }
+                    catch (CloneNotSupportedException e)
+                    {
+                        exceptionAndAlertHandler.handleMinorException(new MinorException("action", "Unable to clone"));
+                    }
                 }
             }
         }
-
-
-        try
+        else
         {
-            getClient().getProfileByID(profileID).addAction(action);
+            createBasicAction = true;
         }
-        catch (CloneNotSupportedException e)
+
+
+        if(createBasicAction)
         {
-            e.printStackTrace();
-            exceptionAndAlertHandler.handleMinorException(new MinorException("action", "Unable to clone"));
+
+            Action action = new Action(ID, actionType);
+
+            action.setID(ID);
+            action.setProfileID(profileID);
+            action.setSocketAddressForClient(socket.getRemoteSocketAddress());
+
+            action.setBgColourHex(bgColorHex);
+            action.setCurrentIconState(defaultIconState);
+
+            action.setShowDisplayText(isShowDisplayText);
+            action.setDisplayTextFontColourHex(displayFontColor);
+            action.setDisplayText(displayText);
+            action.setDisplayTextAlignment(displayTextAlignment);
+
+            action.setLocation(location);
+
+            action.setParent(root);
+
+            action.setDelayBeforeExecuting(delayBeforeRunning);
+
+            if(actionType == ActionType.NORMAL || actionType == ActionType.TOGGLE)
+            {
+                String moduleName = r[4];
+                Version version = new Version(r[3]);
+
+                action.setInvalid(true);
+                action.setVersion(version);
+                action.setModuleName(moduleName);
+            }
+
+
+            action.setClientProperties(clientProperties);
+
+            try
+            {
+                getClient().getProfileByID(profileID).addAction(action);
+            }
+            catch (CloneNotSupportedException e)
+            {
+                e.printStackTrace();
+                exceptionAndAlertHandler.handleMinorException(new MinorException("action", "Unable to clone"));
+            }
+
         }
 
+
+
     }
 
     public void saveActionDetails(String profileID, Action action) throws SevereException