add http client DELETE method support

Author: dragonflylee

app/include/api/http.hpp

@@ -52,10 +52,11 @@ class HTTP {
     static std::string encode_form(const Form& form);
     void _get(const std::string& url, std::ostream* out);
     bool getinfo(char** arg);
-    int propfind(const std::string& url, std::ostream* out, bool self = false);
+    int propfind(const std::string& url, std::ostream* out);
     std::string _post(const std::string& url, const std::string& data);
     void set_user_agent(const std::string& agent);
     void set_basic_auth(const std::string& user, const std::string& passwd);
+    void _delete(const std::string& url, std::ostream* out);
 
     template <typename... Ts>
     static void set_option(HTTP& s, Ts&&... ts) {

app/include/api/jellyfin.hpp

@@ -50,6 +50,26 @@ inline void postJSON(const nlohmann::json& data, Then then, OnError error, std::
     });
 }
 
+template <typename Result, typename... Args>
+inline void deleteJSON(const std::function<void(Result)>& then, OnError error, std::string_view fmt, Args&&... args) {
+    std::string url = fmt::format(fmt::runtime(fmt), std::forward<Args>(args)...);
+    brls::async([then, error, url]() {
+        auto& c = AppConfig::instance();
+        HTTP::Header header = {c.getAuth(c.getToken())};
+
+        try {
+            HTTP s;
+            std::ostringstream body;
+            HTTP::set_option(s, header, HTTP::Timeout{});
+            s._delete(c.getUrl() + url, &body);
+            auto j = nlohmann::json::parse(body.str()).get<Result>();
+            brls::sync(std::bind(std::move(then), std::move(j)));
+        } catch (const std::exception& ex) {
+            if (error) brls::sync(std::bind(error, std::string(ex.what())));
+        }
+    });
+}
+
 };  // namespace jellyfin
 
 #include "jellyfin/system.hpp"

app/include/view/context_menu.hpp

@@ -22,6 +22,8 @@ class ContextMenu : public brls::Box {
 
     bool doPlayed();
     bool doFavorite();
+    bool unPlayed();
+    bool unFavorite();
 
     std::string itemId;
 };

app/src/api/http.cpp

@@ -237,7 +237,7 @@ void HTTP::_get(const std::string& url, std::ostream* out) {
 
 bool HTTP::getinfo(char** arg) { return curl_easy_getinfo(this->easy, CURLINFO_CONTENT_TYPE, arg) == CURLE_OK; }
 
-int HTTP::propfind(const std::string& url, std::ostream* out, bool self) {
+int HTTP::propfind(const std::string& url, std::ostream* out) {
     curl_easy_setopt(this->easy, CURLOPT_URL, url.c_str());
     curl_easy_setopt(this->easy, CURLOPT_CUSTOMREQUEST, "PROPFIND");
     return this->perform(out);
@@ -251,4 +251,11 @@ std::string HTTP::_post(const std::string& url, const std::string& data) {
     int code = this->perform(&body);
     if (code >= 400) throw curl_error(fmt::format("http status {}", code));
     return body.str();
-}
+}
+
+void HTTP::_delete(const std::string& url, std::ostream* out) {
+    curl_easy_setopt(this->easy, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(this->easy, CURLOPT_CUSTOMREQUEST, "DELETE");
+    int code = this->perform(out);
+    if (code >= 400) throw curl_error(fmt::format("http status {}", code));
+}

app/src/view/context_menu.cpp

@@ -17,11 +17,21 @@ ContextMenu::ContextMenu(const jellyfin::Item& item) : itemId(item.Id) {
     });
     this->cancel->addGestureRecognizer(new brls::TapGestureRecognizer(this->cancel));
 
-    this->btnFavorite->registerClickAction([this](brls::View* view) { return this->doFavorite(); });
+    this->btnFavorite->registerClickAction([this](brls::View* view) {
+        if (this->btnFavorite->getSelected())
+            return this->unFavorite();
+        else
+            return this->doFavorite();
+    });
     this->btnFavorite->addGestureRecognizer(new brls::TapGestureRecognizer(this->btnFavorite));
     this->btnFavorite->setSelected(item.UserData.IsFavorite);
 
-    this->btnMarkPlay->registerClickAction([this](brls::View* view) { return this->doPlayed(); });
+    this->btnMarkPlay->registerClickAction([this](brls::View* view) {
+        if (this->btnMarkPlay->getSelected())
+            return this->unPlayed();
+        else
+            return this->doPlayed();
+    });
     this->btnMarkPlay->addGestureRecognizer(new brls::TapGestureRecognizer(this->btnMarkPlay));
     this->btnMarkPlay->setSelected(item.UserData.Played);
 }
@@ -63,5 +73,37 @@ bool ContextMenu::doFavorite() {
         },
         jellyfin::apiFavoriteItems, AppConfig::instance().getUserId(), this->itemId);
 
+    return true;
+}
+
+bool ContextMenu::unPlayed() {
+    ASYNC_RETAIN
+    jellyfin::deleteJSON<jellyfin::UserDataResult>(
+        [ASYNC_TOKEN](const jellyfin::UserDataResult& r) {
+            ASYNC_RELEASE
+            this->btnMarkPlay->setSelected(r.IsFavorite);
+        },
+        [ASYNC_TOKEN](const std::string& ex) {
+            ASYNC_RELEASE
+            brls::Application::popActivity(brls::TransitionAnimation::NONE, [ex]() { brls::Application::notify(ex); });
+        },
+        jellyfin::apiPlayedItems, AppConfig::instance().getUserId(), this->itemId);
+
+    return true;
+}
+
+bool ContextMenu::unFavorite() {
+    ASYNC_RETAIN
+    jellyfin::deleteJSON<jellyfin::UserDataResult>(
+        [ASYNC_TOKEN](const jellyfin::UserDataResult& r) {
+            ASYNC_RELEASE
+            this->btnFavorite->setSelected(r.IsFavorite);
+        },
+        [ASYNC_TOKEN](const std::string& ex) {
+            ASYNC_RELEASE
+            brls::Application::popActivity(brls::TransitionAnimation::NONE, [ex]() { brls::Application::notify(ex); });
+        },
+        jellyfin::apiFavoriteItems, AppConfig::instance().getUserId(), this->itemId);
+
     return true;
 }