squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-20 23:47:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code clean up

Browse Source
This commit is contained in:
Christophe Dumez
2010-11-13 21:15:52 +00:00
parent 9c13ed2635
commit 126e2e7c75
31 changed files with 279 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/rss/rssfeed.cpp
View File

@@ -37,7 +37,7 @@
#include "misc.h"
#include "rssdownloadrulelist.h"
RssFeed::RssFeed(RssFolder* parent, RssManager *rssmanager, QBtSession *BTSession, QString _url): parent(parent), rssmanager(rssmanager), BTSession(BTSession), alias(""), iconPath(":/Icons/rss16.png"), refreshed(false), downloadFailure(false), currently_loading(false) {
RssFeed::RssFeed(RssFolder* parent, QString _url): parent(parent), alias(""), iconPath(":/Icons/rss16.png"), refreshed(false), downloadFailure(false), currently_loading(false) {
qDebug("RSSStream constructed");
QIniSettings qBTRSS("qBittorrent", "qBittorrent-rss");
url = QUrl(_url).toString();
@@ -186,7 +186,7 @@ void RssFeed::markAllAsRead() {
foreach(RssArticle *item, this->values()){
item->setRead();
}
rssmanager->forwardFeedInfosChanged(url, getName(), 0);
RssManager::instance()->forwardFeedInfosChanged(url, getName(), 0);
}
unsigned int RssFeed::getNbUnRead() const{
@@ -302,8 +302,8 @@ short RssFeed::readDoc(QIODevice* device) {
const RssDownloadRule matching_rule = RssDownloadRuleList::instance()->findMatchingRule(url, item->getTitle());
if(matching_rule.isValid()) {
// Download the torrent
BTSession->addConsoleMessage(tr("Automatically downloading %1 torrent from %2 RSS feed...").arg(item->getTitle()).arg(getName()));
BTSession->downloadUrlAndSkipDialog(torrent_url, matching_rule.savePath(), matching_rule.label());
QBtSession::instance()->addConsoleMessage(tr("Automatically downloading %1 torrent from %2 RSS feed...").arg(item->getTitle()).arg(getName()));
QBtSession::instance()->downloadUrlAndSkipDialog(torrent_url, matching_rule.savePath(), matching_rule.label());
// Item was downloaded, consider it as Read
item->setRead();
}

5
src/rss/rssfeed.h
View File

@@ -36,15 +36,12 @@
#include "rssfile.h"
class RssManager;
class QBtSession;
class RssFeed: public RssFile, public QHash<QString, RssArticle*> {
Q_OBJECT
private:
RssFolder *parent;
RssManager *rssmanager;
QBtSession *BTSession;
QString title;
QString link;
QString description;
@@ -63,7 +60,7 @@ public slots:
void setDownloadFailed();
public:
RssFeed(RssFolder* parent, RssManager *rssmanager, QBtSession *BTSession, QString _url);
RssFeed(RssFolder* parent, QString _url);
~RssFeed();
RssFolder* getParent() const { return parent; }
void setParent(RssFolder* _parent) { parent = _parent; }

12
src/rss/rssfolder.cpp
View File

@@ -35,7 +35,7 @@
#include "rssmanager.h"
#include "rssfeed.h"
RssFolder::RssFolder(RssFolder *parent, RssManager *rssmanager, QBtSession *BTSession, QString name): parent(parent), rssmanager(rssmanager), BTSession(BTSession), name(name) {
RssFolder::RssFolder(RssFolder *parent, QString name): parent(parent), name(name) {
downloader = new downloadThread(this);
connect(downloader, SIGNAL(downloadFinished(QString, QString)), this, SLOT(processFinishedDownload(QString, QString)));
connect(downloader, SIGNAL(downloadFailure(QString, QString)), this, SLOT(handleDownloadFailure(QString, QString)));
@@ -95,7 +95,7 @@ void RssFolder::removeFile(QString ID) {
RssFolder* RssFolder::addFolder(QString name) {
RssFolder *subfolder;
if(!this->contains(name)) {
subfolder = new RssFolder(this, rssmanager, BTSession, name);
subfolder = new RssFolder(this, name);
(*this)[name] = subfolder;
} else {
subfolder = (RssFolder*)this->value(name);
@@ -104,7 +104,7 @@ RssFolder* RssFolder::addFolder(QString name) {
}
RssFeed* RssFolder::addStream(QString url) {
RssFeed* stream = new RssFeed(this, rssmanager, BTSession, url);
RssFeed* stream = new RssFeed(this, url);
Q_ASSERT(!this->contains(stream->getUrl()));
(*this)[stream->getUrl()] = stream;
refreshStream(stream->getUrl());
@@ -181,7 +181,7 @@ void RssFolder::processFinishedDownload(QString url, QString path) {
foreach(stream, res){
stream->setIconPath(path);
if(!stream->isLoading())
rssmanager->forwardFeedIconChanged(stream->getUrl(), stream->getIconPath());
RssManager::instance()->forwardFeedIconChanged(stream->getUrl(), stream->getIconPath());
}
}else{
qDebug("Unsupported icon format at %s", (const char*)url.toLocal8Bit());
@@ -202,7 +202,7 @@ void RssFolder::processFinishedDownload(QString url, QString path) {
if(!stream->getTitle().isEmpty())
stream->rename(stream->getTitle());
}
rssmanager->forwardFeedInfosChanged(url, stream->getName(), stream->getNbUnRead());
RssManager::instance()->forwardFeedInfosChanged(url, stream->getName(), stream->getNbUnRead());
}
void RssFolder::handleDownloadFailure(QString url, QString reason) {
@@ -219,7 +219,7 @@ void RssFolder::handleDownloadFailure(QString url, QString reason) {
stream->setLoading(false);
qDebug("Could not download Rss at %s, reason: %s", (const char*)url.toLocal8Bit(), (const char*)reason.toLocal8Bit());
stream->setDownloadFailed();
rssmanager->forwardFeedInfosChanged(url, stream->getName(), stream->getNbUnRead());
RssManager::instance()->forwardFeedInfosChanged(url, stream->getName(), stream->getNbUnRead());
}
QList<RssFeed*> RssFolder::findFeedsWithIcon(QString icon_url) const {

6
src/rss/rssfolder.h
View File

@@ -36,16 +36,14 @@
#include "rssfile.h"
class RssArticle;
class QBtSession;
class downloadThread;
class RssManager;
class RssFeed;
class RssFolder: public RssFile, public QHash<QString, RssFile*> {
Q_OBJECT
public:
RssFolder(RssFolder *parent, RssManager *rssmanager, QBtSession *BTSession, QString name);
RssFolder(RssFolder *parent = 0, QString name = QString());
~RssFolder();
RssFolder* getParent() const { return parent; }
void setParent(RssFolder* _parent) { parent = _parent; }
@@ -79,9 +77,7 @@ public slots:
private:
RssFolder *parent;
RssManager *rssmanager;
downloadThread *downloader;
QBtSession *BTSession;
QString name;
};

2
src/rss/rssmanager.cpp
View File

@@ -37,7 +37,7 @@
RssManager* RssManager::m_instance = 0;
RssManager::RssManager(): RssFolder(0, this, QBtSession::instance(), QString::null) {
RssManager::RssManager(): RssFolder() {
loadStreamList();
connect(&newsRefresher, SIGNAL(timeout()), this, SLOT(refreshAll()));
refreshInterval = RssSettings::getRSSRefreshInterval();

1
src/rss/rssmanager.h
View File

@@ -63,7 +63,6 @@ signals:
private:
QTimer newsRefresher;
unsigned int refreshInterval;
QBtSession *BTSession;
};