Changeset 3

Timestamp:

02/03/10 23:56:22 (2 years ago)

Author:

roeland

Message:

Retrieving contact info works.
Parsing XML data and adding contacts to the list is work in progress.

Location:

libQtGdata/trunk

Files:

• QtGdata.pro (modified) (1 diff)
• qtgdata.cpp (modified) (1 diff)
• qtgdata.h (modified) (1 diff)
• qtgdata_calendar.cpp (modified) (1 diff)
• qtgdata_calendar.h (modified) (1 diff)
• qtgdata_contact.cpp (modified) (1 diff)
• qtgdata_contacts.cpp (modified) (3 diffs)
• qtgdata_contacts.h (modified) (3 diffs)

libQtGdata/trunk/QtGdata.pro

@@ -12 +12 @@
     qtgdata_calendar.cpp \
     helper/syncnetworkaccessmanager.cpp \
-    qtgdata_contacts.cpp
+    qtgdata_contacts.cpp \
+    qtgdata_contact.cpp
 HEADERS += qtgdata.h \
     QtGdata_global.h \

libQtGdata/trunk/qtgdata.cpp

@@ -114 +114 @@
 }
 
-QByteArray QtGdata::getFeed(const QString url)
+QByteArray QtGdata::getFeed(const QString url, const QString version)
 {
   QNetworkRequest request;
   request.setUrl(QUrl(url));
   request.setRawHeader("User-Agent", "QtGdata 0.0.1");
-  request.setRawHeader("GData-Version", "2");
+  request.setRawHeader("GData-Version", version.toAscii());
 
   QString authHeader = "GoogleLogin auth=" + Auth;

libQtGdata/trunk/qtgdata.h

@@ -34 +34 @@
             const GDATA_ACCOUNT_TYPE accountType = QtGdata::GDATA_ACCOUNT_TYPE_HOSTED_OR_GOOGLE);
 
-    QByteArray getFeed(const QString url);
+    QByteArray getFeed(const QString url, const QString version = "2");
 
     QString email;

libQtGdata/trunk/qtgdata_calendar.cpp

@@ -8 +8 @@
 
 }
-
-QStringList QtGdata_calendar::getCalendars()
-{
-
-}

libQtGdata/trunk/qtgdata_calendar.h

@@ -12 +12 @@
     QtGdata_calendar(const QString username, const QString password);
 
-    QStringList getCalendars();
 };
 

libQtGdata/trunk/qtgdata_contact.cpp

@@ -1 @@
-#include "qtgdata_contact.h"
+#include "qtgdata_contacts.h"
 
+QtGdata_contact::QtGdata_contact()
+{
+
+}
+
+void QtGdata_contact::setName(const QString name)
+{
+  this->name = name;
+}
+
+void QtGdata_contact::setUpdated(const QDateTime updated)
+{
+  this->updated = updated;
+}
+
+/**
+ * @param email Email address
+ * @param type What kind of email (home/work/other)
+ * @param primary Boolean indicating if this is the primary email
+ */
+void QtGdata_contact::addEmail(const QString email,
+                               const QtGdata_contact::GDATA_CONTACT_EMAIL type,
+                               const bool primary)
+{
+  this->email.insert(email, type);
+
+  if (primary) {
+    primary_email = email;
+  }
+}
+
+void QtGdata_contact::addPhone(const QString phonenumber,
+                               const QtGdata_contact::GDATA_CONTACT_PHONE type)
+{
+  phone.insert(phonenumber, type);
+}
+
+
+void QtGdata_contact::setGender(const QString gender)
+{
+  this->gender = gender;
+}
+
+QString QtGdata_contact::getName()
+{
+  return name;
+}
+
+QString QtGdata_contact::getGender()
+{
+  return gender;
+}
+
+QDateTime QtGdata_contact::getUpdated()
+{
+  return updated;
+}

libQtGdata/trunk/qtgdata_contacts.cpp

@@ -19 +19 @@
 
 
-  xml = getFeed(url);
+  xml = getFeed(url, "3");
   parseContacts(xml);
 
   while(!next.isEmpty()) {
-    xml = getFeed(next);
+    xml = getFeed(next, "3");
     parseContacts(xml);
   }
@@ -29 +29 @@
 }
 
+/*
+ * Parse an XML file with contact info
+ */
 void QtGdata_contacts::parseContacts(QByteArray xml)
 {
@@ -73 +76 @@
   }
 
