ical PoC

src/librssguard/miscellaneous/textfactory.cpp

@@ -143,10 +143,10 @@ QStringList TextFactory::dateTimePatterns() {
   return QStringList() << QSL("yyyy-MM-ddTHH:mm:ss") << QSL("MMM dd yyyy hh:mm:ss") << QSL("MMM d yyyy hh:mm:ss")
                        << QSL("ddd, dd MMM yyyy HH:mm:ss") << QSL("ddd, dd MMM yyyy HH:mm")
                        << QSL("ddd, d MMM yyyy HH:mm:ss") << QSL("dd MMM yyyy hh:mm:ss") << QSL("dd MMM yyyy")
-                       << QSL("yyyy-MM-dd HH:mm:ss.z") << QSL("yyyy-MM-dd") << QSL("yyyy") << QSL("yyyy-MM")
+                       << QSL("yyyy-MM-dd HH:mm:ss.z") << QSL("yyyy-MM-ddThh:mm:ss") << QSL("yyyy-MM-ddThh:mm")
-                       << QSL("yyyy-MM-dd") << QSL("yyyy-MM-ddThh:mm") << QSL("yyyy-MM-ddThh:mm:ss")
+                       << QSL("yyyy-MM-dd") << QSL("yyyy-MM-dd") << QSL("yyyy-MM") << QSL("d MMM yyyy HH:mm:ss")
-                       << QSL("d MMM yyyy HH:mm:ss") << QSL("yyyyMMddThhmmss") << QSL("yyyyMMdd") << QSL("hh:mm:ss")
+                       << QSL("yyyyMMddThhmmss") << QSL("yyyyMMdd") << QSL("yyyy") << QSL("hh:mm:ss") << QSL("h:m:s AP")
-                       << QSL("h:m:s AP") << QSL("h:mm") << QSL("H:mm") << QSL("h:m") << QSL("h.m");
+                       << QSL("h:mm") << QSL("H:mm") << QSL("h:m") << QSL("h.m");
 }
 
 QString TextFactory::encrypt(const QString& text, quint64 key) {

src/librssguard/services/standard/parsers/feedparser.cpp

@@ -119,6 +119,46 @@ QString FeedParser::jsonMessageRawContents(const QJsonObject& msg_element) const
   return {};
 }
 
+QVariantList FeedParser::objMessageElements() {
+  return {};
+}
+
+QString FeedParser::objMessageTitle(const QVariant& msg_element) const {
+  return {};
+}
+
+QString FeedParser::objMessageUrl(const QVariant& msg_element) const {
+  return {};
+}
+
+QString FeedParser::objMessageDescription(const QVariant& msg_element) const {
+  return {};
+}
+
+QString FeedParser::objMessageAuthor(const QVariant& msg_element) const {
+  return {};
+}
+
+QDateTime FeedParser::objMessageDateCreated(const QVariant& msg_element) const {
+  return {};
+}
+
+QString FeedParser::objMessageId(const QVariant& msg_element) const {
+  return {};
+}
+
+QList<Enclosure> FeedParser::objMessageEnclosures(const QVariant& msg_element) const {
+  return {};
+}
+
+QList<MessageCategory> FeedParser::objMessageCategories(const QVariant& msg_element) const {
+  return {};
+}
+
+QString FeedParser::objMessageRawContents(const QVariant& msg_element) const {
+  return {};
+}
+
 QList<Message> FeedParser::messages() {
   QString feed_author = feedAuthor();
   QList<Message> messages;
@@ -179,6 +219,30 @@ QList<Message> FeedParser::messages() {
       }
     }
   }
