status-im
/
snorenotify
mirror of https://github.com/status-im/snorenotify.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Autogenerate plugin.json files, change plugin names to match enum names

This commit is contained in:
Hannah von Reth 2015-12-05 15:48:38 +01:00
parent 6e29a9ae18
commit f6d46b868a
46 changed files with 67 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/libsnore/SnoreAddPlugin.cmake
View File

@ -1,20 +1,45 @@
include(CMakeParseArguments)
function(add_snore_plugin name)
function(_test_type TYPE)
set(PLUGINS "(Backend|SecondaryBackend|Frontend)" )
string(REGEX MATCH ${PLUGINS} RESULT ${TYPE})
if(NOT RESULT)
message(FATAL_ERROR "Plugin type ${TYPE} is not ins ${PLUGINS}")
endif()
endfunction()
function(_test_name UPPER LOWER)
string(COMPARE EQUAL "${UPPER}" "${LOWER}" RESULT)
if(RESULT)
message(FATAL_ERROR "Plugin name ${UPPER} is not camel case")
endif()
endfunction()
function(add_snore_plugin SNORE_NAME)
set(options)
set(oneValueArgs TYPE)
set(multiValueArgs SETTINGS_SOURCES SETTINGS_LIBS SOURCES LIBS)
cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
cmake_parse_arguments(SNORE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
add_library(libsnore_${ARG_TYPE}_${name} MODULE ${ARG_SOURCES})
target_link_libraries(libsnore_${ARG_TYPE}_${name} Snore::Libsnore ${ARG_LIBS})
install(TARGETS libsnore_${ARG_TYPE}_${name} ${SNORE_PLUGIN_INSTALL_PATH})
string( TOLOWER "${SNORE_NAME}" SNORE_NAME_LOWERCASE)
_test_name(${SNORE_NAME} ${SNORE_NAME_LOWERCASE})
string(REGEX REPLACE "[ \t\r\n]" "" SNORE_NAME_LOWERCASE ${SNORE_NAME_LOWERCASE})
if(ARG_SETTINGS_SOURCES AND Qt5Widgets_FOUND)
add_library(libsnore_settings_${ARG_TYPE}_${name} MODULE ${ARG_SETTINGS_SOURCES} )
target_link_libraries(libsnore_settings_${ARG_TYPE}_${name} Snore::Libsnore Snore::LibsnoreSettings ${ARG_SETTINGS_LIBS})
install(TARGETS libsnore_settings_${ARG_TYPE}_${name} ${SNORE_PLUGIN_INSTALL_PATH})
_test_type(${SNORE_TYPE})
string( TOLOWER "${SNORE_TYPE}" SNORE_TYPE_LOWERCASE)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/snore_plugin.json "{ \"name\" : \"${SNORE_NAME}\" }")
message(STATUS libsnore_${SNORE_TYPE_LOWERCASE}_${SNORE_NAME_LOWERCASE} )
add_library(libsnore_${SNORE_TYPE_LOWERCASE}_${SNORE_NAME_LOWERCASE} MODULE ${SNORE_SOURCES})
target_link_libraries(libsnore_${SNORE_TYPE_LOWERCASE}_${SNORE_NAME_LOWERCASE} Snore::Libsnore ${SNORE_LIBS})
install(TARGETS libsnore_${SNORE_TYPE_LOWERCASE}_${SNORE_NAME_LOWERCASE} ${SNORE_PLUGIN_INSTALL_PATH})
if(SNORE_SETTINGS_SOURCES AND Qt5Widgets_FOUND)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/snore_settings_plugin.json "{ \"name\" : \"${SNORE_NAME}${SNORE_TYPE}\" }")
add_library(libsnore_settings_${SNORE_TYPE_LOWERCASE}_${SNORE_NAME_LOWERCASE} MODULE ${SNORE_SETTINGS_SOURCES} )
target_link_libraries(libsnore_settings_${SNORE_TYPE_LOWERCASE}_${SNORE_NAME_LOWERCASE} Snore::Libsnore Snore::LibsnoreSettings ${SNORE_SETTINGS_LIBS})
install(TARGETS libsnore_settings_${SNORE_TYPE_LOWERCASE}_${SNORE_NAME_LOWERCASE} ${SNORE_PLUGIN_INSTALL_PATH})
endif()
endfunction()

3
src/libsnore/plugins/plugincontainer.h
View File

