merged where i run actions into one

openpype/modules/ftrack/event_handlers_user/action_where_run_ask.py

@@ -1,33 +1,98 @@
+import platform
+import socket
+import getpass
+
 from openpype.modules.ftrack.lib import BaseAction, statics_icon
 
 
-class ActionAskWhereIRun(BaseAction):
-    """ Sometimes user forget where pipeline with his credentials is running.
-    - this action triggers `ActionShowWhereIRun`
-    """
-    ignore_me = True
-    identifier = 'ask.where.i.run'
-    label = 'Ask where I run'
-    description = 'Triggers PC info where user have running OpenPype'
-    icon = statics_icon("ftrack", "action_icons", "ActionAskWhereIRun.svg")
+class ActionWhereIRun(BaseAction):
+    """Show where same user has running OpenPype instances."""
 
-    def discover(self, session, entities, event):
-        """ Hide by default - Should be enabled only if you want to run.
-        - best practise is to create another action that triggers this one
-        """
+    identifier = "ask.where.i.run"
+    show_identifier = "show.where.i.run"
+    label = "OpenPype Admin"
+    variant = "- Where I run"
+    description = "Show PC info where user have running OpenPype"
 
-        return True
+    def _discover(self, _event):
+        return {
+            "items": [{
+                "label": self.label,
+                "variant": self.variant,
+                "description": self.description,
+                "actionIdentifier": self.discover_identifier,
+                "icon": self.icon,
+            }]
+        }
 
-    def launch(self, session, entities, event):
-        more_data = {"event_hub_id": session.event_hub.id}
-        self.trigger_action(
-            "show.where.i.run", event, additional_event_data=more_data
+    def _launch(self, event):
+        self.trigger_action(self.show_identifier, event)
+
+    def register(self):
+        # Register default action callbacks
+        super(ActionWhereIRun, self).register()
+
+        # Add show identifier
+        show_subscription = (
+            "topic=ftrack.action.launch"
+            " and data.actionIdentifier={}"
+            " and source.user.username={}"
+        ).format(
+            self.show_identifier,
+            self.session.api_user
+        )
+        self.session.event_hub.subscribe(
+            show_subscription,
+            self._show_info
         )
 
-        return True
+    def _show_info(self, event):
+        title = "Where Do I Run?"
+        msgs = {}
+        all_keys = ["Hostname", "IP", "Username", "System name", "PC name"]
+        try:
+            host_name = socket.gethostname()
+            msgs["Hostname"] = host_name
+            host_ip = socket.gethostbyname(host_name)
+            msgs["IP"] = host_ip
+        except Exception:
+            pass
+
+        try:
+            system_name, pc_name, *_ = platform.uname()
+            msgs["System name"] = system_name
+            msgs["PC name"] = pc_name
+        except Exception:
+            pass
+
+        try:
+            msgs["Username"] = getpass.getuser()
+        except Exception:
+            pass
+
+        for key in all_keys:
+            if not msgs.get(key):
+                msgs[key] = "-Undefined-"
+
+        items = []
+        first = True
+        separator = {"type": "label", "value": "---"}
+        for key, value in msgs.items():
+            if first:
+                first = False
+            else:
+                items.append(separator)
+            self.log.debug("{}: {}".format(key, value))
+
+            subtitle = {"type": "label", "value": "<h3>{}</h3>".format(key)}
+            items.append(subtitle)
+            message = {"type": "label", "value": "<p>{}</p>".format(value)}
+            items.append(message)
+
+        self.show_interface(items, title, event=event)
 
 
 def register(session):
     '''Register plugin. Called when used as an plugin.'''
 
-    ActionAskWhereIRun(session).register()
+    ActionWhereIRun(session).register()

openpype/modules/ftrack/event_handlers_user/action_where_run_show.py

@@ -1,86 +0,0 @@
-import platform
-import socket
-import getpass
-from openpype.modules.ftrack.lib import BaseAction
-
-
-class ActionShowWhereIRun(BaseAction):
-    """ Sometimes user forget where pipeline with his credentials is running.
-    - this action shows on which PC, Username and IP is running
-    - requirement action MUST be registered where we want to locate the PC:
-    - - can't be used retrospectively...
-    """
-    #: Action identifier.
-    identifier = 'show.where.i.run'
-    #: Action label.
-    label = 'Show where I run'
-    #: Action description.
-    description = 'Shows PC info where user have running OpenPype'
-
-    def discover(self, session, entities, event):
-        """ Hide by default - Should be enabled only if you want to run.
-        - best practise is to create another action that triggers this one
-        """
-
-        return False
-
-    @property
-    def launch_identifier(self):
-        return self.identifier
-
-    def launch(self, session, entities, event):
-        # Don't show info when was launch from this session
-        if session.event_hub.id == event.get("data", {}).get("event_hub_id"):
-            return True
-
-        title = "Where Do I Run?"
-        msgs = {}
-        all_keys = ["Hostname", "IP", "Username", "System name", "PC name"]
-        try:
-            host_name = socket.gethostname()
-            msgs["Hostname"] = host_name
-            host_ip = socket.gethostbyname(host_name)
-            msgs["IP"] = host_ip
-        except Exception:
-            pass
-
-        try:
-            system_name, pc_name, *_ = platform.uname()
-            msgs["System name"] = system_name
-            msgs["PC name"] = pc_name
-        except Exception:
-            pass
-
-        try:
-            msgs["Username"] = getpass.getuser()
-        except Exception:
-            pass
-
-        for key in all_keys:
-            if not msgs.get(key):
-                msgs[key] = "-Undefined-"
-
-        items = []
-        first = True
-        splitter = {'type': 'label', 'value': '---'}
-        for key, value in msgs.items():
-            if first:
-                first = False
-            else:
-                items.append(splitter)
-            self.log.debug("{}: {}".format(key, value))
-
-            subtitle = {'type': 'label', 'value': '<h3>{}</h3>'.format(key)}
-            items.append(subtitle)
-            message = {'type': 'label', 'value': '<p>{}</p>'.format(value)}
-            items.append(message)
-
-        self.show_interface(items, title, event=event)
-
-        return True
-
-
-def register(session):
-    '''Register plugin. Called when used as an plugin.'''
-
-    ActionShowWhereIRun(session).register()