Skip to content

Feat/selective file download #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LucsT wants to merge 1 commit into from
Closed

Feat/selective file download #670

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions src/libs/Launcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Minilog from '@cozy/minilog'
import set from 'lodash/set'

import { Q, models } from 'cozy-client'
import { saveFiles, saveBills, saveIdentity } from 'cozy-clisk'
import { getFileIfExists, saveFiles, saveBills, saveIdentity } from 'cozy-clisk'

import { ensureKonnectorFolder } from './folder'
import { saveCredential, getCredential, removeCredential } from './keychain'
Expand Down Expand Up @@ -341,9 +341,23 @@ export default class Launcher {
konnector
} = this.getStartContext() || {}
const { sourceAccountIdentifier } = this.getUserData() || {}
// @ts-ignore
options.sourceAccountIdentifier = sourceAccountIdentifier
// @ts-ignore
const folderPath = await this.getFolderPath(trigger.message?.folder_to_save)
for (const entry of entries) {
// TODO Filter existing entries
if (entry.fileurl) {
const file = await getFileIfExists({
client,
entry,
options,
folderPath,
slug: konnector.slug
})
if (file) {
log.debug('File found')
entry.fileDocument = file
}
if (!file && entry.fileurl) {
// @ts-ignore
entry.dataUri = await this.worker.call('downloadFileInWorker', entry)
delete entry.fileurl
Expand All @@ -352,6 +366,7 @@ export default class Launcher {
entry.filestream = dataURItoArrayBuffer(entry.dataUri).arrayBuffer
delete entry.dataUri
}
// TODO ADD QUALIFICATION WHEN NOT DOWNLOADING
// Adding qualification here because of the need of models
if (options.qualificationLabel) {
set(
Expand All @@ -362,21 +377,13 @@ export default class Launcher {
}
}
log.debug(entries, 'saveFiles entries')
const result = await saveFiles(
client,
entries,
const result = await saveFiles(client, entries, folderPath, {
...options,
manifest: konnector,
// @ts-ignore
await this.getFolderPath(trigger.message?.folder_to_save),
{
...options,
manifest: konnector,
// @ts-ignore
sourceAccount: job.message.account,
sourceAccountIdentifier
}
)
log.debug(result, 'saveFiles result')

sourceAccount: job.message.account
})
log.info(result, 'saveFiles result')
return result
}

Expand Down Expand Up @@ -494,4 +501,5 @@ export default class Launcher {
* @property {String} [dataUri]
* @property {ArrayBuffer} [filestream]
* @property {String} [fileurl]
* @property {any} [fileDocument]
*/