-  QDomNodeList contacts = root.elementsByTagName("entry");
+  /* Parse actual contacts */
+  nl = root.elementsByTagName("entry");
+  for (int i = 0; i < nl.size(); i++) {
+    QtGdata_contact c;
 
-  for (int i = 0; i < contacts.size(); i++) {
-    n = contacts.at(i).toElement();
+    n = nl.at(i).toElement();
+    QDomNodeList nl2 = n.childNodes();
 
-    nl = n.elementsByTagName("title");
+    for (int j = 0; j < nl2.size(); j++) {
+      n = nl2.at(j).toElement();
 
-    if (nl.size() == 1) {
-      qDebug() << nl.at(0).toElement().text();
+      /* Birthday */
+      if (n.tagName() == "gContact:birthday") {
+        QString birthday = n.attribute("when");
+
+        /* TODO parse birthday
+           see: http://code.google.com/apis/contacts/docs/3.0/reference.html#gcBirthday
+         */
+      }
+      /* Email */
+      else if (n.tagName() == "gd:email") {
+        QString email = n.attribute("address");
+        QString rel = n.attribute("rel");
+        bool primary = (n.hasAttribute("primary") && n.attribute("primary") == "yes");
+
+        QtGdata_contact::GDATA_CONTACT_EMAIL type = QtGdata_contact::GDATA_CONTACT_EMAIL_OTHER;
+        if (rel == "http://schemas.google.com/g/2005#home") {
+          type = QtGdata_contact::GDATA_CONTACT_EMAIL_HOME;
+        } else if (rel == "http://schemas.google.com/g/2005#work") {
+          type = QtGdata_contact::GDATA_CONTACT_EMAIL_WORK;
+        }
+
+        c.addEmail(email, type, primary);
+      }
+      /* Phone number */
+      else if(n.tagName() == "gd:phoneNumber") {
+        QString ref = n.attribute("rel");
+        QString number = n.text();
+
+        QtGdata_contact::GDATA_CONTACT_PHONE type = QtGdata_contact::GDATA_CONTACT_PHONE_OTHER;
+        if (ref == "http://schemas.google.com/g/2005#mobile") {
+          type = QtGdata_contact::GDATA_CONTACT_PHONE_MOBILE;
+        }
+        /* Add other */
+
+        c.addPhone(number, type);
+      }
+      /* Update */
+      else if (n.tagName() == "updated") {
+        QDateTime updated = QDateTime::fromString(n.text(), "yyyy-M-ddThh:mm:ss.zzzZ");
+        updated.setTimeSpec(Qt::UTC);
+        c.setUpdated(updated);
+      }
     }
+
+    contacts.append(c);
   }
 }

libQtGdata/trunk/qtgdata_contacts.h

@@ -1 @@
-#ifndef QTGDATA_CONTACT_H
-#define QTGDATA_CONTACT_H
+#ifndef QTGDATA_CONTACTS_H
+#define QTGDATA_CONTACTS_H
 
 #include <qtgdata.h>
@@ -7 +7 @@
 #include <QByteArray>
 #include <QDateTime>
-#include <QUrl>
+#include <QMap>
+
+class QtGdata_contact
+{
+  public:
+    enum GDATA_CONTACT_EMAIL {
+      GDATA_CONTACT_EMAIL_OTHER,
+      GDATA_CONTACT_EMAIL_HOME,
+      GDATA_CONTACT_EMAIL_WORK,
+    };
+
+    enum GDATA_CONTACT_PHONE {
+      GDATA_CONTACT_PHONE_OTHER,
+      GDATA_CONTACT_PHONE_HOME,
+      GDATA_CONTACT_PHONE_HOME_FAX,
+      GDATA_CONTACT_PHONE_WORK,
+      GDATA_CONTACT_PHONE_WORK_FAX,
+      GDATA_CONTACT_PHONE_MOBILE,
+      GDATA_CONTACT_PHONE_PAGER
+    };
+
+    QtGdata_contact();
+
+    /* Getters */
+    QString getGender();
+    QString getName();
+    QDateTime getUpdated();
+
+    /* Adders */
+    void addEmail(const QString email,
+                  const QtGdata_contact::GDATA_CONTACT_EMAIL type = QtGdata_contact::GDATA_CONTACT_EMAIL_OTHER,
+                  const bool primary = false);
+    void addPhone(const QString phonenumber,
+                  const QtGdata_contact::GDATA_CONTACT_PHONE type = QtGdata_contact::GDATA_CONTACT_PHONE_OTHER);
+
+    /* Setters */
+    void setGender(const QString gender);
+    void setName(const QString name);
+    void setUpdated(const QDateTime updated);
+
+  private:
+    //QDate birthday;
+    QMap<QString, QtGdata_contact::GDATA_CONTACT_EMAIL> email;
+    QString primary_email;
+    QString gender;
+    QString name;
+    QMap<QString, QtGdata_contact::GDATA_CONTACT_PHONE> phone;
+    QDateTime updated;
+};
 
 class QtGdata_contacts : public QtGdata
@@ -21 +69 @@
     QDateTime update;
     QString next;
+
+    QList<QtGdata_contact> contacts;
 };
 
-#endif // QTGDATA_CONTACT_H
+
+#endif // QTGDATA_CONTACTS_H