Issue 5777 - Update crowdin interface

localeTools.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import re
 import os
 import sys
 import codecs
 import json
 import urlparse
 import urllib
 import urllib2
+import mimetypes
 from StringIO import StringIO
 from ConfigParser import SafeConfigParser
 from zipfile import ZipFile
 from xml.parsers.expat import ParserCreate, XML_PARAM_ENTITY_PARSING_ALWAYS
 
 langMappingGecko = {
     'bn-BD': 'bn',
     'br': 'br-FR',
     'dsb': 'dsb-DE',
     'fj-FJ': 'fj',
@@ skipping 63 matching lines @@
     'ta',
     'te',
     'th',
     'tr',
     'uk',
     'vi',
     'zh-CN',
     'zh-TW',
 ]
 
-CROWDIN_AP_URL = 'https://api.crowdin.com/api/project/{}/{}'
-
-
-def crowdin_url(project_name, action, key, get={}):
-    """Create a valid url for a crowdin endpoint."""
-    url = CROWDIN_AP_URL.format(project_name, action)
-    get['key'] = key
-    get['json'] = 1
-
-    scheme, netloc, path, params, query, fragment = urlparse.urlparse(url)
-
-    query = dict(urlparse.parse_qsl(query))

[Vasily Kuznetsov, 2017/09/28 14:35:00]

Sorry that I'm only mentioning this now, but is there any reason to use
`dict(urlparse.parse_qsl(query))` instead of `urlparse.parse_qs(query)`? It
seems that there would only be a difference in cases with multiple values for
the same query parameter and arguably `parse_qs` behaves better in such case (it
doesn't discard all values except for the last, but makes lists of values
instead).

[tlucas, 2017/09/28 15:53:41]

You are right - Done.

-    query.update(get)
-
-    return urlparse.urlunparse((
-        scheme, netloc, path, params, urllib.urlencode(query), fragment
-    ))
+CROWDIN_AP_URL = 'https://api.crowdin.com/api/project'
 
 
 def crowdin_request(project_name, action, key, get={}, post_data=None,
                     headers={}, raw=False):
     """Perform a call to crowdin and raise an Exception on failure."""
     request = urllib2.Request(
-        crowdin_url(project_name, action, key, get),
+        '{}/{}/{}?{}'.format(CROWDIN_AP_URL,
+                             urllib.quote(project_name),
+                             urllib.quote(action),
+                             urllib.urlencode(dict(get, key=key, json=1))),
         post_data,
         headers,
     )
 
     try:
         result = urllib2.urlopen(request).read()
     except urllib2.HTTPError as e:
         raise Exception('Server returned HTTP Error {}:\n{}'.format(e.code,
                                                                     e.read()))
 
@@ skipping 214 matching lines @@
     if not allowed.issuperset(locales):
         print "Warning, following locales aren't allowed by server: " + ', '.join(locales - allowed)
 
     locales = list(locales & allowed)
     locales.sort()
     params = urllib.urlencode([('languages[]', locale) for locale in locales])
 
     crowdin_request(projectName, 'edit-project', key, post_data=params)
 
 
-def crowdin_body_headers(files):

[Vasily Kuznetsov, 2017/09/28 14:35:00]

This function name is a bit unclear, probably `crowdin_body_and_headers` would
be better. Or even better and more "in the language of the domain" we could call
it something like `crowdin_prepare_upload`.

[tlucas, 2017/09/28 15:53:40]

Fair enough - Done.

-    """Create a post body and according headers, which Crowdin can handle."""

[Vasily Kuznetsov, 2017/09/28 14:35:00]

I think "matching" instead of "according" would be better here.

[tlucas, 2017/09/28 15:53:40]

Done.

+def crowdin_prepare_upload(files):
+    """Create a post body and matching headers, which Crowdin can handle."""
     boundary = '----------ThIs_Is_tHe_bouNdaRY_$'
     body = ''