@ -78,9 +78,6 @@ private:
{
QStringList out;
QString typeName = SnorePlugin::typeToString(type).toLower();
if (type == Snore::SnorePlugin::SecondaryBackend) {
typeName = QStringLiteral("secondary_backend");
}
for (const QString &extention : pluginExtentions()) {
out << QLatin1String("libsnore_") + typeName + QLatin1String("_*.") + extention;
}

2
src/libsnore/plugins/settingsplugin.h
View File

@ -53,7 +53,7 @@ Q_DECLARE_INTERFACE(Snore::SettingsPlugin,
class NAMESettings : public Snore::SettingsPlugin{\
Q_OBJECT\
Q_INTERFACES(Snore::SettingsPlugin)\
Q_PLUGIN_METADATA(IID "org.Snore.SettingsPlugin/1.0" FILE "plugin.json")\
Q_PLUGIN_METADATA(IID "org.Snore.SettingsPlugin/1.0" FILE "snore_settings_plugin.json")\
public:\
Snore::PluginSettingsWidget *settingsWidget(Snore::SnorePlugin *parent) override{\
return new NAME(parent);\

2
src/libsnore/settings/settings.cpp
View File

@ -32,7 +32,7 @@ QList<PluginSettingsWidget *> Settings::settingWidgets(SnorePlugin::PluginTypes
//TODO: mem leak?
SnorePlugin *plugin = core->m_plugins[qMakePair(type, name)];
SettingsPlugin *settingsPlugin = qobject_cast< Snore::SettingsPlugin * >(core->m_plugins[qMakePair(Snore::SnorePlugin::Settings, name)]);
SettingsPlugin *settingsPlugin = qobject_cast< Snore::SettingsPlugin * >(core->m_plugins[qMakePair(Snore::SnorePlugin::Settings, name + SnorePlugin::typeToString(type))]);
if (settingsPlugin) {
PluginSettingsWidget *widget = settingsPlugin->settingsWidget(plugin);
if (widget) {

5
src/plugins/backends/freedesktop_backend/CMakeLists.txt
View File

@ -11,10 +11,7 @@ if(Qt5DBus_FOUND)
qt5_add_dbus_interface( FREEDESKTOP_NOTIFICATION_SRC ../../frontends/freedesktop_frontend/org.freedesktop.Notifications.xml notificationinterface )
add_snore_plugin(Freedesktop SOURCES ${FREEDESKTOP_NOTIFICATION_SRC} TYPE Backend LIBS Qt5::DBus)
add_library(libsnore_backend_freedesktop MODULE ${FREEDESKTOP_NOTIFICATION_SRC} )
target_link_libraries(libsnore_backend_freedesktop Snore::Libsnore Qt5::DBus )
install(TARGETS libsnore_backend_freedesktop ${SNORE_PLUGIN_INSTALL_PATH})
endif()

2
src/plugins/backends/freedesktop_backend/freedesktopnotification_backend.h
View File

@ -7,7 +7,7 @@ class FreedesktopBackend: public Snore::SnoreBackend
{
Q_OBJECT
Q_INTERFACES(Snore::SnoreBackend)
Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "snore_plugin.json")
public:
FreedesktopBackend();
~FreedesktopBackend() = default;

1
src/plugins/backends/freedesktop_backend/plugin.json
View File

@ -1 +0,0 @@
{ "type" : "backend", "name" : "Freedesktop" }

2
src/plugins/backends/growl/CMakeLists.txt
View File

@ -6,5 +6,5 @@ set_package_properties(SnoreGrowl++ PROPERTIES
TYPE RECOMMENDED)
if(SnoreGrowl++_FOUND)
add_snore_plugin(growl SOURCES growlbackend.cpp SETTINGS_SOURCES growlsettings.cpp TYPE backend LIBS Snore::SnoreGrowl++)
add_snore_plugin(Growl SOURCES growlbackend.cpp SETTINGS_SOURCES growlsettings.cpp TYPE Backend LIBS Snore::SnoreGrowl++)
endif()

2
src/plugins/backends/growl/growlbackend.h
View File

@ -27,7 +27,7 @@ class GrowlBackend: public Snore::SnoreBackend
{
Q_OBJECT
Q_INTERFACES(Snore::SnoreBackend)
Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "snore_plugin.json")
public:
GrowlBackend();

1
src/plugins/backends/growl/plugin.json
View File

@ -1 +0,0 @@
{ "type" : "backend", "name" : "Growl" }

2
src/plugins/backends/osxnotificationcenter/CMakeLists.txt
View File

@ -1,3 +1,3 @@
if(APPLE)
add_snore_plugin(osxnotificationcenter SOURCES osxnotificationcenter.mm TYPE backend LIBS /System/Library/Frameworks/Foundation.framework)
add_snore_plugin("OSX Notification Center" SOURCES osxnotificationcenter.mm TYPE Backend LIBS /System/Library/Frameworks/Foundation.framework)
endif(APPLE)

2
src/plugins/backends/osxnotificationcenter/osxnotificationcenter.h
View File

@ -25,7 +25,7 @@ class OSXNotificationCenter : public Snore::SnoreBackend
{
Q_OBJECT
Q_INTERFACES(Snore::SnoreBackend)
Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "snore_plugin.json")
public:
OSXNotificationCenter();

1
src/plugins/backends/osxnotificationcenter/plugin.json
View File

@ -1 +0,0 @@
{ "type" : "backend", "name" : "OSX Notification Center" }

2
src/plugins/backends/snarl/CMakeLists.txt
View File

@ -1,5 +1,5 @@
if(WIN32)
add_snore_plugin(snarl SOURCES snarl.cpp SnarlInterface.cpp SETTINGS_SOURCES snarlsettings.cpp TYPE backend LIBS Qt5::Widgets)
add_snore_plugin(Snarl SOURCES snarl.cpp SnarlInterface.cpp SETTINGS_SOURCES snarlsettings.cpp TYPE Backend LIBS Qt5::Widgets)
if(MINGW)
set_target_properties(libsnore_backend_snarl PROPERTIES COMPILE_FLAGS "-Wno-conversion-null -Wno-unused")
endif(MINGW)

1
src/plugins/backends/snarl/plugin.json
View File

@ -1 +0,0 @@
{ "type" : "backend", "name" : "Snarl" }

2
src/plugins/backends/snarl/snarl.h
View File

@ -25,7 +25,7 @@ class SnarlBackend: public Snore::SnoreBackend
{
Q_OBJECT
Q_INTERFACES(Snore::SnoreBackend)
Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "snore_plugin.json")
public:
SnarlBackend();
~SnarlBackend();

4
src/plugins/backends/snore/CMakeLists.txt
View File

@ -7,8 +7,8 @@ set_package_properties(Qt5Quick PROPERTIES
if(Qt5Quick_FOUND)
QT5_ADD_RESOURCES(SNORENOTIFIER_RCS ${CMAKE_CURRENT_SOURCE_DIR}/snore_notification.qrc)
add_snore_plugin(snore SOURCES snorenotifier.cpp
add_snore_plugin(Snore SOURCES snorenotifier.cpp
notifywidget.cpp
${SNORENOTIFIER_RCS}
TYPE backend SETTINGS_SOURCES snorenotifiersettings.cpp LIBS Qt5::Quick)
TYPE Backend SETTINGS_SOURCES snorenotifiersettings.cpp LIBS Qt5::Quick)
endif()

1
src/plugins/backends/snore/plugin.json
View File

@ -1 +0,0 @@
{ "type" : "backend", "name" : "Snore" }

2
src/plugins/backends/snore/snorenotifier.h
View File

@ -27,7 +27,7 @@ class SnoreNotifier : public Snore::SnoreBackend
{
Q_OBJECT
Q_INTERFACES(Snore::SnoreBackend)
Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "snore_plugin.json")
public:
SnoreNotifier();
~SnoreNotifier();

2
src/plugins/backends/snoretoast/CMakeLists.txt
View File

@ -1,4 +1,4 @@
if(WIN32)
add_snore_plugin(snoretoast SOURCES snoretoast.cpp TYPE backend)
add_snore_plugin("Windows Toast" SOURCES snoretoast.cpp TYPE Backend)
install(FILES SnoreToast.exe DESTINATION bin)
endif(WIN32)

1
src/plugins/backends/snoretoast/plugin.json
View File

@ -1 +0,0 @@
{ "type" : "backend", "name" : "Windows Toast" }

2
src/plugins/backends/snoretoast/snoretoast.h
View File

@ -8,7 +8,7 @@ class SnoreToast : public Snore::SnoreBackend
{
Q_OBJECT
Q_INTERFACES(Snore::SnoreBackend)
Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "snore_plugin.json")
public:
SnoreToast() = default;
~SnoreToast() = default;

2
src/plugins/backends/trayicon/CMakeLists.txt
View File

@ -1,3 +1,3 @@
if(Qt5Widgets_FOUND)
add_snore_plugin(trayicon SOURCES trayiconnotifer.cpp TYPE backend LIBS Qt5::Widgets)
add_snore_plugin(Trayicon SOURCES trayiconnotifer.cpp TYPE Backend LIBS Qt5::Widgets)
endif()

1
src/plugins/backends/trayicon/plugin.json
View File

@ -1 +0,0 @@
{ "type" : "backend", "name" : "System Tray" }

2
src/plugins/backends/trayicon/trayiconnotifer.h
View File

@ -13,7 +13,7 @@ class TrayIconNotifer: public Snore::SnoreBackend
{
Q_OBJECT
Q_INTERFACES(Snore::SnoreBackend)
Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "snore_plugin.json")
public:
TrayIconNotifer();
~TrayIconNotifer() = default;

2
src/plugins/frontends/freedesktop_frontend/CMakeLists.txt
View File

@ -14,7 +14,7 @@ if(Qt5DBus_FOUND)
qt5_add_dbus_adaptor( FREEDESKTOP_NOTIFICATION_FRONTEND_SRC org.freedesktop.Notifications.xml freedesktopnotificationfrontend.h FreedesktopFrontend)
add_snore_plugin(freedesktop SOURCES ${FREEDESKTOP_NOTIFICATION_FRONTEND_SRC} TYPE frontend LIBS Qt5::DBus)
add_snore_plugin(Freedesktop SOURCES ${FREEDESKTOP_NOTIFICATION_FRONTEND_SRC} TYPE Frontend LIBS Qt5::DBus)
#install the dbus interface

2
src/plugins/frontends/freedesktop_frontend/freedesktopnotificationfrontend.h
View File

@ -27,7 +27,7 @@ class FreedesktopFrontend : public Snore::SnoreFrontend
{
Q_OBJECT
Q_INTERFACES(Snore::SnoreFrontend)
Q_PLUGIN_METADATA(IID "org.Snore.NotificationFrontend/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "org.Snore.NotificationFrontend/1.0" FILE "snore_plugin.json")
public:
FreedesktopFrontend();
~FreedesktopFrontend() = default;

1
src/plugins/frontends/freedesktop_frontend/plugin.json
View File

@ -1 +0,0 @@
{ "type" : "frontend", "name" : "Freedesktop" }

2
src/plugins/frontends/pushover_frontend/CMakeLists.txt
View File

@ -5,5 +5,5 @@ set_package_properties(Qt5WebSockets PROPERTIES
TYPE OPTIONAL)
if(Qt5WebSockets_FOUND)
add_snore_plugin(pushover SOURCES pushover_frontend.cpp SETTINGS_SOURCES pushoversettings.cpp TYPE frontend LIBS Qt5::WebSockets)
add_snore_plugin(Pushover SOURCES pushover_frontend.cpp SETTINGS_SOURCES pushoversettings.cpp TYPE Frontend LIBS Qt5::WebSockets)
endif()

1
src/plugins/frontends/pushover_frontend/plugin.json
View File

@ -1 +0,0 @@
{ "type" : "frontend", "name" : "Pushover" }

2
src/plugins/frontends/pushover_frontend/pushover_frontend.h
View File

@ -30,7 +30,7 @@ class PushoverFrontend : public Snore::SnoreFrontend
{
Q_OBJECT
Q_INTERFACES(Snore::SnoreFrontend)
Q_PLUGIN_METADATA(IID "org.Snore.NotificationFrontend/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "org.Snore.NotificationFrontend/1.0" FILE "snore_plugin.json")
public:
PushoverFrontend();
~PushoverFrontend() = default;

2
src/plugins/frontends/snarlnetwork/CMakeLists.txt
View File

@ -1 +1 @@
add_snore_plugin(snarlnetwork SOURCES snarlnetwork.cpp parser.cpp TYPE frontend)
add_snore_plugin(SnarlNetwork SOURCES snarlnetwork.cpp parser.cpp TYPE Frontend)

1
src/plugins/frontends/snarlnetwork/plugin.json
View File

@ -1 +0,0 @@
{ "type" : "frontend", "name" : "SnarlNetwork" }

2
src/plugins/frontends/snarlnetwork/snarlnetwork.h
View File

@ -28,7 +28,7 @@ class SnarlNetworkFrontend : public Snore::SnoreFrontend
{
Q_OBJECT
Q_INTERFACES(Snore::SnoreFrontend)
Q_PLUGIN_METADATA(IID "org.Snore.NotificationFrontend/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "org.Snore.NotificationFrontend/1.0" FILE "snore_plugin.json")
friend class Parser;
public:
static const int port = 9887;

2
src/plugins/secondary_backends/nma/CMakeLists.txt
View File

@ -1 +1 @@
add_snore_plugin(nma SOURCES nma.cpp SETTINGS_SOURCES nmasettings.cpp TYPE secondary_backend)
add_snore_plugin(NMA SOURCES nma.cpp SETTINGS_SOURCES nmasettings.cpp TYPE SecondaryBackend)

2
src/plugins/secondary_backends/nma/nma.h
View File

@ -26,7 +26,7 @@ class NotifyMyAndroid : public Snore::SnoreSecondaryBackend
{
Q_OBJECT
Q_INTERFACES(Snore::SnoreSecondaryBackend)
Q_PLUGIN_METADATA(IID "org.Snore.SecondaryNotificationBackend/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "org.Snore.SecondaryNotificationBackend/1.0" FILE "snore_plugin.json")
public:
NotifyMyAndroid() = default;
~NotifyMyAndroid() = default;

1
src/plugins/secondary_backends/nma/plugin.json
View File

@ -1 +0,0 @@
{ "type" : "secondary_backend", "name" : "NotifyMyAndroid" }

2
src/plugins/secondary_backends/pushover_backend/CMakeLists.txt
View File

@ -1,2 +1,2 @@
add_snore_plugin(puhover SOURCES pushover.cpp SETTINGS_SOURCES pushoversettings.cpp TYPE secondary_backend)
add_snore_plugin(Puhover SOURCES pushover.cpp SETTINGS_SOURCES pushoversettings.cpp TYPE SecondaryBackend)

1
src/plugins/secondary_backends/pushover_backend/plugin.json
View File

@ -1 +0,0 @@
{ "type" : "secondary_backend", "name" : "Pushover" }

2
src/plugins/secondary_backends/pushover_backend/pushover.h
View File

@ -26,7 +26,7 @@ class Pushover : public Snore::SnoreSecondaryBackend
{
Q_OBJECT
Q_INTERFACES(Snore::SnoreSecondaryBackend)
Q_PLUGIN_METADATA(IID "org.Snore.SecondaryNotificationBackend/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "org.Snore.SecondaryNotificationBackend/1.0" FILE "snore_plugin.json")
public:
Pushover() = default;
~Pushover() = default;

2
src/plugins/secondary_backends/sound/CMakeLists.txt
View File

@ -3,5 +3,5 @@ set_package_properties(Qt5Multimedia PROPERTIES
PURPOSE "Support for sound Notifications"
TYPE OPTIONAL)
if(Qt5Multimedia_FOUND)
add_snore_plugin(sound SOURCES sound.cpp SETTINGS_SOURCES soundsettings.cpp TYPE secondary_backend LIBS Qt5::Multimedia)
add_snore_plugin(Sound SOURCES sound.cpp SETTINGS_SOURCES soundsettings.cpp TYPE SecondaryBackend LIBS Qt5::Multimedia)
endif()

1
src/plugins/secondary_backends/sound/plugin.json
View File

@ -1 +0,0 @@
{ "type" : "secondary_backend", "name" : "Sound" }

2
src/plugins/secondary_backends/sound/sound.h
View File

@ -26,7 +26,7 @@ class Sound : public Snore::SnoreSecondaryBackend
{
Q_OBJECT
Q_INTERFACES(Snore::SnoreSecondaryBackend)
Q_PLUGIN_METADATA(IID "org.Snore.SecondaryNotificationBackend/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "org.Snore.SecondaryNotificationBackend/1.0" FILE "snore_plugin.json")
public:
Sound();
~Sound() = default;

2
src/plugins/secondary_backends/toasty/CMakeLists.txt
View File

@ -1 +1 @@
add_snore_plugin(toasty SOURCES toasty.cpp SETTINGS_SOURCES toastysettings.cpp TYPE secondary_backend)
add_snore_plugin(Toasty SOURCES toasty.cpp SETTINGS_SOURCES toastysettings.cpp TYPE SecondaryBackend)

1
src/plugins/secondary_backends/toasty/plugin.json
View File

@ -1 +0,0 @@
{ "type" : "secondary_backend", "name" : "Toasty" }

2
src/plugins/secondary_backends/toasty/toasty.h
View File

@ -26,7 +26,7 @@ class Toasty : public Snore::SnoreSecondaryBackend
{
Q_OBJECT
Q_INTERFACES(Snore::SnoreSecondaryBackend)
Q_PLUGIN_METADATA(IID "org.Snore.SecondaryNotificationBackend/1.0" FILE "plugin.json")
Q_PLUGIN_METADATA(IID "org.Snore.SecondaryNotificationBackend/1.0" FILE "snore_plugin.json")
public:
Toasty() = default;
~Toasty() = default;