Add status command

This commit is contained in:
Rico Tiongson 2019-02-13 09:09:35 +08:00
parent 42eba25c9b
commit 3d4cbecc9b
7 changed files with 69 additions and 0 deletions

4
.gitignore vendored
View File

@ -1,2 +1,6 @@
# C++ generated headers # C++ generated headers
*.gch *.gch
# IDE-specific
.idea
.vscode

View File

@ -54,6 +54,9 @@ int main(int argc, char** args)
else if (arg == "debug") else if (arg == "debug")
comfortable_swipe::service::debug(); comfortable_swipe::service::debug();
else if (arg == "status")
comfortable_swipe::service::status();
else /* if (arg == "help") */ else /* if (arg == "help") */
comfortable_swipe::service::help(); comfortable_swipe::service::help();
} }

View File

@ -34,6 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "service/help.cpp" #include "service/help.cpp"
#include "service/restart.cpp" #include "service/restart.cpp"
#include "service/start.cpp" #include "service/start.cpp"
#include "service/status.cpp"
#include "service/stop.cpp" #include "service/stop.cpp"
#include "util/autostart_filename.cpp" #include "util/autostart_filename.cpp"
#include "util/conf_filename.cpp" #include "util/conf_filename.cpp"

View File

@ -54,6 +54,7 @@ extern "C"
void help(); void help();
void restart(); void restart();
void start(); void start();
void status();
void stop(); void stop();
} }
} }

View File

@ -39,6 +39,7 @@ namespace comfortable_swipe::service
std::puts("buffer - parses output of libinput debug-events"); std::puts("buffer - parses output of libinput debug-events");
std::puts("help - shows the help dialog"); std::puts("help - shows the help dialog");
std::puts("debug - logs raw output from input events taken from libinput"); std::puts("debug - logs raw output from input events taken from libinput");
std::puts("status - checks status of program and autostart");
std::puts(""); std::puts("");
std::printf("Configuration file can be found in %s\n", conf_filename()); std::printf("Configuration file can be found in %s\n", conf_filename());
} }

58
lib/service/status.cpp Normal file
View File

@ -0,0 +1,58 @@
#ifndef __COMFORTABLE_SWIPE__service_status__
#define __COMFORTABLE_SWIPE__service_status__
/*
Comfortable Swipe
by Rico Tiongson
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 "../index.hpp"
#include <stdexcept> // std::runtime_error
#include <unistd.h> // popen, pclose, getpid, access, F_OK
#include <memory> // std::unique_ptr
#include <array> // std::array
#include <cstdlib> // std::atoi
#include <cstdio> // FILE, std::feof, std::fgets, std::printf
namespace comfortable_swipe::service
{
/**
* Restarts the comfortable-swipe service.
*/
void status()
{
// check if comfortable-swipe is running
bool running = false;
std::array<char, 128> buffer;
std::unique_ptr<FILE, decltype(&pclose)> pipe(popen("pgrep -f comfortable-swipe", "r"), pclose);
if (pipe && !std::feof(pipe.get()) && std::fgets(buffer.data(), buffer.size(), pipe.get()) != NULL)
{
int pid = std::atoi(buffer.data());
if (pid != getpid())
running = true;
}
// check if autostart is on
auto autostart_f = comfortable_swipe::util::autostart_filename();
bool autostart_on = access(autostart_f, F_OK) != -1;
// print status
std::printf("program is %s\n", running ? "ON" : "OFF");
std::printf("autostart is %s\n", autostart_on ? "ON" : "OFF");
}
}
#endif /* __COMFORTABLE_SWIPE__service_restart__ */

View File

@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <unistd.h> // popen, pclose, getpid #include <unistd.h> // popen, pclose, getpid
#include <memory> // std::unique_ptr #include <memory> // std::unique_ptr
#include <array> // std::array #include <array> // std::array
#include <cstdlib> // std::atoi
#include <cstdio> // FILE, std::feof, std::fgets #include <cstdio> // FILE, std::feof, std::fgets
namespace comfortable_swipe::service namespace comfortable_swipe::service