From 355a2bdcd28a618e36be266abd2dac5dce01f0eb Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 20 Apr 2020 18:58:21 +0200
Subject: [PATCH] base handler has _launcher from event handler

---
 pype/ftrack/lib/ftrack_app_handler.py   | 10 +++-------
 pype/ftrack/lib/ftrack_base_handler.py  | 26 ++++---------------------
 pype/ftrack/lib/ftrack_event_handler.py |  6 ------
 3 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/pype/ftrack/lib/ftrack_app_handler.py b/pype/ftrack/lib/ftrack_app_handler.py
index dcf7729ed7..d626eedd2a 100644
--- a/pype/ftrack/lib/ftrack_app_handler.py
+++ b/pype/ftrack/lib/ftrack_app_handler.py
@@ -117,9 +117,7 @@ class AppAction(BaseAction):
         return True
 
     def _launch(self, event):
-        args = self._translate_event(
-            self.session, event
-        )
+        entities = self._translate_event(event)
 
         preactions_launched = self._handle_preactions(
             self.session, event
@@ -128,12 +126,10 @@ class AppAction(BaseAction):
             return
 
         response = self.launch(
-            self.session, *args
+            self.session, entities, event
         )
 
-        return self._handle_result(
-            self.session, response, *args
-        )
+        return self._handle_result(response)
 
     def launch(self, session, entities, event):
         '''Callback method for the custom action.
diff --git a/pype/ftrack/lib/ftrack_base_handler.py b/pype/ftrack/lib/ftrack_base_handler.py
index f0fd3b7354..07fa35866e 100644
--- a/pype/ftrack/lib/ftrack_base_handler.py
+++ b/pype/ftrack/lib/ftrack_base_handler.py
@@ -267,30 +267,12 @@ class BaseHandler(object):
         )
 
     def _launch(self, event):
-        args = self._translate_event(
-            self.session, event
-        )
+        self.session.rollback()
+        self.session._local_cache.clear()
 
-        preactions_launched = self._handle_preactions(self.session, event)
-        if preactions_launched is False:
-            return
+        self.launch(self.session, event)
 
-        interface = self._interface(
-            self.session, *args
-        )
-
-        if interface:
-            return interface
-
-        response = self.launch(
-            self.session, *args
-        )
-
-        return self._handle_result(
-            self.session, response, *args
-        )
-
-    def launch(self, session, entities, event):
+    def launch(self, session, event):
         '''Callback method for the custom action.
 
         return either a bool ( True if successful or False if the action failed )
diff --git a/pype/ftrack/lib/ftrack_event_handler.py b/pype/ftrack/lib/ftrack_event_handler.py
index 3175075f19..770b942844 100644
--- a/pype/ftrack/lib/ftrack_event_handler.py
+++ b/pype/ftrack/lib/ftrack_event_handler.py
@@ -43,12 +43,6 @@ class BaseEvent(BaseHandler):
             priority=self.priority
         )
 
-    def _launch(self, event):
-        self.session.rollback()
-        self.session._local_cache.clear()
-
-        self.launch(self.session, event)
-
     def _translate_event(self, event, session=None):
         '''Return *event* translated structure to be used with the API.'''
         return self._get_entities(