-    for file, data in files:
-        body += '--%s\r\n' % boundary
-        body += 'Content-Disposition: form-data; name="files[%s]"; filename="%s"\r\n' % (file, file)
-        body += 'Content-Type: application/octet-stream\r\n'
-        body += 'Content-Transfer-Encoding: binary\r\n'
-        body += '\r\n' + data + '\r\n'
-    body += '--%s--\r\n' % boundary
+    for name, data in files:
+        mimetype = mimetypes.guess_type(name)[0]
+        body += (
+            '--{boundary}\r\n'
+            'Content-Disposition: form-data; name="files[{name}]"; '
+            'filename="{name}"\r\n'
+            'Content-Type: {mimetype}; charset=utf-8\r\n'
+            'Content-Transfer-Encoding: binary\r\n'
+            '\r\n{data}\r\n'
+            '--{boundary}--\r\n'
+        ).format(boundary=boundary, name=name, data=data, mimetype=mimetype)
 
     body = body.encode('utf-8')
     return (
         StringIO(body),
         {
-            'Content-Type': ('multipart/form-data; ; charset=utf-8; '
-                             'boundary=' + boundary),
+            'Content-Type': ('multipart/form-data; boundary=' + boundary),
             'Content-Length': len(body)
-        }
+        },
     )
 
 
 def updateTranslationMaster(localeConfig, metadata, dir, projectName, key):
     result = crowdin_request(projectName, 'info', key)
 
     existing = set(map(lambda f: f['name'], result['files']))
     add = []
     update = []
     for file in os.listdir(dir):
@@ skipping 12 matching lines @@
                 newName = file + '.json'
 
             if data:
                 if newName in existing:
                     update.append((newName, data))
                     existing.remove(newName)
                 else:
                     add.append((newName, data))
 
     if len(add):
-        data = {'titles[{}]'.format(name): re.sub(r'\.json', '', name)
-                for name, data in add}
-        data['type'] = 'chrome'
-        data, headers = crowdin_body_headers(add)
-        crowdin_request(projectName, 'add-file', key, post_data=data,
+        query = {'titles[{}]'.format(name): os.path.splitext(name)[0]
+                 for name, _ in add}
+        query['type'] = 'chrome'
+        data, headers = crowdin_prepare_upload(add)
+        crowdin_request(projectName, 'add-file', key, query, post_data=data,
                         headers=headers)
     if len(update):
-        data, headers = crowdin_body_headers(update)
+        data, headers = crowdin_prepare_upload(update)
         crowdin_request(projectName, 'update-file', key, post_data=data,
                         headers=headers)
     for file in existing:
         crowdin_request(projectName, 'delete-file', key, {'file': file})
 
 
 def uploadTranslations(localeConfig, metadata, dir, locale, projectName, key):
     files = []
     for file in os.listdir(dir):
         path = os.path.join(dir, file)
         if os.path.isfile(path):
             if localeConfig['file_format'] == 'chrome-json' and file.endswith('.json'):
                 data = preprocessChromeLocale(path, metadata, False)
                 newName = file
             elif localeConfig['file_format'] == 'chrome-json':
                 fileHandle = codecs.open(path, 'rb', encoding='utf-8')
                 data = json.dumps({file: {'message': fileHandle.read()}})
                 fileHandle.close()
                 newName = file + '.json'
             else:
                 data = toJSON(path)
                 newName = file + '.json'
 
             if data:
                 files.append((newName, data))
     if len(files):
         language = mapLocale(localeConfig['name_format'], locale)
-        data, headers = crowdin_body_headers(files)
+        data, headers = crowdin_prepare_upload(files)
         crowdin_request(projectName, 'upload-translation', key,
                         {'language': language}, post_data=data,
                         headers=headers)
 
 
 def getTranslations(localeConfig, projectName, key):
     """Download all available translations from crowdin.
 
     Trigger crowdin to build the available export, wait for crowdin to
     finish the job and download the generated zip afterwards.
@@ skipping 61 matching lines @@
 
     # Remove any extra files
     for dir, files in dirs.iteritems():
         baseDir = os.path.join(localeConfig['base_path'], dir)
         if not os.path.exists(baseDir):
             continue
         for file in os.listdir(baseDir):
             path = os.path.join(baseDir, file)
             if os.path.isfile(path) and (file.endswith('.json') or file.endswith('.properties') or file.endswith('.dtd')) and not file in files:
                 os.remove(path)