jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework stream usage for desktop/icon file creation

Browse source
This commit is contained in:
Simon Fels 2017-02-02 12:37:49 +01:00
commit e2f51b80a1
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/anbox/application/launcher_storage.cpp
View file

@ -48,10 +48,8 @@ void LauncherStorage::add(const Item &item) {
auto package_name = item.package; auto package_name = item.package;
std::replace(package_name.begin(), package_name.end(), '.', '-'); std::replace(package_name.begin(), package_name.end(), '.', '-');
const auto item_path = const auto item_path = path_ / utils::string_format("anbox-%s.desktop", package_name);
path_ / utils::string_format("anbox-%s.desktop", package_name); const auto item_icon_path = icon_path_ / utils::string_format("anbox-%s.png", package_name);
const auto item_icon_path =
icon_path_ / utils::string_format("anbox-%s.png", package_name);
std::string exec = utils::string_format("%s launch ", utils::process_get_exe_path(getpid())); std::string exec = utils::string_format("%s launch ", utils::process_get_exe_path(getpid()));
@ -68,21 +66,23 @@ void LauncherStorage::add(const Item &item) {
exec += utils::string_format("--package=%s ", item.launch_intent.package); exec += utils::string_format("--package=%s ", item.launch_intent.package);
if (!item.launch_intent.component.empty()) if (!item.launch_intent.component.empty())
exec += exec += utils::string_format("--component=%s ", item.launch_intent.component);
utils::string_format("--component=%s ", item.launch_intent.component);
std::ofstream desktop_item(item_path.string()); if (auto desktop_item = std::ofstream(item_path.string())) {
desktop_item << "[Desktop Entry]" << std::endl desktop_item << "[Desktop Entry]" << std::endl
<< "Name=" << item.package << std::endl << "Name=" << item.package << std::endl
<< "Exec=" << exec << std::endl << "Exec=" << exec << std::endl
<< "Terminal=false" << std::endl << "Terminal=false" << std::endl
<< "Type=Application" << std::endl << "Type=Application" << std::endl
<< "Icon=" << item_icon_path.string() << std::endl; << "Icon=" << item_icon_path.string() << std::endl;
desktop_item.close(); } else {
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to create desktop item"));
}
std::ofstream icon(item_icon_path.string()); if (auto icon = std::ofstream(item_icon_path.string()))
icon.write(item.icon.data(), item.icon.size()); icon.write(item.icon.data(), item.icon.size());
icon.close(); else
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to write icon"));
} }
} // namespace application } // namespace application
} // namespace anbox } // namespace anbox