Skip to content

Commit

Permalink
feat(uploader)
Browse files Browse the repository at this point in the history 
clean up the cubit
  • Loading branch information
@thiagocarvalhodev
thiagocarvalhodev committed Sep 26, 2023
1 parent 3598837 commit 5ea2627
Show file tree
Hide file tree
Showing 3 changed files with 200 additions and 222 deletions.
207 changes: 93 additions & 114 deletions lib/blocs/upload/upload_cubit.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ class UploadCubit extends Cubit<UploadState> {

// TODO: Finish the implementation for uploading folders.
// It should be addressed after the new uploader is implemented and tested.
// ignore: unused_element
Future<void> _uploadFolderUsingArDriveUploader() async {
final ardriveUploader = ArDriveUploader(
turboUploadUri: Uri.parse(configService.config.defaultTurboUploadUrl!),
Expand All @@ -498,25 +499,6 @@ class UploadCubit extends Cubit<UploadState> {
),
);

List<UploadProgress> filesWithProgress = [];

if (state is UploadInProgressUsingNewUploader) {
emit(
UploadInProgressUsingNewUploader(
uploadProgressList: filesWithProgress,
totalProgress: (state as UploadInProgressUsingNewUploader)
.totalProgress, // TODO: calcualte total progress
),
);
} else {
emit(
UploadInProgressUsingNewUploader(
uploadProgressList: filesWithProgress,
totalProgress: 0, // TODO: calcualte total progress
),
);
}

final private = _targetDrive.isPrivate;
final driveKey = private
? await _driveDao.getDriveKey(
Expand All @@ -541,7 +523,7 @@ class UploadCubit extends Cubit<UploadState> {
UploadInProgressUsingNewUploader(
totalProgress: progress.progress,
equatableBust: UniqueKey(),
uploadProgressList: [progress],
progress: progress,
),
);
});
Expand All @@ -561,107 +543,104 @@ class UploadCubit extends Cubit<UploadState> {
),
);

List<UploadProgress> filesWithProgress = [];

