-
Notifications
You must be signed in to change notification settings - Fork 2
Add downloading of changed element file and changed element property in get changeset links #333
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.
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
Draft
Draighneys
wants to merge
2
commits into
main
Choose a base branch
from
add-changed-element-download-link
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ import { | |
|
|
||
| import { | ||
| DownloadProgressParam, | ||
| DownloadedChangedElements, | ||
| DownloadedChangeset, | ||
| GenericAbortSignal, | ||
| RetryParams, | ||
|
|
@@ -31,6 +32,7 @@ import { | |
| CreateChangesetParams, | ||
| DownloadChangesetListParams, | ||
| DownloadSingleChangesetParams, | ||
| DownloadChangedElementsFileParams, | ||
| } from "./ChangesetOperationParams"; | ||
| import { LimitedParallelQueue } from "./LimitedParallelQueue"; | ||
|
|
||
|
|
@@ -127,6 +129,24 @@ export class ChangesetOperations< | |
| return this.downloadChangeset({ ...params, changeset }); | ||
| } | ||
|
|
||
| /** | ||
| * Downloads a changed elements file from a changeset identified by either index or id. If the file does not exist | ||
| * in the changeset, an error is thrown. This operation does not retry the download on failure and does not check if the | ||
| * file already exists in the target directory. | ||
| * @param {DownloadSingleChangesetParams} params parameters for this operation. See {@link DownloadSingleChangesetParams}. | ||
| * @returns downloaded changed element. See {@link DownloadedChangedElements}. | ||
| */ | ||
| public async downloadChangedElements( | ||
| params: DownloadChangedElementsFileParams | ||
| ): Promise<DownloadedChangedElements> { | ||
| await this._options.localFileSystem.createDirectory( | ||
| params.targetDirectoryPath | ||
| ); | ||
|
|
||
| const changeset: Changeset = await this.querySingleInternal(params); | ||
| return this.downloadChangedElementsFile({ ...params, changeset }); | ||
| } | ||
|
|
||
| /** | ||
| * Downloads Changeset list. Internally the method uses {@link ChangesetOperations.getRepresentationList} to query the | ||
| * Changeset collection so this operation supports most of the the same url parameters to specify what Changesets to | ||
|
|
@@ -214,6 +234,47 @@ export class ChangesetOperations< | |
| }; | ||
| } | ||
|
|
||
| private async downloadChangedElementsFile( | ||
| params: IModelScopedOperationParams & | ||
| DownloadChangedElementsFileParams & { changeset: Changeset } | ||
| ): Promise<DownloadedChangedElements> { | ||
| const changedElementsWithPath: DownloadedChangedElements = { | ||
| ...params.changeset, | ||
| filePath: path.join( | ||
| params.targetDirectoryPath, | ||
| this.createChangedElementsFileName(params.changeset.id) | ||
| ), | ||
| }; | ||
|
|
||
| let loggedError: Error | undefined; | ||
| try { | ||
|
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do we want to delete the file if it exists
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If we won't have retry then I would say yes, because existing file may be incomplete. |
||
| const downloadLink = params.changeset._links.download; | ||
| assertLink(downloadLink); | ||
| await downloadFile({ | ||
| storage: this._options.cloudStorage, | ||
| localPath: params.targetDirectoryPath, | ||
| abortSignal: params.abortSignal, | ||
| url: downloadLink.href, | ||
| storageType: downloadLink.storageType, | ||
| }); | ||
| return changedElementsWithPath; | ||
| } catch (error) { | ||
| this.throwIfAbortError(error, params.changeset, params.abortSignal); | ||
| if (error instanceof Error) loggedError = error; | ||
| throw new IModelsErrorImpl({ | ||
| code: IModelsErrorCode.ChangedElementsDownloadFailed, | ||
| message: `Failed to download changedElements File. Changeset id: ${ | ||
| params.changeset.id | ||
| }, changeset index: ${params.changeset.index}, error: ${JSON.stringify( | ||
| loggedError | ||
| )}.`, | ||
| originalError: loggedError, | ||
| statusCode: undefined, | ||
| details: undefined, | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| private async downloadChangeset( | ||
| params: IModelScopedOperationParams & | ||
| TargetDirectoryParam & { changeset: Changeset } & DownloadProgressParam & | ||
|
|
@@ -344,6 +405,10 @@ export class ChangesetOperations< | |
| return `${changesetId}.cs`; | ||
| } | ||
|
|
||
| private createChangedElementsFileName(changesetId: string): string { | ||
| return `${changesetId}.ndjson.gz`; | ||
| } | ||
|
|
||
| private async provideDownloadCallbacks( | ||
| params: DownloadChangesetListParams | ||
| ): Promise<[DownloadCallback, DownloadFailedCallback] | undefined> { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we will need fileSize for the changed element file if we want to have a retry policy.