Upload to unstable

[minitube] / src / ytcategories.cpp

diff --git a/src/ytcategories.cpp b/src/ytcategories.cpp
index 92e2dbc5db61933350371c66e43e410cd180fa72..4a34ce2d7f3be042068cda0f7d8e3374bbab6808 100644 (file)
--- a/src/ytcategories.cpp
+++ b/src/ytcategories.cpp
@@ -1,52 +1,80 @@
-#include "ytcategories.h"
-#include "networkaccess.h"
-#include <QtXml>
+/* $BEGIN_LICENSE
 
-namespace The {
-NetworkAccess* http();
-}
+This file is part of Minitube.
+Copyright 2009, Flavio Tordini <flavio.tordini@gmail.com>
+
+Minitube is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Minitube is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
+
+$END_LICENSE */
+
+#include "ytcategories.h"
+#include "http.h"
+#include "httputils.h"
+#include "datautils.h"
+#include "yt3.h"
+#include "ytregions.h"
 
 YTCategories::YTCategories(QObject *parent) : QObject(parent) { }
 
 void YTCategories::loadCategories(QString language) {
-    if (language.isEmpty())
-        language = QLocale::system().uiLanguages().first();
+    if (language.isEmpty()) {
+        language = QLocale::system().uiLanguages().at(0);
+        int index = language.indexOf('-');
+        if (index > 0) language = language.mid(0, index);
+    }
     lastLanguage = language;
 
-    QString url = "http://gdata.youtube.com/schemas/2007/categories.cat?hl=" + language;
-    QObject *reply = The::http()->get(url);
+    QUrl url = YT3::instance().method("videoCategories");
+
+    QUrlQuery q(url);
+    q.addQueryItem("part", "snippet");
+    q.addQueryItem("hl", language);
+
+    QString regionCode = YTRegions::currentRegionId();
+    if (regionCode.isEmpty()) regionCode = "us";
+    q.addQueryItem("regionCode", regionCode);
+    url.setQuery(q);
+
+    QObject *reply = HttpUtils::yt().get(url);
     connect(reply, SIGNAL(data(QByteArray)), SLOT(parseCategories(QByteArray)));
-    connect(reply, SIGNAL(error(QNetworkReply*)), SLOT(requestError(QNetworkReply*)));
+    connect(reply, SIGNAL(error(QString)), SLOT(requestError(QString)));
 }
 
-void YTCategories::parseCategories(QByteArray bytes) {
-    QList<YTCategory> categories;
-
-    QXmlStreamReader xml(bytes);
-    while (!xml.atEnd()) {
-        xml.readNext();
-        if (xml.isStartElement() && xml.name() == QLatin1String("category")) {
-            QString term = xml.attributes().value("term").toString();
-            QString label = xml.attributes().value("label").toString();
-            while(xml.readNextStartElement())
-                if (xml.name() == QLatin1String("assignable")) {
-                    YTCategory category;
-                    category.term = term;
-                    category.label = label;
-                    categories << category;
-                } else xml.skipCurrentElement();
-        }
-    }
+void YTCategories::parseCategories(const QByteArray &bytes) {
+    QJsonDocument doc = QJsonDocument::fromJson(bytes);
+    QJsonObject obj = doc.object();
+    const QJsonArray items = obj["items"].toArray();
+
+    QVector<YTCategory> categories;
+    categories.reserve(items.size());
+    for (const QJsonValue &v : items) {
+        QJsonObject item = v.toObject();
+        QJsonObject snippet = item["snippet"].toObject();
+        bool isAssignable = snippet["assignable"].toBool();
+        if (!isAssignable) continue;
 
-    if (xml.hasError()) {
-        emit error(xml.errorString());
-        return;
+        YTCategory category;
+        category.term = item["id"].toString();
+        category.label = snippet["title"].toString();
+        // if (category.label.startsWith(QLatin1String("News"))) continue;
+        categories << category;
     }
 
     emit categoriesLoaded(categories);
 }
 
-void YTCategories::requestError(QNetworkReply *reply) {
+void YTCategories::requestError(const QString &message) {
     if (lastLanguage != "en") loadCategories("en");
-    else emit error(reply->errorString());
+    else emit error(message);
 }