for (int i = 0; i < files.length; i++) {
final private = _targetDrive.isPrivate;
final driveKey = private
? await _driveDao.getDriveKey(
_targetDrive.id, _auth.currentUser!.cipherKey)
: null;

final revisionAction =
conflictingFiles.containsKey(files[i].getIdentifier())
? RevisionAction.uploadNewVersion
: RevisionAction.create;

final uploadController = await ardriveUploader.upload(
file: files[i].ioFile,
args: ARFSUploadMetadataArgs(
isPrivate: _targetDrive.isPrivate,
driveId: _targetDrive.id,
parentFolderId: _targetFolder.id,
privacy: _targetDrive.isPrivate ? 'private' : 'public',
entityId: revisionAction == RevisionAction.uploadNewVersion
? conflictingFiles[files[i].getIdentifier()]
: null,
),
wallet: _auth.currentUser!.wallet,
driveKey: driveKey,
final private = _targetDrive.isPrivate;
final driveKey = private
? await _driveDao.getDriveKey(
_targetDrive.id, _auth.currentUser!.cipherKey)
: null;

List<(ARFSUploadMetadataArgs, IOFile)> uploadFiles = [];

for (var file in files) {
final revisionAction = conflictingFiles.containsKey(file.getIdentifier())
? RevisionAction.uploadNewVersion
: RevisionAction.create;

final args = ARFSUploadMetadataArgs(
isPrivate: _targetDrive.isPrivate,
driveId: _targetDrive.id,
parentFolderId: _targetFolder.id,
privacy: _targetDrive.isPrivate ? 'private' : 'public',
entityId: revisionAction == RevisionAction.uploadNewVersion
? conflictingFiles[file.getIdentifier()]
: null,
);

// File to upload
final file = files[i];

uploadController.onProgressChange((progress) {
if (filesWithProgress.length < i + 1) {
filesWithProgress.add(UploadProgress(
progress: 0,
totalSize: progress.totalSize,
task: progress.task,
));
} else {
filesWithProgress[i] = UploadProgress(
progress: progress.progress,
totalSize: progress.totalSize,
task: progress.task,
);
}
uploadFiles.add((args, file.ioFile));
}

emit(
UploadInProgressUsingNewUploader(
uploadProgressList: filesWithProgress,
totalProgress: progress.progress,
equatableBust: UniqueKey(),
),
);
});

uploadController.onDone((tasks) async {
logger.d(tasks.toString());
unawaited(_profileCubit.refreshBalance());
// Single file only
// TODO: abstract to the database interface.
// TODO: improve API for finishing a file upload.
final fileMetadata =
tasks.first.dataItem!.contents.first as ARFSFileUploadMetadata;

final entity = FileEntity(
dataContentType: fileMetadata.dataContentType,
dataTxId: fileMetadata.dataTxId,
driveId: fileMetadata.driveId,
id: fileMetadata.id,
lastModifiedDate: fileMetadata.lastModifiedDate,
name: fileMetadata.name,
parentFolderId: fileMetadata.parentFolderId,
size: fileMetadata.size,
// TODO: pinnedDataOwnerAddress
);
/// Creates the uploader and starts the upload.
final uploadController = await ardriveUploader.uploadFiles(
files: uploadFiles,
wallet: _auth.currentUser!.wallet,
driveKey: driveKey,
);

if (fileMetadata.metadataTxId == null) {
logger.e('Metadata tx id is null');
throw Exception('Metadata tx id is null');
}
uploadController.onProgressChange((progress) {
emit(
UploadInProgressUsingNewUploader(
progress: progress,
totalProgress: progress.progress,
equatableBust: UniqueKey(),
),
);
});

entity.txId = fileMetadata.metadataTxId!;

await _driveDao.transaction(() async {
// If path is a blob from drag and drop, use file name. Else use the path field from folder upload
final filePath = '${_targetFolder.path}/${file.getIdentifier()}';
await _driveDao.writeFileEntity(entity, filePath);
await _driveDao.insertFileRevision(
entity.toRevisionCompanion(
performedAction: revisionAction,
),
);
});

// all files are uploaded
if (filesWithProgress.every((element) => element.progress == 1)) {
uploadController.onDone((tasks) async {
logger.d(tasks.toString());
unawaited(_profileCubit.refreshBalance());
// Single file only
// TODO: abstract to the database interface.
// TODO: improve API for finishing a file upload.
for (var task in tasks) {
final metadatas = task.dataItem!.contents;

for (var metadata in metadatas) {
if (metadata is ARFSFileUploadMetadata) {
final fileMetadata = metadata;

final revisionAction =
conflictingFiles.containsKey(fileMetadata.name)
? RevisionAction.uploadNewVersion
: RevisionAction.create;

final entity = FileEntity(
dataContentType: fileMetadata.dataContentType,
dataTxId: fileMetadata.dataTxId,
driveId: fileMetadata.driveId,
id: fileMetadata.id,
lastModifiedDate: fileMetadata.lastModifiedDate,
name: fileMetadata.name,
parentFolderId: fileMetadata.parentFolderId,
size: fileMetadata.size,
// TODO: pinnedDataOwnerAddress
);

if (fileMetadata.metadataTxId == null) {
logger.e('Metadata tx id is null');
throw Exception('Metadata tx id is null');
}

entity.txId = fileMetadata.metadataTxId!;

await _driveDao.transaction(() async {
// If path is a blob from drag and drop, use file name. Else use the path field from folder upload
// TODO: Changed this logic. PLEASE REVIEW IT.
final filePath = '${_targetFolder.path}/${metadata.name}';
await _driveDao.writeFileEntity(entity, filePath);
await _driveDao.insertFileRevision(
entity.toRevisionCompanion(
performedAction: revisionAction,
),
);
});
}

// all files are uploaded
emit(UploadComplete());
}
});
}
}
});
}

Future<void> skipLargeFilesAndCheckForConflicts() async {
Expand Down
6 changes: 3 additions & 3 deletions lib/blocs/upload/upload_state.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,18 +177,18 @@ class UploadInProgress extends UploadState {
}

class UploadInProgressUsingNewUploader extends UploadState {
final List<UploadProgress> uploadProgressList;
final UploadProgress progress;
final double totalProgress;
final Key? equatableBust;

UploadInProgressUsingNewUploader({
required this.uploadProgressList,
required this.progress,
required this.totalProgress,
this.equatableBust,
});

@override
List<Object?> get props => [uploadProgressList, totalProgress, equatableBust];
List<Object?> get props => [progress, totalProgress, equatableBust];
}

class UploadFailure extends UploadState {
Expand Down
Loading

0 comments on commit 5ea2627

Please sign in to comment.