+  else if (m_dataType == DataType::Other) {
+    auto messages_in_obj = objMessageElements();
+
+    for (const QVariant& message_item : messages_in_obj) {
+      try {
+        Message new_message;
+
+        // Fill available data.
+        new_message.m_title = objMessageTitle(message_item);
+        new_message.m_contents = objMessageDescription(message_item);
+        new_message.m_author = objMessageAuthor(message_item);
+        new_message.m_url = objMessageUrl(message_item);
+        new_message.m_created = objMessageDateCreated(message_item);
+        new_message.m_customId = objMessageId(message_item);
+        new_message.m_rawContents = objMessageRawContents(message_item);
+        new_message.m_enclosures = objMessageEnclosures(message_item);
+
+        messages.append(new_message);
+      }
+      catch (const ApplicationException& ex) {
+        qDebugNN << LOGSEC_CORE << "Problem when extracting OBJ message: " << ex.message();
+      }
+    }
+  }
 
   // Fixup missing data.
   //

src/librssguard/services/standard/parsers/feedparser.h

@@ -19,7 +19,6 @@ class FeedParser {
     enum class DataType {
       Xml,
       Json,
-      Ical,
       Other
     };
 
@@ -63,19 +62,18 @@ class FeedParser {
     virtual QList<MessageCategory> jsonMessageCategories(const QJsonObject& msg_element) const;
     virtual QString jsonMessageRawContents(const QJsonObject& msg_element) const;
 
-    /*
     // Objects.
     virtual QVariantList objMessageElements();
-    virtual QString objMessageTitle(const QVariantMap& msg_element) const;
+    virtual QString objMessageTitle(const QVariant& msg_element) const;
-    virtual QString objMessageUrl(const QVariantMap& msg_element) const;
+    virtual QString objMessageUrl(const QVariant& msg_element) const;
-    virtual QString objMessageDescription(const QVariantMap& msg_element) const;
+    virtual QString objMessageDescription(const QVariant& msg_element) const;
-    virtual QString objMessageAuthor(const QVariantMap& msg_element) const;
+    virtual QString objMessageAuthor(const QVariant& msg_element) const;
-    virtual QDateTime objMessageDateCreated(const QVariantMap& msg_element) const;
+    virtual QDateTime objMessageDateCreated(const QVariant& msg_element) const;
-    virtual QString objMessageId(const QVariantMap& msg_element) const;
+    virtual QString objMessageId(const QVariant& msg_element) const;
-    virtual QList<Enclosure> objMessageEnclosures(const QVariantMap& msg_element) const;
+    virtual QList<Enclosure> objMessageEnclosures(const QVariant& msg_element) const;
-    virtual QList<MessageCategory> objMessageCategories(const QVariantMap& msg_element) const;
+    virtual QList<MessageCategory> objMessageCategories(const QVariant& msg_element) const;
-    virtual QString objMessageRawContents(const QVariantMap& msg_element) const;
+    virtual QString objMessageRawContents(const QVariant& msg_element) const;
-*/
+
   protected:
     QList<Enclosure> xmlMrssGetEnclosures(const QDomElement& msg_element) const;
     QString xmlMrssTextFromPath(const QDomElement& msg_element, const QString& xml_path) const;

src/librssguard/services/standard/parsers/icalparser.cpp

@@ -10,7 +10,8 @@
 #include "miscellaneous/textfactory.h"
 #include "services/standard/definitions.h"
 
-IcalParser::IcalParser(const QString& data) : FeedParser(data, DataType::Other) {}
+IcalParser::IcalParser(const QString& data)
+  : FeedParser(data, DataType::Other), m_iCalendar(Icalendar(m_data.toUtf8())) {}
 
 IcalParser::~IcalParser() {}
 
@@ -80,7 +81,68 @@ QPair<StandardFeed*, QList<IconLocation>> IcalParser::guessFeed(const QByteArray
   }
 }
 
-Icalendar::Icalendar(const QByteArray& data) : FeedParser(QString::fromUtf8(data), FeedParser::DataType::Ical) {
+QVariantList IcalParser::objMessageElements() {
+  QVariantList lst;
+
+  for (const auto& comp : m_iCalendar.m_components) {
+    lst.append(QVariant::fromValue(comp));
+  }
+
+  return lst;
+}
+
+QString IcalParser::objMessageTitle(const QVariant& msg_element) const {
+  EventComponent& comp = static_cast<EventComponent&>(msg_element.value<IcalendarComponent>());
+
+  return comp.title();
+}
+
+QString IcalParser::objMessageUrl(const QVariant& msg_element) const {
+  EventComponent& comp = static_cast<EventComponent&>(msg_element.value<IcalendarComponent>());
+
+  return comp.url();
+}
+
+QString IcalParser::objMessageDescription(const QVariant& msg_element) const {
+  EventComponent& comp = static_cast<EventComponent&>(msg_element.value<IcalendarComponent>());
+
+  return comp.description();
+}
+
+QString IcalParser::objMessageAuthor(const QVariant& msg_element) const {
+  EventComponent& comp = static_cast<EventComponent&>(msg_element.value<IcalendarComponent>());
+
+  return comp.organizer();
+}
+
+QDateTime IcalParser::objMessageDateCreated(const QVariant& msg_element) const {
+  EventComponent& comp = static_cast<EventComponent&>(msg_element.value<IcalendarComponent>());
+
+  return comp.created();
+}
+
+QString IcalParser::objMessageId(const QVariant& msg_element) const {
+  EventComponent& comp = static_cast<EventComponent&>(msg_element.value<IcalendarComponent>());
+
+  return comp.uid();
+}
+
+QList<Enclosure> IcalParser::objMessageEnclosures(const QVariant& msg_element) const {
+  return {};
+}
+
+QList<MessageCategory> IcalParser::objMessageCategories(const QVariant& msg_element) const {
+  return {};
+}
+
+QString IcalParser::objMessageRawContents(const QVariant& msg_element) const {
+  EventComponent& comp = static_cast<EventComponent&>(msg_element.value<IcalendarComponent>());
+
+  return QString::fromUtf8(QJsonDocument(QJsonObject::fromVariantMap(comp.properties()))
+                             .toJson(QJsonDocument::JsonFormat::Indented));
+}
+
+Icalendar::Icalendar(const QByteArray& data) : FeedParser(QString::fromUtf8(data), FeedParser::DataType::Other) {
   processLines(m_data);
 }
 
@@ -117,7 +179,7 @@ void Icalendar::processLines(const QString& data) {
 void Icalendar::processComponentCalendar(const QString& body) {
   auto tokenized = tokenizeBody(body);
 
-  setTitle(tokenized.value(QSL("X-WR-CALNAME")));
+  setTitle(tokenized.value(QSL("X-WR-CALNAME")).toString());
 }
 
 void Icalendar::processComponentEvent(const QString& body) {
@@ -125,18 +187,15 @@ void Icalendar::processComponentEvent(const QString& body) {
 
   EventComponent event;
 
-  event.setUid(tokenized.value(QSL("UID")));
+  event.setProperties(tokenized);
-  event.setTitle(tokenized.value(QSL("SUMMARY")));
-  event.setDescription(tokenized.value(QSL("DESCRIPTION")));
-  event.setCreated(TextFactory::parseDateTime(tokenized.value(QSL("CREATED"))));
 
   m_components.append(event);
 }
 
-QMap<QString, QString> Icalendar::tokenizeBody(const QString& body) const {
+QVariantMap Icalendar::tokenizeBody(const QString& body) const {
   QRegularExpression regex("^(?=[A-Z-]+:)", QRegularExpression::PatternOption::MultilineOption);
   auto all_matches = body.split(regex);
-  QMap<QString, QString> res;
+  QVariantMap res;
 
   for (const QString& match : all_matches) {
     int sep = match.indexOf(':');
@@ -149,7 +208,7 @@ QMap<QString, QString> Icalendar::tokenizeBody(const QString& body) const {
     QString value = match.mid(sep + 1);
 
     value = value.replace(QRegularExpression("\\r\\n\\s?"), QString());
-    value = value.replace(QRegularExpression("\\r?\\n"), QSL("<br/>"));
+    value = value.replace(QRegularExpression("\\\\n"), QSL("<br/>"));
 
     res.insert(property, value);
   }
@@ -158,33 +217,33 @@ QMap<QString, QString> Icalendar::tokenizeBody(const QString& body) const {
 }
 
 QString IcalendarComponent::uid() const {
-  return m_uid;
+  return m_properties.value(QSL("UID")).toString();
 }
 
-void IcalendarComponent::setUid(const QString& uid) {
+QVariantMap IcalendarComponent::properties() const {
-  m_uid = uid;
+  return m_properties;
+}
+
+void IcalendarComponent::setProperties(const QVariantMap& properties) {
+  m_properties = properties;
 }
 
 QString EventComponent::title() const {
-  return m_title;
+  return m_properties.value(QSL("SUMMARY")).toString();
 }
 
-void EventComponent::setTitle(const QString& title) {
+QString EventComponent::url() const {
-  m_title = title;
+  return m_properties.value(QSL("URL")).toString();
+}
+
+QString EventComponent::organizer() const {
+  return m_properties.value(QSL("ORGANIZER")).toString();
 }
 
 QString EventComponent::description() const {
-  return m_description;
+  return m_properties.value(QSL("DESCRIPTION")).toString();
-}
-
-void EventComponent::setDescription(const QString& description) {
-  m_description = description;
 }
 
 QDateTime EventComponent::created() const {
-  return m_created;
+  return TextFactory::parseDateTime(m_properties.value(QSL("CREATED")).toString());
-}
-
-void EventComponent::setCreated(const QDateTime& created) {
-  m_created = created;
 }

src/librssguard/services/standard/parsers/icalparser.h

@@ -8,30 +8,30 @@
 class IcalendarComponent {
   public:
     QString uid() const;
-    void setUid(const QString& uid);
 
-  private:
+    QVariantMap properties() const;
-    QString m_uid;
+    void setProperties(const QVariantMap& properties);
+
+  protected:
+    QVariantMap m_properties;
 };
 
+Q_DECLARE_METATYPE(IcalendarComponent)
+
 class EventComponent : public IcalendarComponent {
   public:
     QString title() const;
-    void setTitle(const QString& title);
+    QString url() const;
-
+    QString organizer() const;
     QString description() const;
-    void setDescription(const QString& description);
-
     QDateTime created() const;
-    void setCreated(const QDateTime& created);
-
-  private:
-    QString m_title;
-    QString m_description;
-    QDateTime m_created;
 };
 
+Q_DECLARE_METATYPE(EventComponent)
+
 class Icalendar : public FeedParser {
+    friend class IcalParser;
+
   public:
     explicit Icalendar(const QByteArray& data = {});
 
@@ -44,7 +44,7 @@ class Icalendar : public FeedParser {
     void processComponentEvent(const QString& body);
 
     QDateTime parseDateTime(const QString& date_time) const;
-    QMap<QString, QString> tokenizeBody(const QString& body) const;
+    QVariantMap tokenizeBody(const QString& body) const;
 
   private:
     QString m_title;
@@ -60,6 +60,20 @@ class IcalParser : public FeedParser {
 
     virtual QPair<StandardFeed*, QList<IconLocation>> guessFeed(const QByteArray& content,
                                                                 const QString& content_type) const;
+
+    virtual QVariantList objMessageElements();
+    virtual QString objMessageTitle(const QVariant& msg_element) const;
+    virtual QString objMessageUrl(const QVariant& msg_element) const;
+    virtual QString objMessageDescription(const QVariant& msg_element) const;
+    virtual QString objMessageAuthor(const QVariant& msg_element) const;
+    virtual QDateTime objMessageDateCreated(const QVariant& msg_element) const;
+    virtual QString objMessageId(const QVariant& msg_element) const;
+    virtual QList<Enclosure> objMessageEnclosures(const QVariant& msg_element) const;
+    virtual QList<MessageCategory> objMessageCategories(const QVariant& msg_element) const;
+    virtual QString objMessageRawContents(const QVariant& msg_element) const;
+
+  private:
+    Icalendar m_iCalendar;
 };
 
 #endif // ICALPARSER_H