add --resume command line option

Close #8

Author: thekvs

src/CMakeLists.txt

@@ -35,6 +35,7 @@ add_executable(
     playlist.cpp
     notification.cpp
     config.cpp
+    options.cpp
     ${PLAYLIST_DECODERS}
     ${THIRD_PARTY}
 )
@@ -66,6 +67,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         player.cpp
         playlist.cpp
         config.cpp
+        options.cpp
         ${PLAYLIST_DECODERS}
         ${THIRD_PARTY}
         )

src/options.cpp

@@ -0,0 +1,46 @@
+#include "options.hpp"
+
+namespace radiotray
+{
+
+// clang-format off
+static const struct option longopts[] = {
+    { "resume", no_argument, NULL, 'r' },
+    { "help", no_argument, NULL, 'h' },
+    { NULL, 0, NULL, 0 }
+};
+// clang-format on
+
+bool
+CmdLineOptions::parse(int argc, char** argv)
+{
+    int opt, optidx;
+
+    while ((opt = getopt_long(argc, argv, "rh", longopts, &optidx)) != -1) {
+        switch (opt) {
+        case 'r':
+            resume = true;
+            break;
+        case 'h':
+            help = true;
+            break;
+        default:
+            return false;
+        }
+    }
+
+    return true;
+}
+
+void
+CmdLineOptions::show_help()
+{
+    std::cout << "Online radio streaming player" << std::endl;
+    std::cout << "Usage:" << std::endl;
+    std::cout << "  radiotray-lite [OPTIONS...]" << std::endl << std::endl;
+    std::cout << "  -h, --help    show this help and exit" << std::endl;
+    std::cout << "  -r, --resume  resume last played station on startup" << std::endl;
+    std::cout << std::endl;
+}
+
+} // namespace

src/options.hpp

@@ -0,0 +1,25 @@
+#ifndef __OPTIONS_HPP_INCLUDED__
+#define __OPTIONS_HPP_INCLUDED__
+
+#include <iostream>
+#include <memory>
+
+#include <getopt.h>
+
+namespace radiotray
+{
+class CmdLineOptions
+{
+public:
+    CmdLineOptions() = default;
+
+    bool parse(int argc, char** argv);
+    void show_help();
+
+    bool resume = false;
+    bool help = false;
+};
+
+} // namespace
+
+#endif

src/radiotray-lite.cpp

@@ -1,4 +1,5 @@
 #include "tray.hpp"
+#include "options.hpp"
 
 INITIALIZE_EASYLOGGINGPP
 
@@ -26,9 +27,20 @@ main(int argc, char* argv[])
     // default logger uses default configurations
     el::Loggers::reconfigureLogger("default", easylogging_config);
 
+    auto opts = std::make_shared<CmdLineOptions>();
     RadioTrayLite rtl;
 
-    auto ok = rtl.init(argc, argv);
+    auto ok = opts->parse(argc, argv);
+    if (not ok) {
+        return EXIT_FAILURE;
+    }
+
+    if (opts->help) {
+        opts->show_help();
+        return EXIT_SUCCESS;
+    }
+
+    ok = rtl.init(argc, argv, opts);
     if (not ok) {
         LOG(ERROR) << "Initialization failed";
         return EXIT_FAILURE;

src/tray.cpp

@@ -67,13 +67,15 @@ RadioTrayLite::~RadioTrayLite()
 }
 
 bool
-RadioTrayLite::init(int argc, char** argv)
+RadioTrayLite::init(int argc, char** argv, std::shared_ptr<CmdLineOptions>& opts)
 {
+    cmd_line_options = opts;
     config = std::make_shared<Config>();
 
     load_configuration();
 
-    app = Gtk::Application::create(argc, argv, "github.com.thekvs.radiotray-lite");
+    // app = Gtk::Application::create(argc, argv, "github.com.thekvs.radiotray-lite");
+    app = Gtk::Application::create("github.com.thekvs.radiotray-lite");
     app->register_application();
     if (app->is_remote()) {
         LOG(WARNING) << "This application is already running!";
@@ -124,6 +126,11 @@ RadioTrayLite::run()
     build_menu();
 
     app->hold();
+
+    // resume the last played staion in timer callback
+    sigc::slot<bool> resume_slot = sigc::bind(sigc::mem_fun(*this, &RadioTrayLite::resume), cmd_line_options->resume);
+    sigc::connection conn = Glib::signal_timeout().connect(resume_slot, 200);
+
     auto rc = app->run();
 
     return rc;
@@ -175,6 +182,34 @@ RadioTrayLite::on_current_station_button()
     }
 }
 
+bool
+RadioTrayLite::resume(bool resume_last_station)
+{
+    if (resume_last_station) {
+        if (config->has_last_station()) {
+            Glib::ustring data_url;
+            try {
+                std::stringstream xpath_query;
+                xpath_query << "//bookmark[@name='" << config->get_last_played_station() << "']";
+
+                pugi::xpath_node node = bookmarks_doc.select_node(xpath_query.str().c_str());
+                if (not node.node().empty()) {
+                    data_url = node.node().attribute("url").as_string();
+                }
+            } catch (pugi::xpath_exception& exc) {
+                LOG(WARNING) << "XPath error: " << exc.what();
+            }
+
+            LOG(DEBUG) << "Resuming the last played station: " << config->get_last_played_station() << " (stream url: " << data_url << ")";
+            player->play(data_url, config->get_last_played_station());
+        }
+    }
+
+    // When we return false from the timer callback it deletes itself automatically
+    // and won't be executed any more. So we have one time event here.
+    return false;
+}
+
 void
 RadioTrayLite::build_menu()
 {

src/tray.hpp

@@ -20,6 +20,7 @@
 #include "constants.hpp"
 #include "notification.hpp"
 #include "player.hpp"
+#include "options.hpp"
 
 namespace radiotray
 {
@@ -32,7 +33,7 @@ class RadioTrayLite
 
     ~RadioTrayLite();
 
-    bool init(int argc, char** argv);
+    bool init(int argc, char** argv, std::shared_ptr<CmdLineOptions>& opts);
     int run();
 
 private:
@@ -52,6 +53,7 @@ class RadioTrayLite
     std::shared_ptr<EventManager> em;
     std::shared_ptr<Notification> notifier;
     std::shared_ptr<Config> config;
+    std::shared_ptr<CmdLineOptions> cmd_line_options;
 
     class BookmarksWalker : public pugi::xml_tree_walker
     {
@@ -78,6 +80,8 @@ class RadioTrayLite
     void on_reload_button();
     void on_current_station_button();
 
+    bool resume(bool resume_last_station);
+
     void build_menu();
     void rebuild_menu();
     void clear_menu();