Skip to content

Commit 7efd625

Browse files
authored
style: format upgra算能de storage changes
1 parent 0adaa7a commit 7efd625

4 files changed

Lines changed: 15 additions & 21 deletions

File tree

src/service/system/ISystemOperationService.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ class ISystemOperationService {
4343
/// Check the data-volume budget required for an upgrade package. When
4444
/// explicitly confirmed, event images and videos may be removed before
4545
/// the budget is inspected again.
46-
virtual cosmo::util::ErrorEnum CheckUpgradeSpace(std::uint64_t packageSizeBytes,
47-
bool cleanupEventMedia,
46+
virtual cosmo::util::ErrorEnum CheckUpgradeSpace(std::uint64_t packageSizeBytes, bool cleanupEventMedia,
4847
UpgradeSpaceStatus& status) = 0;
4948

5049
// ── Debug Tools ──

src/service/system/impl/UpgradeStorage.cc

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ namespace {
2424
return rhs > max_value - lhs ? max_value : lhs + rhs;
2525
}
2626

27-
util::ErrorEnum CollectEventMediaFiles(const fs::path& event_root,
28-
std::vector<EventMediaFile>& files,
27+
util::ErrorEnum CollectEventMediaFiles(const fs::path& event_root, std::vector<EventMediaFile>& files,
2928
std::uint64_t& total_bytes) {
3029
files.clear();
3130
total_bytes = 0;
@@ -76,20 +75,19 @@ std::uint64_t RequiredUpgradeSpaceBytes(std::uint64_t package_size_bytes) {
7675

7776
bool IsEventMediaFile(const fs::path& path) {
7877
static constexpr std::array<const char*, 16> kMediaExtensions{
79-
".jpg", ".jpeg", ".png", ".bmp", ".webp", ".gif", ".mp4", ".avi",
80-
".mov", ".mkv", ".webm", ".flv", ".ts", ".m4v", ".h264", ".h265"};
78+
".jpg", ".jpeg", ".png", ".bmp", ".webp", ".gif", ".mp4", ".avi",
79+
".mov", ".mkv", ".webm", ".flv", ".ts", ".m4v", ".h264", ".h265"};
8180
auto extension = path.extension().string();
8281
std::transform(extension.begin(), extension.end(), extension.begin(),
8382
[](unsigned char ch) { return static_cast<char>(std::tolower(ch)); });
84-
return std::find(kMediaExtensions.begin(), kMediaExtensions.end(), extension) !=
85-
kMediaExtensions.end();
83+
return std::find(kMediaExtensions.begin(), kMediaExtensions.end(), extension) != kMediaExtensions.end();
8684
}
8785

8886
EventMediaCleanupResult DeleteEventMediaFiles(const fs::path& event_root) {
8987
EventMediaCleanupResult result;
9088
std::vector<EventMediaFile> files;
9189
std::uint64_t total_bytes = 0;
92-
result.error = CollectEventMediaFiles(event_root, files, total_bytes);
90+
result.error = CollectEventMediaFiles(event_root, files, total_bytes);
9391
if (result.error != util::ErrorEnum::Success) {
9492
return result;
9593
}
@@ -123,7 +121,7 @@ util::ErrorEnum CheckUpgradeStorage(const fs::path& data_root, const fs::path& e
123121
return util::ErrorEnum::SysErr;
124122
}
125123
status.available_bytes = space.available;
126-
status.sufficient = status.available_bytes >= status.required_bytes;
124+
status.sufficient = status.available_bytes >= status.required_bytes;
127125
if (status.sufficient) {
128126
return util::ErrorEnum::Success;
129127
}
@@ -133,7 +131,7 @@ util::ErrorEnum CheckUpgradeStorage(const fs::path& data_root, const fs::path& e
133131
return CollectEventMediaFiles(event_root, media_files, status.event_media_bytes);
134132
}
135133

136-
const auto cleanup = DeleteEventMediaFiles(event_root);
134+
const auto cleanup = DeleteEventMediaFiles(event_root);
137135
status.event_media_bytes = cleanup.deleted_bytes;
138136
status.deleted_media_bytes = cleanup.deleted_bytes;
139137
status.deleted_media_files = cleanup.deleted_files;
@@ -146,7 +144,7 @@ util::ErrorEnum CheckUpgradeStorage(const fs::path& data_root, const fs::path& e
146144
return util::ErrorEnum::SysErr;
147145
}
148146
status.available_bytes = space.available;
149-
status.sufficient = status.available_bytes >= status.required_bytes;
147+
status.sufficient = status.available_bytes >= status.required_bytes;
150148
return util::ErrorEnum::Success;
151149
}
152150

src/service/system/impl/UpgradeStorage.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ struct EventMediaCleanupResult {
1919
[[nodiscard]] EventMediaCleanupResult DeleteEventMediaFiles(const std::filesystem::path& event_root);
2020
[[nodiscard]] util::ErrorEnum CheckUpgradeStorage(const std::filesystem::path& data_root,
2121
const std::filesystem::path& event_root,
22-
std::uint64_t package_size_bytes,
23-
bool cleanup_event_media,
22+
std::uint64_t package_size_bytes, bool cleanup_event_media,
2423
UpgradeSpaceStatus& status);
2524

2625
} // namespace cosmo::service

test/test_system_operation_service_impl.cc

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <array>
1+
ncl#include <array>
22
#include <filesystem>
33
#include <fstream>
44
#include <limits>
@@ -145,11 +145,10 @@ TEST_CASE("Upgrade storage requires two and a half package sizes", "[system][upg
145145
std::numeric_limits<std::uint64_t>::max());
146146
}
147147

148-
TEST_CASE("Upgrade storage cleanup removes only event images and videos",
149-
"[system][upgrade][storage]") {
150-
const auto root = fs::temp_directory_path() / "cosmo_upgrade_storage_cleanup_test";
148+
TEST_CASE("Upgrade storage cleanup removes only event images and videos", "[system][upgrade][storage]") {
149+
const auto root = fs::temp_directory_path() / "cosmo_upgrade_storage_cleanup_test";
151150
const auto event_root = root / "event";
152-
const auto outside = root / "outside.jpg";
151+
const auto outside = root / "outside.jpg";
153152
std::error_code ec;
154153
fs::remove_all(root, ec);
155154
fs::create_directories(event_root / "2026/08/17");
@@ -175,8 +174,7 @@ TEST_CASE("Upgrade storage cleanup removes only event images and videos",
175174
fs::remove_all(root, ec);
176175
}
177176

178-
TEST_CASE("Upgrade storage rechecks available space after confirmed cleanup",
179-
"[system][upgrade][storage]") {
177+
TEST_CASE("Upgrade storage rechecks available space after confirmed cleanup", "[system][upgrade][storage]") {
180178
const auto root = fs::temp_directory_path() / "cosmo_upgrade_storage_recheck_test";
181179
const auto event_root = root / "event";
182180
std::error_code ec;

0 commit comments

Comments
 (0)