Skip to content

Commit

Permalink
chore: analyse + format
Browse files Browse the repository at this point in the history
  • Loading branch information
russellwheatley committed May 3, 2024
1 parent d8ca29f commit 839ed39
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,8 @@ std::string FirebaseStoragePlugin::GetStorageErrorMessage(Error storageError) {
}

// For Tasks, we stream exception back as a map to match other platforms
flutter::EncodableMap FirebaseStoragePlugin::ErrorStreamEvent(
const firebase::FutureBase& data_result,
const std::string& app_name) {
flutter::EncodableMap FirebaseStoragePlugin::ErrorStreamEvent(
const firebase::FutureBase& data_result, const std::string& app_name) {
flutter::EncodableMap error;
const Error errorCode = static_cast<const Error>(data_result.error());
flutter::EncodableValue code(
Expand All @@ -215,8 +214,7 @@ std::string FirebaseStoragePlugin::GetStorageErrorMessage(Error storageError) {
error[flutter::EncodableValue("message")] = message;

flutter::EncodableMap event;
event[flutter::EncodableValue("appName")] =
flutter::EncodableValue(app_name);
event[flutter::EncodableValue("appName")] = flutter::EncodableValue(app_name);
event[flutter::EncodableValue("taskState")] =
flutter::EncodableValue(static_cast<int>(PigeonStorageTaskState::error));
event[flutter::EncodableValue("error")] = error;
Expand Down Expand Up @@ -363,7 +361,8 @@ FirebaseStoragePlugin::CreateStorageMetadataFromPigeon(
return nullptr; // If no valid data was set, return nullptr
}

return metaData.release(); // Successfully created and populated metadata, release the pointer
return metaData.release(); // Successfully created and populated metadata,
// release the pointer
}

std::map<std::string, std::string>
Expand All @@ -385,7 +384,6 @@ FirebaseStoragePlugin::ProcessCustomMetadataMap(
return processedMetadata;
}


std::string kCacheControlName = "cacheControl";
std::string kContentDispositionName = "contentDisposition";
std::string kContentEncodingName = "contentEncoding";
Expand Down Expand Up @@ -550,7 +548,8 @@ class PutDataStreamHandler
PutDataStreamHandler(Storage* storage, std::string reference_path,
const void* data, size_t buffer_size,
Controller* controller,
const PigeonSettableMetadata& pigeon_meta_data): meta_data_(pigeon_meta_data) {
const PigeonSettableMetadata& pigeon_meta_data)
: meta_data_(pigeon_meta_data) {
storage_ = storage;
reference_path_ = reference_path;
auto data_bytes_ptr = static_cast<const uint8_t*>(data);
Expand All @@ -567,22 +566,19 @@ class PutDataStreamHandler

TaskStateListener* putStringListener = new TaskStateListener(events_.get());
StorageReference reference = storage_->GetReference(reference_path_);
Metadata* storage_metadata =
FirebaseStoragePlugin::CreateStorageMetadataFromPigeon(&meta_data_);

Metadata* storage_metadata =
FirebaseStoragePlugin::CreateStorageMetadataFromPigeon(&meta_data_);
Future<Metadata> future_result;
if (storage_metadata) {
if (storage_metadata) {
future_result =
reference.PutBytes(data_.data(), data_.size(), *storage_metadata,
putStringListener, controller_);
} else {
future_result =
reference.PutBytes(data_.data(), data_.size(),
putStringListener, controller_);
}



} else {
future_result = reference.PutBytes(data_.data(), data_.size(),
putStringListener, controller_);
}

::Sleep(1); // timing for c++ sdk grabbing a mutex

future_result.OnCompletion([this](const Future<Metadata>& data_result) {
Expand All @@ -596,8 +592,7 @@ class PutDataStreamHandler
snapshot[kTaskSnapshotTotalBytes] = data_result.result()->size_bytes();
snapshot[kTaskSnapshotBytesTransferred] =
data_result.result()->size_bytes();
snapshot[kMetadataName] =
ConvertMedadataToPigeon(data_result.result());
snapshot[kMetadataName] = ConvertMedadataToPigeon(data_result.result());
event[kTaskSnapshotName] = snapshot;

events_->Success(event);
Expand Down Expand Up @@ -649,13 +644,13 @@ class PutFileStreamHandler

TaskStateListener* putFileListener = new TaskStateListener(events_.get());
StorageReference reference = storage_->GetReference(reference_path_);

Metadata* storage_metadata =
FirebaseStoragePlugin::CreateStorageMetadataFromPigeon(
meta_data_.get());
FirebaseStoragePlugin::CreateStorageMetadataFromPigeon(
meta_data_.get());
Future<Metadata> future_result;
if (storage_metadata) {

if (storage_metadata) {
future_result = reference.PutFile(file_path_.c_str(), *storage_metadata,
putFileListener, controller_);
} else {
Expand All @@ -675,8 +670,7 @@ class PutFileStreamHandler
snapshot[kTaskSnapshotTotalBytes] = data_result.result()->size_bytes();
snapshot[kTaskSnapshotBytesTransferred] =
data_result.result()->size_bytes();
snapshot[kMetadataName] =
ConvertMedadataToPigeon(data_result.result());
snapshot[kMetadataName] = ConvertMedadataToPigeon(data_result.result());
event[kTaskSnapshotName] = snapshot;

events_->Success(event);
Expand Down Expand Up @@ -728,7 +722,7 @@ class GetFileStreamHandler
StorageReference reference = storage_->GetReference(reference_path_);
Future<size_t> future_result =
reference.GetFile(file_path_.c_str(), getFileListener, controller_);

::Sleep(1); // timing for c++ sdk grabbing a mutex
future_result.OnCompletion([this](const Future<size_t>& data_result) {
if (data_result.error() == firebase::storage::kErrorNone) {
Expand Down Expand Up @@ -807,8 +801,7 @@ void FirebaseStoragePlugin::ReferencePutString(

auto handler = std::make_unique<PutDataStreamHandler>(
cpp_storage, pigeon_reference.full_path(), decoded_data.data(),
decoded_data.size(),
controllers_[handle].get(), settable_meta_data);
decoded_data.size(), controllers_[handle].get(), settable_meta_data);

std::string channelName = RegisterEventChannel(
kStorageMethodChannelName + "/" + kStorageTaskEventName,
Expand Down Expand Up @@ -889,14 +882,15 @@ void FirebaseStoragePlugin::TaskPause(
bool status = controllers_[handle]->Pause();
flutter::EncodableMap task_result = flutter::EncodableMap();
flutter::EncodableMap task_data = flutter::EncodableMap();

task_result[flutter::EncodableValue("status")] =
flutter::EncodableValue(status);
task_data[flutter::EncodableValue("bytesTransferred")] =
flutter::EncodableValue(controllers_[handle]->bytes_transferred());
task_data[flutter::EncodableValue("totalBytes")] =
flutter::EncodableValue(controllers_[handle]->total_byte_count());
task_result[flutter::EncodableValue("snapshot")] = flutter::EncodableValue(task_data);
task_result[flutter::EncodableValue("snapshot")] =
flutter::EncodableValue(task_data);
result(task_result);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include <memory>

#include "firebase/storage/common.h"
#include "firebase/storage/metadata.h"
#include "firebase/storage/controller.h"
#include "firebase/storage/metadata.h"
#include "messages.g.h"

using firebase::storage::Error;
Expand All @@ -42,7 +42,8 @@ class FirebaseStoragePlugin : public flutter::Plugin,
const flutter::EncodableMap& customMetadata);
static std::vector<unsigned char> StringToByteData(const std::string& data,
int64_t format);
static std::vector<unsigned char> Base64Decode(const std::string& encoded_string);
static std::vector<unsigned char> Base64Decode(
const std::string& encoded_string);
// Parser functions
static std::string GetStorageErrorCode(Error cppError);
static std::string GetStorageErrorMessage(Error cppError);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import 'dart:io';

import 'package:firebase_core/firebase_core.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';

import '../../firebase_storage_platform_interface.dart';
import '../pigeon/messages.pigeon.dart';
Expand Down

0 comments on commit 839ed39

Please sign in to comment.