beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

renamed NetworkClient to UploadHttpClient

Browse source
This commit is contained in:
Abhinav-grd 2021-08-13 11:52:18 +05:30
parent 6b6479eed7
commit 8ef9862b60
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/services/upload/multiPartUploadService.ts
View file

@ -1,5 +1,5 @@
import { CHUNKS_COMBINED_FOR_A_UPLOAD_PART, DataStream } from './uploadService';
import NetworkClient from './networkClient';
import UploadHttpClient from './uploadHttpClient';
import * as convert from 'xml-js';
import UIService, { RANDOM_PERCENTAGE_PROGRESS_FOR_PUT } from './uiService';
@ -23,7 +23,7 @@ export async function uploadStreamUsingMultipart(
dataStream: DataStream
) {
const uploadPartCount = calculatePartCount(dataStream.chunkCount);
const multipartUploadURLs = await NetworkClient.fetchMultipartUploadURLs(
const multipartUploadURLs = await UploadHttpClient.fetchMultipartUploadURLs(
uploadPartCount
);
const fileObjectKey = await uploadStreamInParts(
@ -56,7 +56,7 @@ export async function uploadStreamInParts(
index
);
const eTag = await NetworkClient.putFilePart(
const eTag = await UploadHttpClient.putFilePart(
fileUploadURL,
uploadChunk,
progressTracker
@ -99,5 +99,5 @@ async function completeMultipartUpload(
{ CompleteMultipartUpload: { Part: partEtags } },
options
);
await NetworkClient.completeMultipartUpload(completeURL, body);
await UploadHttpClient.completeMultipartUpload(completeURL, body);
}

4
src/services/upload/networkClient.ts → src/services/upload/uploadHttpClient.ts
View file

@ -11,7 +11,7 @@ import { MultipartUploadURLs } from './multiPartUploadService';
const ENDPOINT = getEndpoint();
const MAX_URL_REQUESTS = 50;
class NetworkClient {
class UploadHttpClient {
private uploadURLFetchInProgress = null;
async uploadFile(uploadFile: UploadFile): Promise<File> {
@ -147,4 +147,4 @@ class NetworkClient {
}
}
export default new NetworkClient();
export default new UploadHttpClient();

8
src/services/upload/uploadService.ts
View file

@ -1,7 +1,7 @@
import { fileAttribute, FILE_TYPE } from '../fileService';
import { Collection } from '../collectionService';
import { logError } from 'utils/sentry';
import NetworkClient from './networkClient';
import UploadHttpClient from './uploadHttpClient';
import {
extractMetadata,
getMetadataMapKey,
@ -183,14 +183,14 @@ class UploadService {
file.filename
);
const fileUploadURL = await this.getUploadURL();
fileObjectKey = await NetworkClient.putFile(
fileObjectKey = await UploadHttpClient.putFile(
fileUploadURL,
file.file.encryptedData,
progressTracker
);
}
const thumbnailUploadURL = await this.getUploadURL();
const thumbnailObjectKey = await NetworkClient.putFile(
const thumbnailObjectKey = await UploadHttpClient.putFile(
thumbnailUploadURL,
file.thumbnail.encryptedData as Uint8Array,
null
@ -249,7 +249,7 @@ class UploadService {
}
private async fetchUploadURLs() {
await NetworkClient.fetchUploadURLs(
await UploadHttpClient.fetchUploadURLs(
this.pendingUploadCount,
this.uploadURLs
);

4
src/services/upload/uploader.ts
View file

@ -4,7 +4,7 @@ import { handleError, CustomError } from 'utils/common/errorUtil';
import { decryptFile } from 'utils/file';
import { logError } from 'utils/sentry';
import { fileAlreadyInCollection } from 'utils/upload';
import NetworkClient from './networkClient';
import UploadHttpClient from './uploadHttpClient';
import UIService from './uiService';
import { FileUploadResults, FileWithCollection } from './uploadManager';
import UploadService, {
@ -58,7 +58,7 @@ export default async function uploader(
encryptedFile.fileKey
);
const uploadedFile = await NetworkClient.uploadFile(uploadFile);
const uploadedFile = await UploadHttpClient.uploadFile(uploadFile);
const decryptedFile = await decryptFile(uploadedFile, collection);
UIService.setFileProgress(rawFile.name, FileUploadResults.UPLOADED);