Skip to content

Commit 99af5b3

Browse files
authored
Formatting.
1 parent f78df4a commit 99af5b3

File tree

2 files changed

+26
-28
lines changed

2 files changed

+26
-28
lines changed

s3direct/utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
['token', 'secret_key', 'access_key'])
1919
SESSION = None
2020
if session is not None:
21-
SESSION=session.get_session()
21+
SESSION = session.get_session()
22+
2223

2324
def get_s3direct_destinations():
2425
"""Returns s3direct destinations.

src/index.js

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const request = (method, url, data, headers, el, cb) => {
1010
let req = new XMLHttpRequest();
1111
req.open(method, url, true);
1212

13-
Object.keys(headers).forEach(key => {
13+
Object.keys(headers).forEach((key) => {
1414
req.setRequestHeader(key, headers[key]);
1515
});
1616

@@ -26,11 +26,11 @@ const request = (method, url, data, headers, el, cb) => {
2626
req.send(data);
2727
};
2828

29-
const parseNameFromUrl = url => {
29+
const parseNameFromUrl = (url) => {
3030
return decodeURIComponent((url + '').replace(/\+/g, '%20'));
3131
};
3232

33-
const parseJson = json => {
33+
const parseJson = (json) => {
3434
let data;
3535
try {
3636
data = JSON.parse(json);
@@ -53,7 +53,7 @@ const error = (el, msg) => {
5353

5454
let concurrentUploads = 0;
5555

56-
const disableSubmit = status => {
56+
const disableSubmit = (status) => {
5757
const submitRow = document.querySelector('.submit-row');
5858
if (!submitRow) return;
5959

@@ -64,7 +64,7 @@ const disableSubmit = status => {
6464
if (status === true) concurrentUploads++;
6565
else concurrentUploads--;
6666

67-
[].forEach.call(buttons, el => {
67+
[].forEach.call(buttons, (el) => {
6868
el.disabled = concurrentUploads !== 0;
6969
});
7070
};
@@ -74,25 +74,21 @@ const finishUpload = (element, endpoint, bucket, objectKey) => {
7474
const url = element.querySelector('.file-url');
7575
url.value = endpoint + '/' + bucket + '/' + objectKey;
7676
link.setAttribute('href', url.value);
77-
link.innerHTML = parseNameFromUrl(url.value)
78-
.split('/')
79-
.pop();
77+
link.innerHTML = parseNameFromUrl(url.value).split('/').pop();
8078
element.className = 's3direct link-active';
8179
element.querySelector('.bar').style.width = '0%';
8280
disableSubmit(false);
8381
};
8482

85-
const computeMd5 = data => {
83+
const computeMd5 = (data) => {
8684
return btoa(SparkMD5.ArrayBuffer.hash(data, true));
8785
};
8886

89-
const computeSha256 = data => {
90-
return createHash('sha256')
91-
.update(data, 'utf-8')
92-
.digest('hex');
87+
const computeSha256 = (data) => {
88+
return createHash('sha256').update(data, 'utf-8').digest('hex');
9389
};
9490

95-
const getCsrfToken = element => {
91+
const getCsrfToken = (element) => {
9692
const cookieInput = element.querySelector('.csrf-cookie-name');
9793
const input = document.querySelector('input[name=csrfmiddlewaretoken]');
9894
const token = input ? input.value : Cookies.get(cookieInput.value);
@@ -109,7 +105,7 @@ const generateAmzInitHeaders = (acl, serverSideEncryption, sessionToken) => {
109105
return headers;
110106
};
111107

112-
const generateAmzCommonHeaders = sessionToken => {
108+
const generateAmzCommonHeaders = (sessionToken) => {
113109
const headers = {};
114110
if (sessionToken) headers['x-amz-security-token'] = sessionToken;
115111
return headers;
@@ -162,7 +158,7 @@ const initiateUpload = (element, signingUrl, uploadParameters, file, dest) => {
162158
partSize: 20 * 1024 * 1024,
163159
logging: true,
164160
allowS3ExistenceOptimization: uploadParameters.allow_existence_optimization,
165-
s3FileCacheHoursAgo: uploadParameters.allow_existence_optimization ? 12 : 0
161+
s3FileCacheHoursAgo: uploadParameters.allow_existence_optimization ? 12 : 0,
166162
};
167163

168164
const addConfig = {
@@ -182,7 +178,7 @@ const initiateUpload = (element, signingUrl, uploadParameters, file, dest) => {
182178
if (msg.includes('InvalidAccessKeyId')) {
183179
error(element, msg);
184180
}
185-
}
181+
},
186182
};
187183

188184
const optHeaders = {};
@@ -197,22 +193,22 @@ const initiateUpload = (element, signingUrl, uploadParameters, file, dest) => {
197193

198194
addConfig['notSignedHeadersAtInitiate'] = optHeaders;
199195

200-
Evaporate.create(createConfig).then(evaporate => {
196+
Evaporate.create(createConfig).then((evaporate) => {
201197
disableSubmit(true);
202198

203199
element.className = 's3direct progress-active';
204200

205201
const cancelButton = element.querySelector('.cancel-button');
206202

207-
const cancelUpload = e => {
203+
const cancelUpload = (e) => {
208204
e.preventDefault();
209205
evaporate.cancel(`${uploadParameters.bucket}/${addConfig.name}`);
210206
};
211207

212208
cancelButton.addEventListener('click', cancelUpload, false);
213209

214210
evaporate.add(addConfig).then(
215-
s3Objkey => {
211+
(s3Objkey) => {
216212
cancelButton.removeEventListener('click', cancelUpload);
217213
finishUpload(
218214
element,
@@ -221,15 +217,15 @@ const initiateUpload = (element, signingUrl, uploadParameters, file, dest) => {
221217
s3Objkey
222218
);
223219
},
224-
reason => {
220+
(reason) => {
225221
cancelButton.removeEventListener('click', cancelUpload);
226222
return error(element, reason);
227223
}
228224
);
229225
});
230226
};
231227

232-
const checkFileAndInitiateUpload = event => {
228+
const checkFileAndInitiateUpload = (event) => {
233229
const element = event.target.parentElement;
234230
const file = element.querySelector('.file-input').files[0];
235231
const dest = element.querySelector('.file-dest').value;
@@ -260,15 +256,15 @@ const checkFileAndInitiateUpload = event => {
260256
});
261257
};
262258

263-
const removeUpload = e => {
259+
const removeUpload = (e) => {
264260
e.preventDefault();
265261
const el = e.target.parentElement;
266262
el.querySelector('.file-url').value = '';
267263
el.querySelector('.file-input').value = '';
268264
el.className = 's3direct form-active';
269265
};
270266

271-
const addHandlers = el => {
267+
const addHandlers = (el) => {
272268
const url = el.querySelector('.file-url');
273269
const input = el.querySelector('.file-input');
274270
const remove = el.querySelector('.file-remove');
@@ -279,7 +275,8 @@ const addHandlers = el => {
279275
input.addEventListener('change', checkFileAndInitiateUpload, false);
280276
};
281277

282-
const observer = new MutationObserver(function (m) {[].forEach.call(document.querySelectorAll('.s3direct'), addHandlers);});
283-
const observer_config = {childList: true, subtree: true};
278+
const observer = new MutationObserver(function (m) {
279+
[].forEach.call(document.querySelectorAll('.s3direct'), addHandlers);
280+
});
281+
const observer_config = { childList: true, subtree: true };
284282
observer.observe(document.body, observer_config);
285-

0 commit comments

Comments
 (0)