completed epgsearch implementation

MichaEiler · MichaEiler · commit 6bc17fcaf97a · 2011-07-24T19:26:33.000+02:00
diff --git a/events.cpp b/events.cpp
@@ -80,7 +80,7 @@ void EventsResponder::replyEvents(std::ostream& out, cxxtools::http::Request& re
     int ts = event->StartTime();
     int te = ts + event->Duration();
     if ( (ts <= to && te > from) || (te > from && timespan == 0) ) {
-       eventList->addEvent(event);
+       eventList->addEvent(event, channel);
     }else{
       if(ts > to) break;
       if(te <= from) {
@@ -195,7 +195,7 @@ void EventsResponder::replySearchResult(std::ostream& out, cxxtools::http::Reque
            if (result != NULL) {
               for(int i=0;i<result->Count();i++) {
                  item = result->Get(i);
-                 eventList->addEvent(((cEvent*)item->event));
+                 eventList->addEvent(((cEvent*)item->event), channelInstance);
                  total++;
               }
            }
@@ -227,6 +227,7 @@ void operator<<= (cxxtools::SerializationInfo& si, const SerEvent& e)
 
 EventList::EventList(std::ostream *_out) {
   s = new StreamExtension(_out);
+  total = 0;
 }
 
 EventList::~EventList()
@@ -240,7 +241,7 @@ void HtmlEventList::init()
   s->write("<ul>");
 }
 
-void HtmlEventList::addEvent(cEvent* event)
+void HtmlEventList::addEvent(cEvent* event, cChannel* channel)
 {
   if ( filtered() ) return;
   s->write("<li>");
@@ -254,15 +255,15 @@ void HtmlEventList::finish()
   s->write("</body></html>");
 }
 
-void JsonEventList::addEvent(cEvent* event)
+void JsonEventList::addEvent(cEvent* event, cChannel* channel)
 {
   if ( filtered() ) return;
-  
 
   cxxtools::String eventTitle;
   cxxtools::String eventShortText;
   cxxtools::String eventDescription;
   cxxtools::String empty = StringExtension::UTF8Decode("");
+  cxxtools::String channelStr = StringExtension::UTF8Decode((const char*)channel->GetChannelID().ToString());
   SerEvent serEvent;
 
   if( !event->Title() ) { eventTitle = empty; } else { eventTitle = StringExtension::UTF8Decode(event->Title()); }
@@ -273,6 +274,7 @@ void JsonEventList::addEvent(cEvent* event)
   serEvent.Title = eventTitle;
   serEvent.ShortText = eventShortText;
   serEvent.Description = eventDescription;
+  serEvent.Channel = channelStr;
   serEvent.StartTime = event->StartTime();
   serEvent.Duration = event->Duration();
 
@@ -298,7 +300,7 @@ void XmlEventList::init()
   s->write("<events xmlns=\"http://www.domain.org/restfulapi/2011/events-xml\">\n");
 }
 
-void XmlEventList::addEvent(cEvent* event)
+void XmlEventList::addEvent(cEvent* event, cChannel* channel)
 {
   if ( filtered() ) return;
 
@@ -315,6 +317,7 @@ void XmlEventList::addEvent(cEvent* event)
   s->write(cString::sprintf("  <param name=\"title\">%s</param>\n", StringExtension::encodeToXml(eventTitle).c_str()));
   s->write(cString::sprintf("  <param name=\"short_text\">%s</param>\n", StringExtension::encodeToXml(eventShortText).c_str()));
   s->write(cString::sprintf("  <param name=\"description\">%s</param>\n", StringExtension::encodeToXml(eventDescription).c_str()));
+  s->write(cString::sprintf("  <param name=\"channel\">%s</param>\n", StringExtension::encodeToXml((const char*)channel->GetChannelID().ToString()).c_str()));
   s->write(cString::sprintf("  <param name=\"start_time\">%i</param>\n", (int)event->StartTime()));
   s->write(cString::sprintf("  <param name=\"duration\">%i</param>\n", event->Duration()));
 
diff --git a/events.h b/events.h
@@ -11,6 +11,9 @@
 #include "tools.h"
 #include "epgsearch/services.h"
 
+#ifndef __RESTFUL_EVENTS_H
+#define __RESTFUL_EVENTS_H
+
 class EventsResponder : public cxxtools::http::Responder
 {
   public:
@@ -31,6 +34,7 @@ struct SerEvent
   cxxtools::String Title;
   cxxtools::String ShortText;
   cxxtools::String Description;
+  cxxtools::String Channel;
   int StartTime;
   int Duration;
   int Images;
@@ -47,7 +51,7 @@ class EventList : public BaseList
     EventList(std::ostream* _out);
     ~EventList();
     virtual void init() { };
-    virtual void addEvent(cEvent* event) { };
+    virtual void addEvent(cEvent* event, cChannel* channel) { };
     virtual void finish() { };
     virtual void setTotal(int _total) { total = _total; }
 };
@@ -58,7 +62,7 @@ class HtmlEventList : EventList
     HtmlEventList(std::ostream* _out) : EventList(_out) { };
     ~HtmlEventList() { };
     virtual void init();
-    virtual void addEvent(cEvent* event);
+    virtual void addEvent(cEvent* event, cChannel* channel);
     virtual void finish();
 };
 
@@ -69,7 +73,7 @@ class JsonEventList : EventList
   public:
     JsonEventList(std::ostream* _out) : EventList(_out) { };
     ~JsonEventList() { };
-    virtual void addEvent(cEvent* event);
+    virtual void addEvent(cEvent* event, cChannel* channel);
     virtual void finish();
 };
 
@@ -79,6 +83,8 @@ class XmlEventList : EventList
     XmlEventList(std::ostream* _out) : EventList(_out) { };
     ~XmlEventList() { };
     virtual void init();
-    virtual void addEvent(cEvent* event);
+    virtual void addEvent(cEvent* event, cChannel* channel);
     virtual void finish();
 };
+
+#endif //__RESTFUL_EVENTS_H
diff --git a/searchtimers.cpp b/searchtimers.cpp
@@ -6,14 +6,20 @@ void SearchTimersResponder::reply(std::ostream& out, cxxtools::http::Request& re
   if (plugin == NULL) {
      reply.httpReturn(403, "Epgsearch isn't installed!");
      return; 
-  } 
-  
-  if (request.method() == "GET") {
-     replyShow(out, request, reply);
-  } else if (request.method() == "POST") {
-     replyCreate(out, request, reply);
-  } else {
-     reply.httpReturn(404, "The searchtimer-service does only support the following methods: GET, POST and DELETE.");
+  }
+
+  if ((int)request.url().find("/searchtimers/search/") == 0 ) {
+     replySearch(out, request, reply);
+  } else { 
+     if (request.method() == "GET") {
+        replyShow(out, request, reply);
+     } else if (request.method() == "POST") {
+        replyCreate(out, request, reply);
+     } else if (request.method() == "DELETE") {
+        replyDelete(out, request, reply);
+     } else {
+        reply.httpReturn(404, "The searchtimer-service does only support the following methods: GET, POST and DELETE.");
+     }
   }
 }
 
@@ -80,6 +86,59 @@ void SearchTimersResponder::replyCreate(std::ostream& out, cxxtools::http::Reque
   delete searchTimer;
 }
 
+void SearchTimersResponder::replyDelete(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply)
+{
+  QueryHandler q("/searchtimers", request);
+  vdrlive::SearchTimers searchTimers;
+  std::string id = q.getParamAsString(0);
+  bool result = searchTimers.Delete(id);
+
+  if (!result)
+     reply.httpReturn(408, "Deleting searchtimer failed!");
+}
+
+void SearchTimersResponder::replySearch(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply)
+{
+  QueryHandler q("/searchtimers/search", request);
+  vdrlive::SearchResults searchResults;
+  int id = q.getParamAsInt(0);
+
+  EventList* eventList;
+
+  if ( q.isFormat(".json") ) {
+     reply.addHeader("Content-Type", "application/json; charset=utf-8");
+     eventList = (EventList*)new JsonEventList(&out);
+  } else if ( q.isFormat(".html") ) {
+     reply.addHeader("Content-Type", "text/html; charset=utf-8");
+     eventList = (EventList*)new HtmlEventList(&out);
+  } else if ( q.isFormat(".xml") ) {
+     reply.addHeader("Content-Type", "text/xml; charset=utf-8");
+     eventList = (EventList*)new XmlEventList(&out);
+  } else {
+     reply.httpReturn(403, "Resources are not available for the selected format. (Use: .json, .xml or .html)");
+     return;
+  }
+  
+  searchResults.GetByID(id);
+
+  int start_filter = q.getOptionAsInt("start");
+  int limit_filter = q.getOptionAsInt("limit");
+  if ( start_filter >= 0 && limit_filter >= 1 )
+     eventList->activateLimit(start_filter, limit_filter);
+  
+  eventList->init();
+  int total = 0;
+  
+  for (vdrlive::SearchResults::iterator item = searchResults.begin(); item != searchResults.end(); ++item) {
+    eventList->addEvent((cEvent*)item->GetEvent(), (cChannel*)item->GetChannel());
+    total++;
+  }
+
+  eventList->setTotal(total);
+  eventList->finish();
+  delete eventList;
+}
+
 SearchTimerList::SearchTimerList(std::ostream* _out)
 {
   s = new StreamExtension(_out);
diff --git a/searchtimers.h b/searchtimers.h
@@ -11,6 +11,7 @@
 #include "tools.h"
 #include "epgsearch/services.h"
 #include "epgsearch.h"
+#include "events.h"
 
 #ifndef __RESTFUL_SEARCHTIMERS_H
 #define __RESETFUL_SEARCHTIMERS_H
@@ -24,6 +25,8 @@ class SearchTimersResponder : public cxxtools::http::Responder
     virtual void reply(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply);
     virtual void replyShow(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply);
     virtual void replyCreate(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply);
+    virtual void replyDelete(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply);
+    virtual void replySearch(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply);
 };
 
 typedef cxxtools::http::CachedService<SearchTimersResponder> SearchTimersService;
