@ -68,6 +68,7 @@ AutomatedRssDownloader::AutomatedRssDownloader(const QWeakPointer<RssManager>& m
@@ -68,6 +68,7 @@ AutomatedRssDownloader::AutomatedRssDownloader(const QWeakPointer<RssManager>& m
ok = connect ( ui - > listRules , SIGNAL ( customContextMenuRequested ( const QPoint & ) ) , this , SLOT ( displayRulesListMenu ( const QPoint & ) ) ) ;
Q_ASSERT ( ok ) ;
m_ruleList = manager . toStrongRef ( ) - > downloadRules ( ) ;
m_editableRuleList = new RssDownloadRuleList ; // Read rule list from disk
initLabelCombobox ( ) ;
loadFeedList ( ) ;
loadSettings ( ) ;
@ -101,8 +102,11 @@ AutomatedRssDownloader::~AutomatedRssDownloader()
@@ -101,8 +102,11 @@ AutomatedRssDownloader::~AutomatedRssDownloader()
qDebug ( ) < < Q_FUNC_INFO ;
// Save current item on exit
saveEditedRule ( ) ;
m_ruleList - > replace ( m_editableRuleList ) ;
m_ruleList - > saveRulesToStorage ( ) ;
saveSettings ( ) ;
delete ui ;
delete m_editableRuleList ;
}
void AutomatedRssDownloader : : loadSettings ( )
@ -132,10 +136,10 @@ void AutomatedRssDownloader::loadRulesList()
@@ -132,10 +136,10 @@ void AutomatedRssDownloader::loadRulesList()
saveEditedRule ( ) ;
}
ui - > listRules - > clear ( ) ;
foreach ( const QString & rule_name , m_r uleList - > ruleNames ( ) ) {
foreach ( const QString & rule_name , m_editableR uleList - > ruleNames ( ) ) {
QListWidgetItem * item = new QListWidgetItem ( rule_name , ui - > listRules ) ;
item - > setFlags ( item - > flags ( ) | Qt : : ItemIsUserCheckable ) ;
if ( m_r uleList - > getRule ( rule_name ) - > isEnabled ( ) )
if ( m_editableR uleList - > getRule ( rule_name ) - > isEnabled ( ) )
item - > setCheckState ( Qt : : Checked ) ;
else
item - > setCheckState ( Qt : : Unchecked ) ;
@ -170,7 +174,7 @@ void AutomatedRssDownloader::updateFeedList()
@@ -170,7 +174,7 @@ void AutomatedRssDownloader::updateFeedList()
const QString feed_url = item - > data ( Qt : : UserRole ) . toString ( ) ;
bool all_enabled = false ;
foreach ( const QListWidgetItem * ruleItem , ui - > listRules - > selectedItems ( ) ) {
RssDownloadRulePtr rule = m_r uleList - > getRule ( ruleItem - > text ( ) ) ;
RssDownloadRulePtr rule = m_editableR uleList - > getRule ( ruleItem - > text ( ) ) ;
if ( ! rule ) continue ;
qDebug ( ) < < " Rule " < < rule - > name ( ) < < " affects " < < rule - > rssFeeds ( ) . size ( ) < < " feeds. " ;
foreach ( QString test , rule - > rssFeeds ( ) ) {
@ -257,7 +261,7 @@ RssDownloadRulePtr AutomatedRssDownloader::getCurrentRule() const
@@ -257,7 +261,7 @@ RssDownloadRulePtr AutomatedRssDownloader::getCurrentRule() const
{
QListWidgetItem * current_item = ui - > listRules - > currentItem ( ) ;
if ( current_item )
return m_r uleList - > getRule ( current_item - > text ( ) ) ;
return m_editableR uleList - > getRule ( current_item - > text ( ) ) ;
return RssDownloadRulePtr ( ) ;
}
@ -279,7 +283,7 @@ void AutomatedRssDownloader::saveEditedRule()
@@ -279,7 +283,7 @@ void AutomatedRssDownloader::saveEditedRule()
qDebug ( ) < < " Probably removed the item, no need to save it " ;
return ;
}
RssDownloadRulePtr rule = m_r uleList - > getRule ( m_editedRule - > text ( ) ) ;
RssDownloadRulePtr rule = m_editableR uleList - > getRule ( m_editedRule - > text ( ) ) ;
if ( ! rule ) {
rule = RssDownloadRulePtr ( new RssDownloadRule ) ;
rule - > setName ( m_editedRule - > text ( ) ) ;
@ -301,7 +305,7 @@ void AutomatedRssDownloader::saveEditedRule()
@@ -301,7 +305,7 @@ void AutomatedRssDownloader::saveEditedRule()
Preferences ( ) . addTorrentLabel ( rule - > label ( ) ) ;
//rule->setRssFeeds(getSelectedFeeds());
// Save it
m_r uleList - > saveRule ( rule ) ;
m_editableR uleList - > saveRule ( rule ) ;
}
@ -311,7 +315,7 @@ void AutomatedRssDownloader::on_addRuleBtn_clicked()
@@ -311,7 +315,7 @@ void AutomatedRssDownloader::on_addRuleBtn_clicked()
const QString rule_name = QInputDialog : : getText ( this , tr ( " New rule name " ) , tr ( " Please type the name of the new download rule. " ) ) ;
if ( rule_name . isEmpty ( ) ) return ;
// Check if this rule name already exists
if ( m_r uleList - > getRule ( rule_name ) ) {
if ( m_editableR uleList - > getRule ( rule_name ) ) {
QMessageBox : : warning ( this , tr ( " Rule name conflict " ) , tr ( " A rule with this name already exists, please choose another name. " ) ) ;
return ;
}
@ -342,8 +346,8 @@ void AutomatedRssDownloader::on_removeRuleBtn_clicked()
@@ -342,8 +346,8 @@ void AutomatedRssDownloader::on_removeRuleBtn_clicked()
// Clean up memory
delete item ;
qDebug ( " Removed item for the UI list " ) ;
// Remove it from the m_r uleList
m_r uleList - > removeRule ( rule_name ) ;
// Remove it from the m_editableR uleList
m_editableR uleList - > removeRule ( rule_name ) ;
}
}
@ -356,7 +360,7 @@ void AutomatedRssDownloader::on_browseSP_clicked()
@@ -356,7 +360,7 @@ void AutomatedRssDownloader::on_browseSP_clicked()
void AutomatedRssDownloader : : on_exportBtn_clicked ( )
{
if ( m_r uleList - > isEmpty ( ) ) {
if ( m_editableR uleList - > isEmpty ( ) ) {
QMessageBox : : warning ( this , tr ( " Invalid action " ) , tr ( " The list is empty, there is nothing to export. " ) ) ;
return ;
}
@ -365,7 +369,7 @@ void AutomatedRssDownloader::on_exportBtn_clicked()
@@ -365,7 +369,7 @@ void AutomatedRssDownloader::on_exportBtn_clicked()
if ( save_path . isEmpty ( ) ) return ;
if ( ! save_path . endsWith ( " .rssrules " , Qt : : CaseInsensitive ) )
save_path + = " .rssrules " ;
if ( ! m_r uleList - > serialize ( save_path ) ) {
if ( ! m_editableR uleList - > serialize ( save_path ) ) {
QMessageBox : : warning ( this , tr ( " I/O Error " ) , tr ( " Failed to create the destination file " ) ) ;
return ;
}
@ -377,7 +381,7 @@ void AutomatedRssDownloader::on_importBtn_clicked()
@@ -377,7 +381,7 @@ void AutomatedRssDownloader::on_importBtn_clicked()
QString load_path = QFileDialog : : getOpenFileName ( this , tr ( " Please point to the RSS download rules file " ) , QDir : : homePath ( ) , tr ( " Rules list (*.rssrules *.filters) " ) ) ;
if ( load_path . isEmpty ( ) | | ! QFile : : exists ( load_path ) ) return ;
// Load it
if ( ! m_r uleList - > unserialize ( load_path ) ) {
if ( ! m_editableR uleList - > unserialize ( load_path ) ) {
QMessageBox : : warning ( this , tr ( " Import Error " ) , tr ( " Failed to import the selected rules file " ) ) ;
return ;
}
@ -426,11 +430,11 @@ void AutomatedRssDownloader::renameSelectedRule()
@@ -426,11 +430,11 @@ void AutomatedRssDownloader::renameSelectedRule()
QString new_name = QInputDialog : : getText ( this , tr ( " Rule renaming " ) , tr ( " Please type the new rule name " ) , QLineEdit : : Normal , item - > text ( ) ) ;
new_name = new_name . trimmed ( ) ;
if ( new_name . isEmpty ( ) ) return ;
if ( m_r uleList - > ruleNames ( ) . contains ( new_name , Qt : : CaseInsensitive ) ) {
if ( m_editableR uleList - > ruleNames ( ) . contains ( new_name , Qt : : CaseInsensitive ) ) {
QMessageBox : : warning ( this , tr ( " Rule name conflict " ) , tr ( " A rule with this name already exists, please choose another name. " ) ) ;
} else {
// Rename the rule
m_r uleList - > renameRule ( item - > text ( ) , new_name ) ;
m_editableR uleList - > renameRule ( item - > text ( ) , new_name ) ;
item - > setText ( new_name ) ;
return ;
}
@ -445,7 +449,7 @@ void AutomatedRssDownloader::handleFeedCheckStateChange(QListWidgetItem *feed_it
@@ -445,7 +449,7 @@ void AutomatedRssDownloader::handleFeedCheckStateChange(QListWidgetItem *feed_it
}
const QString feed_url = feed_item - > data ( Qt : : UserRole ) . toString ( ) ;
foreach ( QListWidgetItem * rule_item , ui - > listRules - > selectedItems ( ) ) {
RssDownloadRulePtr rule = m_r uleList - > getRule ( rule_item - > text ( ) ) ;
RssDownloadRulePtr rule = m_editableR uleList - > getRule ( rule_item - > text ( ) ) ;
Q_ASSERT ( rule ) ;
QStringList affected_feeds = rule - > rssFeeds ( ) ;
if ( feed_item - > checkState ( ) = = Qt : : Checked ) {
@ -458,7 +462,7 @@ void AutomatedRssDownloader::handleFeedCheckStateChange(QListWidgetItem *feed_it
@@ -458,7 +462,7 @@ void AutomatedRssDownloader::handleFeedCheckStateChange(QListWidgetItem *feed_it
// Save the updated rule
if ( affected_feeds . size ( ) ! = rule - > rssFeeds ( ) . size ( ) ) {
rule - > setRssFeeds ( affected_feeds ) ;
m_r uleList - > saveRule ( rule ) ;
m_editableR uleList - > saveRule ( rule ) ;
}
}
// Update Matching articles
@ -477,7 +481,7 @@ void AutomatedRssDownloader::updateMatchingArticles()
@@ -477,7 +481,7 @@ void AutomatedRssDownloader::updateMatchingArticles()
const QHash < QString , RssFeedPtr > all_feeds = manager - > getAllFeedsAsHash ( ) ;
foreach ( const QListWidgetItem * rule_item , ui - > listRules - > selectedItems ( ) ) {
RssDownloadRulePtr rule = m_r uleList - > getRule ( rule_item - > text ( ) ) ;
RssDownloadRulePtr rule = m_editableR uleList - > getRule ( rule_item - > text ( ) ) ;
if ( ! rule ) continue ;
foreach ( const QString & feed_url , rule - > rssFeeds ( ) ) {
qDebug ( ) < < Q_FUNC_INFO < < feed_url ;