Updated method names

buildbot_transifex/webhook.py

@@ -32,7 +32,7 @@ _EVENT_KEY = 'event'
 
 class TransifexHandler(BaseHookHandler):
 
-    def __init__(self, master, secret, options, transifex_to_github_map):
+    def __init__(self, master, secret, transifex_to_github_map, options=None):
         if not options:
             options = {}
         self.secret = secret
@@ -69,20 +69,16 @@ class TransifexHandler(BaseHookHandler):
             return False
         return True
 
-    def process_translation_completed(self, payload, transifex_to_github_map, event_type, codebase):
+    def process_translation_completed(self, payload, codebase):
         changes = []
-        transifex_response = self._transform_variables(payload, transifex_to_github_map)
+        transifex_response = self._transform_variables(payload['project'], payload['resource'])
         # if 'pybitmessage-test' in transifex_response['project'] and 'messagespot' in transifex_response['resource']:
         #     if 'translation_completed' in transifex_response['event']:
-        language = transifex_response.get['language']
-
         change = {
             'author': "buildbot-transifex", 
-            'resource': transifex_to_github_map["resource"],
+            'resource': transifex_response[resource],
-            'branch': transifex_to_github_map["branch"],
+            'branch': transifex_response["branch"],
-            'project': transifex_to_github_map["project"],
+            'project': transifex_response["project"],
-            'event': event_type,
-            'revision': revision,
             'properties': {
                 "transifex_language": payload.get("language", "None"),
                 "transifex_event": payload.get("event", "None"),
@@ -95,14 +91,16 @@ class TransifexHandler(BaseHookHandler):
         changes.insert(0, change)
         return changes
 
-    def _transform_variables(self, payload, transifex_to_github_map):
+    def _transform_variables(self, transifex_project, transifex_resource):
-        project = payload.get('project', 'None')
+        key = "{}/{}".format(transifex_project, transifex_resource)
-        transform_values = {
+        _map = self.map[key]
-            'resource': transifex_to_github_map["resource"],
+        repository = _map["repository"]
-            'branch': transifex_to_github_map["branch"],
+        project = transifex_project
-            'project': transifex_to_github_map["project"],
+        return {
+            'project': project,
+            'repository': repository,
+            'branch': _map["branch"],
         }
-        return transform_values
 
     @defer.inlineCallbacks
     def getChanges(self, request):
@@ -130,6 +128,7 @@ class TransifexHandler(BaseHookHandler):
                 request.getHeader(_HEADER_SIGNATURE))
             if not self._verifyTransifexSignature(request, content, self.rendered_secret, signature, header_signature):
                 logging.warning("Verify Transifex Signature fail.")
+                return False
             else:
                 logging.warning("Verify Transifex Signature ok")
 
@@ -141,10 +140,13 @@ class TransifexHandler(BaseHookHandler):
             "transifex_project": payload.get("project", "None"),
             "transifex_resource": payload.get("resource", "None")
         }
+        transiform_map = self._transform_variables(payload['project'], payload['resource'])
 
         change["changes"] = {
             "author": "buildbot-transifex",
-            "repository": transifex_to_github_map['repository'],
+            "repository": transiform_map['repository'],
+            "project": transiform_map['project'],
+            "branch": transiform_map["branch"]
         }
 
         log.msg("Received event '{}' from transifex".format(event_type))