Separate service implementation from the main
All checks were successful
Build / build (push) Successful in 21s

This commit is contained in:
Eugen Wissner 2024-06-18 10:20:18 +02:00
parent bbb4efde18
commit 7b5fe4b9d1
Signed by: belka
GPG Key ID: A27FDC1E8EE902C0
4 changed files with 56 additions and 43 deletions

View File

@ -1,8 +1,8 @@
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(GDBUS REQUIRED gio-2.0 dbus-1 glibmm-2.4 giomm-2.4) pkg_check_modules(GDBUS REQUIRED gio-2.0 dbus-1 glibmm-2.4 giomm-2.4)
add_executable(slack-timedate add_executable(slack-timedate main.cpp
slack-timedate.cpp slack-timedate.h timedate.cpp timedate.h
) )
target_include_directories(slack-timedate PRIVATE ${GDBUS_INCLUDE_DIRS}) target_include_directories(slack-timedate PRIVATE ${GDBUS_INCLUDE_DIRS})
target_link_libraries(slack-timedate ${GDBUS_LIBRARIES}) target_link_libraries(slack-timedate ${GDBUS_LIBRARIES})

49
src/main.cpp Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright (C) 2013-2024 Eugen Wissner <belka@caraus.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include "timedate.h"
bool timeout_callback(Glib::RefPtr<Glib::MainLoop> loop2quit)
{
loop2quit->quit();
return false;
}
constexpr unsigned int default_exit_sec = 300;
int main(int argc, char **argv)
{
Gio::init();
auto timedate1 = std::make_unique<dlackware::timedate::timedate1>();
guint owner_id = Gio::DBus::own_name(Gio::DBus::BUS_TYPE_SYSTEM, BUS_NAME,
std::bind(&dlackware::timedate::timedate1::on_bus_acquired, timedate1.get(),
std::placeholders::_1, std::placeholders::_2),
Gio::DBus::SlotNameAcquired(),
std::bind(&dlackware::timedate::timedate1::on_name_lost, timedate1.get(),
std::placeholders::_1, std::placeholders::_2),
Gio::DBus::BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT | Gio::DBus::BUS_NAME_OWNER_FLAGS_REPLACE);
Glib::RefPtr<Glib::MainLoop> loop = Glib::MainLoop::create(false);
Glib::signal_timeout().connect_seconds(sigc::bind(&timeout_callback, loop), default_exit_sec);
loop->run();
Gio::DBus::unown_name(owner_id);
return EXIT_SUCCESS;
}

View File

@ -15,17 +15,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#include <cstring> #include <cstring>
#include <filesystem> #include <filesystem>
#include <fstream> #include <fstream>
#include <stdio.h> #include <string>
#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
#include <sys/stat.h>
#include "slack-timedate.h" #include "timedate.h"
static void slack_method_call(const Glib::RefPtr<Gio::DBus::Connection>& connection, const Glib::ustring& sender, static void slack_method_call(const Glib::RefPtr<Gio::DBus::Connection>& connection, const Glib::ustring& sender,
const Glib::ustring& object_path, const Glib::ustring& interface_name, const Glib::ustring& method_name, const Glib::ustring& object_path, const Glib::ustring& interface_name, const Glib::ustring& method_name,
@ -123,35 +118,6 @@ static void slack_get_property(Glib::VariantBase& result, const Glib::RefPtr<Gio
} }
} }
gboolean timeout_callback(Glib::RefPtr<Glib::MainLoop> loop2quit)
{
loop2quit->quit();
return false;
}
int main(int argc, char **argv)
{
Gio::init();
auto timedate1 = std::make_unique<dlackware::timedate::timedate1>();
guint owner_id = Gio::DBus::own_name(Gio::DBus::BUS_TYPE_SYSTEM, BUS_NAME,
std::bind(&dlackware::timedate::timedate1::on_bus_acquired, timedate1.get(),
std::placeholders::_1, std::placeholders::_2),
Gio::DBus::SlotNameAcquired(),
std::bind(&dlackware::timedate::timedate1::on_name_lost, timedate1.get(),
std::placeholders::_1, std::placeholders::_2),
Gio::DBus::BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT | Gio::DBus::BUS_NAME_OWNER_FLAGS_REPLACE);
Glib::RefPtr<Glib::MainLoop> loop = Glib::MainLoop::create(false);
Glib::signal_timeout().connect_seconds(sigc::bind(&timeout_callback, loop), DEFAULT_EXIT_SEC);
loop->run();
Gio::DBus::unown_name(owner_id);
return EXIT_SUCCESS;
}
namespace dlackware::timedate namespace dlackware::timedate
{ {
timedate1::timedate1() timedate1::timedate1()
@ -181,7 +147,7 @@ namespace dlackware::timedate
} }
try try
{ {
guint registration_id = connection->register_object(BUS_PATH, guint registration_id = connection->register_object(bus_path,
introspection_data->lookup_interface(), this->interface_vtable); introspection_data->lookup_interface(), this->interface_vtable);
} }
catch (Glib::Error& slack_err) catch (Glib::Error& slack_err)

View File

@ -15,19 +15,17 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#pragma once
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include <glibmm.h> #include <glibmm.h>
#include <giomm.h> #include <giomm.h>
#include <gio/gio.h>
#define BUS_NAME "org.freedesktop.timedate1" #define BUS_NAME "org.freedesktop.timedate1"
#define BUS_PATH "/org/freedesktop/timedate1"
#define DEFAULT_EXIT_SEC 300
namespace dlackware::timedate namespace dlackware::timedate
{ {
constexpr const char *bus_path = "/org/freedesktop/timedate1";
constexpr const char *zoneinfo_database = "/usr/share/zoneinfo"; constexpr const char *zoneinfo_database = "/usr/share/zoneinfo";
constexpr const char *introspection_xml = "/usr/share/dbus-1/interfaces/org.freedesktop.timedate1.xml"; constexpr const char *introspection_xml = "/usr/share/dbus-1/interfaces/org.freedesktop.timedate1.xml";