Commit graph

98 commits

Author SHA1 Message Date
Artur Paikin
769de0242a
Merge branch 'master' into fix/progress-for-removed 2018-02-19 12:30:58 -05:00
Renée Kooi
ce0aa68223
Merge pull request #546 from transloadit/doc/tl-feedback
Improve Transloadit plugin docs
2018-02-19 09:49:29 +01:00
Artur Paikin
d837e7c5f1
Merge branch 'master' into feature/tl-autotus 2018-02-17 22:12:24 -05:00
Artur Paikin
8698cfeec4 Check wether file excists in onFileUploadComplete, add removeFileFromPluginState but don’t use yet 2018-02-17 16:45:57 -05:00
Renée Kooi
608b277386
transloadit: Add service option. 2018-02-12 15:01:21 +01:00
Renée Kooi
b510b62742
transloadit: Emit upload-error when preprocess fails. 2018-02-12 14:56:45 +01:00
Renée Kooi
5fe50de249
transloadit: Embed tus plugin.
When `importFromUploadURLs` is not set, add the `Tus` plugin with the
right configuration. This means that the `Tus` plugin is still included
in bundles when `importFromUploadURLs` is used; not ideal! Usability
wins are big here though.

Documentation updates will be in #546 to avoid tricky merge conflicts.
2018-02-12 14:23:58 +01:00
Artur Paikin
08505b71c2
Merge pull request #593 from transloadit/feature/tl-global-meta
transloadit: Easily pass form fields
2018-02-10 12:00:59 -05:00
Renée Kooi
43a1aae5f4
transloadit: Accept array of meta field names in fields parameter. 2018-02-08 21:44:41 +01:00
Ifedapo Olarewaju
98d4d68bc0 fix: slice not splice 2018-02-08 12:29:41 +01:00
Ifedapo Olarewaju
4ff1898465 fix: avoid double slash cc @kvz 2018-02-08 11:52:46 +01:00
Kevin van Zonneveld
99032b285e
[WIP] Set Transloadit uppy-server host based on Assembly status (#598)
* Maybe(?) set transloadit uppy-server location based on assembly status

* hack: replace uppy server url in transloadit assmebly cc @kvz
2018-02-08 11:07:50 +01:00
Renée Kooi
955f63e30d
transloadit: Pass fields: true to add global metadata as fields. 2018-02-05 13:03:09 +01:00
Renée Kooi
efd03d96bb
Revert "transloadit: Add global metadata as fields"
This reverts commit 98cca8f98d.
2018-02-05 13:02:45 +01:00
Renée Kooi
98cca8f98d
transloadit: Add global metadata as fields 2018-02-05 11:51:59 +01:00
Artur Paikin
0b4db1f756
Merge pull request #527 from transloadit/feature/result-values
core: Allow plugins to add data to result object
2018-01-26 15:20:44 -05:00
Renée Kooi
6033a5a118
transloadit: Add assembly-executing event 2018-01-22 14:41:44 +01:00
Renée Kooi
a169c2ed52
Add addResultData() instead of returning result data from upload hooks 2018-01-22 10:06:00 +01:00
Renée Kooi
a298589631
transloadit: Also resolve with assembly statuses when waitForEncoding: false 2018-01-21 18:08:41 +01:00
Renée Kooi
3a5463cac9
core: Allow plugins to add data to result object
Plugins can resolve a Promise returned from an uploader hook with an
object, and it will be merged into the `{ successful, failed }` result.

This patch also updates the Transloadit plugin to add a `transloadit`
key to the result object, containing an array of completed assemblies.
2018-01-21 18:08:41 +01:00
Renée Kooi
3177ad415e
transloadit: Fix log calls 2017-12-18 10:44:50 +01:00
Renée Kooi
a86ce3e074
transloadit: Fix associating non-tus uploaded files with local files. 2017-12-18 10:44:50 +01:00
Renée Kooi
3d6ecae65f
transloadit: Consistent naming for assemblies state key 2017-12-18 10:44:50 +01:00
Renée Kooi
e81101aab4
transloadit: Move default getAssemblyOptions up, makes default options a bit more readable 2017-12-18 10:44:49 +01:00
Renée Kooi
82a66f443d
tl: Remove debug log 2017-12-18 10:44:49 +01:00
Renée Kooi
99080300df
transloadit: Move assembly status diffing to a separate method 2017-12-18 10:44:49 +01:00
Renée Kooi
87baeab224
transloadit: Make missed events sequencing less hacky (slightly) 2017-12-18 10:44:49 +01:00
Renée Kooi
c1075daa44
transloadit: Do not run restore code if there were no assemblies. 2017-12-18 10:44:49 +01:00
Renée Kooi
3d267046e7
transloadit: Save uploadsAssemblies map for restoring. 2017-12-18 10:44:34 +01:00
Renée Kooi
dfa1bf6797
transloadit: Fix finding correct file for a tus upload URL when upload has not completed. 2017-12-18 10:44:34 +01:00
Renée Kooi
efc248c93f
transloadit: Fix restore attempt crash when there were no uploads or assemblies yet 2017-12-18 10:44:34 +01:00
Renée Kooi
2e52d27717
transloadit: Use this.core.log 2017-12-18 10:44:34 +01:00
Renée Kooi
4e3a642756
transloadit: Emit transloadit:complete correctly after restore with waitForMetadata. 2017-12-18 10:44:34 +01:00
Renée Kooi
d7e3e0d9ee
transloadit: Emit file upload error if assembly fails. 2017-12-18 10:44:33 +01:00
Renée Kooi
4aa450db7c
transloadit: Fix transloadit:complete being emitted twice when waitForMetadata: true 2017-12-18 10:44:33 +01:00
Renée Kooi
d5a6b0fe3c
transloadit: Emit missed events on restore.
Diffs assembly status to find new `uploads` and `results`, and emits
`transloadit:upload` and `transloadit:result` events accordingly.
Also emits `transloadit:complete` for newly finished assemblies
and `transloadit:assembly-error` for assemblies that failed.

This feature needs to store some custom data with the RestoreFiles
plugin. It does this by adding a `restore:get-data` event that gets a
callback as a parameter. This callback stores custom plugin data. It's
not great but idk.

    core.on('restore:get-data', (setData) => {
      setData({ whatever: 'beepboop' })
    })
2017-12-18 10:44:33 +01:00
Renée Kooi
452a9a5a0e
transloadit: load assembly statuses on restore 2017-12-18 10:44:33 +01:00
Artur Paikin
ed9aa1a537 🚨this.core to this.uppy everywhere
danger again
2017-12-08 17:34:33 -05:00
Artur Paikin
6f510f4679
Merge branch 'master' into chore/refactors 2017-12-07 17:03:55 -05:00
Artur Paikin
526b506e31 🚨🚨🚨 Remove core: prefix from all events 🚨🚨🚨
Danger! Danger!

`core:upload-progress` becomes `upload-progress` and so on.

Oh my, here goes.
2017-12-07 16:57:24 -05:00
Renée Kooi
822dcd0903
transloadit: Remove TODO comment 2017-12-04 12:36:26 +01:00
Artur Paikin
1bd1e410d9 move plugins/Plugin.js to core/Plugin.js
to better separate concerns and later split into packages
2017-11-27 22:03:38 -05:00
Renée Kooi
4682f59fc6
xhrupload,tus,transloadit: Ignore errored files. 2017-11-10 16:55:57 +01:00
Renée Kooi
a916983068
transloadit: Do not reject the entire upload() when a single assembly fails 2017-11-10 16:55:57 +01:00
Renée Kooi
0be93a5e7a
transloadit: Configure resume: false for the Tus plugin. 2017-11-03 13:47:57 +01:00
Renée Kooi
8d9a1fa03d Merge pull request #390 from transloadit/full-retry
Restart the entire upload on retry, fixes #387.
2017-10-18 09:55:28 +02:00
Renée Kooi
e69d8f72a8
transloadit: Emit file upload error if assembly fails. 2017-10-17 12:21:50 +02:00
Renée Kooi
ada6b14dc1
Reuse upload URL by default for tus, reset it for each new :tl: assembly. 2017-10-17 12:08:52 +02:00
Renée Kooi
0ba8b84d37
transloadit: Use Translator for language strings 2017-10-09 14:57:57 +02:00
Renée Kooi
2ec1696455
plugins: add get/setPluginState methods 2017-09-26 17:10:47 +02:00