From b6d6b153631dff98fd8ca9392bfb83ac87096b11 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Thu, 28 Nov 2019 20:21:51 +0900 Subject: [PATCH] Apply early return policy on StepCopyPreviewIcons Change-Id: I4ae9087fa4e149459df982e8311e471f19a732ee Signed-off-by: Junghyun Yeon --- src/wgt/step/filesystem/step_copy_preview_icons.cc | 25 +++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/wgt/step/filesystem/step_copy_preview_icons.cc b/src/wgt/step/filesystem/step_copy_preview_icons.cc index 95710f8..2cdf5cc 100644 --- a/src/wgt/step/filesystem/step_copy_preview_icons.cc +++ b/src/wgt/step/filesystem/step_copy_preview_icons.cc @@ -5,6 +5,7 @@ #include "wgt/step/filesystem/step_copy_preview_icons.h" #include + #include #include @@ -29,22 +30,22 @@ ci::Step::Status StepCopyPreviewIcons::process() { static_cast(context_->backend_data.get()); for (auto& appwidget : backend_data->appwidgets.get().app_widgets()) { for (auto& size : appwidget.content_size) { - if (!size.preview.empty()) { - bf::path icon_path = - context_->GetPkgPath() / kResWgt / size.preview; - std::string type = wgt::parse::AppWidgetSizeTypeToString(size.type); - std::string icon_name = appwidget.id + "." + type + "." + "preview" + - bf::path(size.preview).extension().string(); - bf::path preview_icon = - context_->GetPkgPath() / kSharedRes / icon_name; - if (!ci::CopyFile(icon_path, preview_icon)) { - LOG(ERROR) << "Cannot create preview icon: " << preview_icon; - return Status::ICON_ERROR; - } + if (size.preview.empty()) + continue; + + bf::path icon_path = context_->GetPkgPath() / kResWgt / size.preview; + std::string type = wgt::parse::AppWidgetSizeTypeToString(size.type); + std::string icon_name = appwidget.id + "." + type + "." + "preview" + + bf::path(size.preview).extension().string(); + bf::path preview_icon = context_->GetPkgPath() / kSharedRes / icon_name; + if (!ci::CopyFile(icon_path, preview_icon)) { + LOG(ERROR) << "Cannot create preview icon: " << preview_icon; + return Status::ICON_ERROR; } } } LOG(DEBUG) << "Preview icons created"; + return Status::OK; } -- 2.7.4