merge snoresend back into Snorenotify

src/snoresend/.gitignore

@@ -0,0 +1,21 @@
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app

src/snoresend/CMakeLists.txt

@@ -0,0 +1,21 @@
+project( snore-send )
+cmake_minimum_required( VERSION 2.8.12 )
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+include(GenerateExportHeader)
+
+
+
+find_package(ECM 0.0.9 NO_MODULE)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
+include(KDECompilerSettings)
+
+find_package(LibsnoreQt5 0.5.91 REQUIRED)
+
+
+
+add_subdirectory(src)
+
+

src/snoresend/LICENSE

@@ -0,0 +1,165 @@
+GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

src/snoresend/README.md

@@ -0,0 +1,4 @@
+snore-send
+==========
+
+Acommand line interface for libsnore

src/snoresend/src/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_executable( snore-send main.cpp)
+target_link_libraries( snore-send Snore::Libsnore)
+
+install(TARGETS snore-send RUNTIME DESTINATION bin
+                          LIBRARY DESTINATION lib
+                          ARCHIVE DESTINATION lib)

src/snoresend/src/main.cpp

@@ -0,0 +1,151 @@
+
+#include <libsnore/snore.h>
+#include <libsnore/notification/notification.h>
+#include <libsnore/log.h>
+#include <libsnore/version.h>
+#include <libsnore/utils.h>
+
+#include <QApplication>
+#include <QCommandLineParser>
+
+#include <iostream>
+
+#ifdef Q_OS_WIN
+#include <windows.h>
+#include <windowsx.h>
+#include <shellapi.h>
+#include <winuser.h>
+#endif
+
+using namespace Snore;
+using namespace std;
+
+
+void bringToFront(QString pid)
+{
+    snoreDebug(SNORE_DEBUG) << pid;
+#ifdef Q_OS_WIN
+    auto findWindowForPid = [](ulong pid) {
+        // based on http://stackoverflow.com/a/21767578
+        pair<ulong, HWND> data = make_pair(pid, (HWND)0);
+        ::EnumWindows((WNDENUMPROC)static_cast<BOOL(*)(HWND,LPARAM)>([](HWND handle, LPARAM lParam) -> BOOL {
+            auto isMainWindow = [](HWND handle)
+            {
+                return ::GetWindow(handle, GW_OWNER) == (HWND)0 && IsWindowVisible(handle);
+            };
+            pair<ulong, HWND> &data = *(pair<ulong, HWND> *)lParam;
+            ulong process_id = 0;
+            ::GetWindowThreadProcessId(handle, &process_id);
+            if (data.first != process_id || !isMainWindow(handle))
+            {
+                return TRUE;
+            }
+            data.second = handle;
+            return FALSE;
+        }), (LPARAM)&data);
+        return data.second;
+    };
+
+    HWND wid = findWindowForPid(pid.toInt());
+    if (wid) {
+        Utils::bringWindowToFront((WId)wid, true);
+    }
+#endif
+}
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    app.setApplicationName("snore-send");
+    app.setOrganizationName("Snorenotify");
+    app.setApplicationVersion(Snore::Version::version());
+
+    QCommandLineParser parser;
+    parser.setApplicationDescription("A command line interface for Snorenotify.");
+    parser.addHelpOption();
+    parser.addVersionOption();
+
+    QCommandLineOption title(QStringList() << "t" << "title", "Set the notification title.", "title");
+    parser.addOption(title);
+
+    QCommandLineOption message(QStringList() << "m" << "message", "Set the notification body.", "message");
+    parser.addOption(message);
+
+    QCommandLineOption applicationName(QStringList() << "a" << "application", "Set the notification applicattion.", "application", app.applicationName());
+    parser.addOption(applicationName);
+
+    QCommandLineOption alertName(QStringList() << "c" << "alert", "Set the notification alert class.", "alert", "Default");
+    parser.addOption(alertName);
+
+    QCommandLineOption iconPath(QStringList() << "i" << "icon", "Set the notification icon.", "icon", ":/root/snore.png");
+    parser.addOption(iconPath);
+
+    QCommandLineOption priority(QStringList() << "p" << "priority", "Set the notification's' priority.", "[-2, 2]", "0");
+    parser.addOption(priority);
+
+    QCommandLineOption markup(QStringList() << "markup", "Enable markup support.", "[0,1]", "0");
+    parser.addOption(markup);
+
+    QCommandLineOption silent(QStringList() << "silent", "Don't print to stdout.");
+    parser.addOption(silent);
+
+    QCommandLineOption _bringProcessToFront(QStringList() << "bring-process-to-front", "Bring process with pid to front if notification is clicked.", "pid");
+    parser.addOption(_bringProcessToFront);
+
+    QCommandLineOption _bringWindowToFront(QStringList() << "bring-window-to-front", "Bring window with wid to front if notification is clicked.", "wid");
+    parser.addOption(_bringWindowToFront);
+
+    parser.process(app);
+    snoreDebug(SNORE_DEBUG) << app.arguments();
+    if (parser.isSet(title) && parser.isSet(message)) {
+        SnoreCore &core = SnoreCore::instance();
+
+        core.loadPlugins(SnorePlugin::BACKEND | SnorePlugin::SECONDARY_BACKEND);
+
+        Icon icon(parser.value(iconPath));
+        Application application(parser.value(applicationName), icon);
+        Alert alert(parser.value(alertName), icon);
+        application.addAlert(alert);
+
+        if(parser.value(markup).toInt() == 1)
+        {
+            application.hints().setValue("use-markup", QVariant::fromValue(true));
+        }
+
+        core.registerApplication(application);
+
+        int prio = parser.value(priority).toInt();
+        if(prio < -2 || prio > 2){
+            parser.showHelp(-1);
+        }
+        Notification n(application, alert, parser.value(title), parser.value(message), icon, Notification::defaultTimeout(), static_cast<Notification::Prioritys>(prio));
+        if (parser.isSet(_bringProcessToFront) || parser.isSet(_bringWindowToFront)) {
+            n.addAction(Action(1, "Bring to Front"));
+        }
+        int returnCode = -1;
+
+        app.connect(&core, &SnoreCore::notificationClosed, [&](Notification noti) {
+            if (!parser.isSet(silent)) {
+                QString reason;
+                QDebug(&reason) << noti.closeReason();
+                cout << qPrintable(reason) << endl;
+            }
+            if (noti.closeReason() == Notification::CLOSED) {
+                if (parser.isSet(_bringProcessToFront)) {
+                    bringToFront(parser.value(_bringProcessToFront));
+                } else if (parser.isSet(_bringWindowToFront)) {
+                    Utils::bringWindowToFront((WId)parser.value(_bringWindowToFront).toULongLong(),true);
+                }
+            }
+            returnCode = noti.closeReason();
+        });
+        app.connect(&core, &SnoreCore::notificationClosed, &app, &QApplication::quit);
+        app.processEvents();
+        core.broadcastNotification(n);
+
+        app.exec();
+        return returnCode;
+    }
+    parser.showHelp(1);
+}
+