github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-14 01:03:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Redesign RSS base classes.

Browse source
This commit is contained in:
Vladimir Golovnev (Glassez) 2015-10-17 18:59:04 +03:00 • committed by Vladimir Golovnev (qlassez)
parent 6f7ae728eb
commit 28ed981082
16 changed files with 232 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/gui/rss/rss_imp.cpp
View file

@ -47,7 +47,6 @@
#include "base/rss/rssmanager.h"
#include "base/rss/rssfolder.h"
#include "base/rss/rssarticle.h"
#include "base/rss/rssparser.h"
#include "base/rss/rssfeed.h"
#include "automatedrssdownloader.h"
#include "guiiconprovider.h"
@ -79,7 +78,7 @@ void RSSImp::displayRSSListMenu(const QPoint& pos)
myRSSListMenu.addAction(actionMark_items_read);
myRSSListMenu.addSeparator();
if (selectedItems.size() == 1) {
if (m_feedList->getRSSItem(selectedItems.first()) != m_rssManager) {
if (m_feedList->getRSSItem(selectedItems.first()) != m_rssManager->rootFolder()) {
myRSSListMenu.addAction(actionRename);
myRSSListMenu.addAction(actionDelete);
myRSSListMenu.addSeparator();
@ -167,14 +166,15 @@ void RSSImp::askNewFolder()
Q_ASSERT(rss_parent);
}
else {
rss_parent = m_rssManager;
rss_parent = m_rssManager->rootFolder();
}
bool ok;
QString new_name = AutoExpandableDialog::getText(this, tr("Please choose a folder name"), tr("Folder name:"), QLineEdit::Normal, tr("New folder"), &ok);
if (!ok)
if (!ok || rss_parent->hasChild(new_name))
return;
Rss::FolderPtr newFolder = rss_parent->addFolder(new_name);
Rss::FolderPtr newFolder(new Rss::Folder(new_name));
rss_parent->addFile(newFolder);
QTreeWidgetItem* folderItem = createFolderListItem(newFolder);
if (parent_item)
parent_item->addChild(folderItem);
@ -207,7 +207,7 @@ void RSSImp::on_newFeedButton_clicked()
if (parent_item)
rss_parent = qSharedPointerCast<Rss::Folder>(m_feedList->getRSSItem(parent_item));
else
rss_parent = m_rssManager;
rss_parent = m_rssManager->rootFolder();
// Ask for feed URL
bool ok;
QString clip_txt = qApp->clipboard()->text();
@ -229,7 +229,9 @@ void RSSImp::on_newFeedButton_clicked()
QMessageBox::Ok);
return;
}
Rss::FeedPtr stream = rss_parent->addStream(m_rssManager.data(), newUrl);
Rss::FeedPtr stream(new Rss::Feed(newUrl, m_rssManager.data()));
rss_parent->addFile(stream);
// Create TreeWidget item
QTreeWidgetItem* item = createFolderListItem(stream);
if (parent_item)
@ -265,17 +267,13 @@ void RSSImp::deleteSelectedItems()
// Notify TreeWidget
m_feedList->itemAboutToBeRemoved(item);
// Actually delete the item
rss_item->parent()->removeChild(rss_item->id());
rss_item->parentFolder()->removeChild(rss_item->id());
delete item;
// Update parents count
while (parent && parent != m_feedList->invisibleRootItem()) {
updateItemInfos (parent);
while (parent && (parent != m_feedList->invisibleRootItem())) {
updateItemInfos(parent);
parent = parent->parent();
}
// Clear feed data from RSS parser (possible caching).
Rss::Feed* rssFeed = dynamic_cast<Rss::Feed*>(rss_item.data());
if (rssFeed)
m_rssManager->rssParser()->clearFeedData(rssFeed->url());
}
m_rssManager->saveStreamList();
// Update Unread items
@ -406,7 +404,7 @@ void RSSImp::renameSelectedRssFile()
newName = AutoExpandableDialog::getText(this, tr("Please choose a new name for this RSS feed"), tr("New feed name:"), QLineEdit::Normal, m_feedList->getRSSItem(item)->displayName(), &ok);
// Check if name is already taken
if (ok) {
if (rss_item->parent()->hasChild(newName)) {
if (rss_item->parentFolder()->hasChild(newName)) {
QMessageBox::warning(0, tr("Name already in use"), tr("This name is already used by another item, please choose another one."));
ok = false;
}
@ -489,7 +487,7 @@ void RSSImp::fillFeedsList(QTreeWidgetItem* parent, const Rss::FolderPtr& rss_pa
if (parent)
children = rss_parent->getContent();
else
children = m_rssManager->getContent();
children = m_rssManager->rootFolder()->getContent();
foreach (const Rss::FilePtr& rssFile, children) {
QTreeWidgetItem* item = createFolderListItem(rssFile);
Q_ASSERT(item);
@ -546,7 +544,7 @@ void RSSImp::populateArticleList(QTreeWidgetItem* item)
qDebug("Getting the list of news");
Rss::ArticleList articles;
if (rss_item == m_rssManager)
if (rss_item == m_rssManager->rootFolder())
articles = rss_item->unreadArticleListByDateDesc();
else
articles = rss_item->articleListByDateDesc();
@ -655,7 +653,7 @@ void RSSImp::updateItemInfos(QTreeWidgetItem *item)
return;
QString name;
if (rss_item == m_rssManager) {
if (rss_item == m_rssManager->rootFolder()) {
name = tr("Unread");
emit updateRSSCount(rss_item->unreadCount());
}
@ -799,7 +797,7 @@ void RSSImp::on_rssDownloaderBtn_clicked()
AutomatedRssDownloader dlg(m_rssManager, this);
dlg.exec();
if (dlg.isRssDownloaderEnabled()) {
m_rssManager->recheckRssItemsForDownload();
m_rssManager->rootFolder()->recheckRssItemsForDownload();
refreshAllFeeds();
}
}