Changeset 2982

Timestamp:

04/28/06 08:51:49 (3 years ago)

Author:

madcat

Message:

Feeds caching; no longer reloads feeds on startup.

Files:

• hydranode/hngui/hometabs.cpp (modified) (2 diffs)
• hydranode/hngui/newsfeed.cpp (modified) (9 diffs)
• hydranode/hngui/newsfeed.h (modified) (3 diffs)
• hydranode/hngui/transfertabs.cpp (modified) (1 diff)

hydranode/hngui/hometabs.cpp

@@ -52 +52 @@
-        setActive("Overview");
-
-        m_ui->devFeed->addFeed(
-                "Hydranode Development News", 
-                QUrl("http://hydranode.com/blog/atom.xml"), 5
-        );
-        m_ui->devFeed->setActive("Hydranode Development News");
-        m_ui->devFeed->getUpdates();
-
-        m_ui->newsFeed->addFeed(
-                "Slashdot - Stuff that matters", 
-                QUrl("http://rss.slashdot.org/Slashdot/slashdot"), 10
-        );
-        m_ui->newsFeed->addFeed(
-                "BBC World News", 
-                QUrl(
-                        "http://newsrss.bbc.co.uk/rss/"
-                        "newsonline_world_edition/front_page/rss.xml"
-                ), 10
-        );
-        m_ui->newsFeed->addFeed(
-                "CNN World News", 
-                QUrl("http://rss.cnn.com/rss/cnn_topstories.rss"), 10
-        );
-        m_ui->newsFeed->addFeed(
-                "Tom's Hardware News", 
-                QUrl("http://www.pheedo.com/f/toms_hardware"), 10
-        );
-        m_ui->newsFeed->addFeed(
-                "Slyck - File Sharing News", 
-                QUrl("http://slyck.com/slyckrss.xml"), 30
-        );
-        m_ui->newsFeed->getUpdates();
-
-        QSettings conf(confDir() + "gui.ini", QSettings::IniFormat);
-        if (conf.contains("ActiveFeed")) {
-                m_ui->newsFeed->setActive(conf.value("ActiveFeed").toString());
-        }
-
-        // make text controls backgrounds 100% transparent to allow background
-        // to be displayed below it
@@ -127 +90 @@
-                SLOT(changePage())
-        );
+
+        m_ui->devFeed->addFeed(
+                "Hydranode Development News", 
+                QUrl("http://hydranode.com/blog/atom.xml"), 5
+        );
+        m_ui->devFeed->setActive("Hydranode Development News");
+
+        m_ui->newsFeed->addFeed(
+                "Slashdot - Stuff that matters", 
+                QUrl("http://rss.slashdot.org/Slashdot/slashdot"), 10
+        );
+        m_ui->newsFeed->addFeed(
+                "BBC World News", 
+                QUrl(
+                        "http://newsrss.bbc.co.uk/rss/"
+                        "newsonline_world_edition/front_page/rss.xml"
+                ), 10
+        );
+        m_ui->newsFeed->addFeed(
+                "CNN World News", 
+                QUrl("http://rss.cnn.com/rss/cnn_topstories.rss"), 10
+        );
+        m_ui->newsFeed->addFeed(
+                "Tom's Hardware News", 
+                QUrl("http://www.pheedo.com/f/toms_hardware"), 10
+        );
+        m_ui->newsFeed->addFeed(
+                "Slyck - File Sharing News", 
+                QUrl("http://slyck.com/slyckrss.xml"), 30
+        );
+        m_ui->devFeed->init();
+        m_ui->newsFeed->init();
+
+        QSettings conf(confDir() + "gui.ini", QSettings::IniFormat);
+        if (conf.contains("ActiveFeed")) {
+                m_ui->newsFeed->setActive(conf.value("ActiveFeed").toString());
+        }
+
-        m_actionBack = QPixmap(imgDir() + "actionback.png");
-        m_actionBackOrig = m_actionBack;

hydranode/hngui/newsfeed.cpp

@@ -18 +18 @@
- 
-#include "newsfeed.h"
+#include "main.h"
-#include <QHttp>
-#include <QXmlDefaultHandler>
@@ -25 +26 @@
-#include <QSettings>
-#include <QTimer>
+#include <QDir>
-
-// RssReader class
@@ -187 +189 @@
-
-NewsFeed::NewsFeed(QWidget *parent) : QTextBrowser(parent) {
+        m_timer = new QTimer(this);
+
-        connect(
-                this, SIGNAL(anchorClicked(const QUrl&)), 
-                SLOT(linkClicked(const QUrl&))
-        );
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -201 +221 @@
-        m_feeds[title] = QString();
-        if (m_currentActive.isEmpty()) {
-
+
+
+
+
+
+
+
+
-        }
-}
@@ -209 +236 @@
-        while (it != m_urls.end()) {
-                QString title = it.key();
+                logDebug("Getting updates for feed " + title);
-                QUrl url = it.value();
-                if (m_links[title]) {
@@ -225 +253 @@
-                ++it;
-        }
+        QSettings conf(confDir() + "gui.ini", QSettings::IniFormat);
+        conf.setValue(
+                objectName() + "Updated", 
+                QDateTime::currentDateTime().toString(Qt::ISODate)
+        );
+
+        if (!m_timer->isActive()) {
+                logDebug("Next feeds update in one hour.");
+                m_timer->start(1000 * 60 * 60);
+        }
-}
-
@@ -254 +292 @@
-        feed.replace("“", "\"");
-        feed.replace("”", "\"");
-
-
-
-
-
-
-
+
+
-        if (!m_feeds[m_reqs[code]].size()) {
-                m_feeds[m_reqs[code]] = feed;
@@ -269 +302 @@
-        }
-
+        // save cache
+        QDir d(confDir());
+        if (!d.exists("feeds")) {
+                d.mkdir("feeds");
+        }
+        QFile f(d.absolutePath() + "/feeds/" + m_reqs[code] + ".xml");
+        f.open(QIODevice::WriteOnly);
+        if (f.isOpen()) {
+                f.write(feed.toAscii());
+        }
+
+        // cleanup
-        m_links[m_reqs[code]]->deleteLater();
-        m_links.remove(m_reqs[code]);
@@ -296 +341 @@
-#endif
-}
+
+QString NewsFeed::parseFeed(const QString &feed, int limit) {
+        QXmlSimpleReader reader;
+        RssReader handler(limit);
+        reader.setContentHandler(&handler);
+        QXmlInputSource source;
+        source.setData(feed);
+        reader.parse(&source);
+        return handler.getOutput();
+}

hydranode/hngui/newsfeed.h

@@ -35 +35 @@
-public Q_SLOTS:
-        void getUpdates();
+        void init();
-        void setActive(QString title);
-private Q_SLOTS:
@@ -41 +42 @@
-        void linkClicked(const QUrl &link);
-private:
+        QString parseFeed(const QString &feed, int limit);
+
-        QMap<QString, QUrl>    m_urls;
-        QMap<QString, int>     m_limits;
@@ -47 +50 @@
-        QMap<QString, QString> m_feeds;
-        QString                m_currentActive;
+        QTimer                *m_timer;
-};
-

hydranode/hngui/transfertabs.cpp

@@ -615 +615 @@
-void TransferPage::getMoreComments() {
-        if (!m_currentActive || !m_currentActive->getData()) {
-                logDebug("Next GetNames in 5 seconds");
-                m_commentTimer->stop();
-                m_commentTimer->start(5000);