Make public API explicit about blacklist kind. #2301

'blacklist' can mean the selective sync blacklist or the error
blacklist. Names in public API are now explicit about which
blacklist is meant.

src/gui/folder.cpp

@@ -516,14 +516,14 @@ int Folder::downloadInfoCount()
     return _journal.downloadInfoCount();
 }
 
-int Folder::blackListEntryCount()
+int Folder::errorBlackListEntryCount()
 {
-    return _journal.blackListEntryCount();
+    return _journal.errorBlackListEntryCount();
 }
 
-int Folder::slotWipeBlacklist()
+int Folder::slotWipeErrorBlacklist()
 {
-    return _journal.wipeBlacklist();
+    return _journal.wipeErrorBlacklist();
 }
 
 void Folder::slotWatchedPathChanged(const QString& path)

src/gui/folder.h

@@ -162,8 +162,8 @@ public slots:
 
       int slotDiscardDownloadProgress();
       int downloadInfoCount();
-      int slotWipeBlacklist();
-      int blackListEntryCount();
+      int slotWipeErrorBlacklist();
+      int errorBlackListEntryCount();
 
       /**
        * Triggered by the folder watcher when a file/dir in this folder

src/gui/owncloudsetupwizard.cpp

@@ -440,7 +440,7 @@ void OwncloudSetupWizard::slotAssistantFinished( int result )
         if (!startFromScratch || ensureStartFromScratch(localFolder)) {
             qDebug() << "Adding folder definition for" << localFolder << _remoteFolder;
             folderMan->addFolderDefinition(Theme::instance()->appName(),
-                                           localFolder, _remoteFolder, _ocWizard->blacklist() );
+                                           localFolder, _remoteFolder, _ocWizard->selectiveSyncBlacklist() );
             _ocWizard->appendToConfigurationLog(tr("<font color=\"green\"><b>Local sync folder %1 successfully created!</b></font>").arg(localFolder));
         }
     }

src/gui/protocolwidget.cpp

@@ -125,7 +125,7 @@ void ProtocolWidget::slotRetrySync()
     Folder::Map folders = folderMan->map();
 
     foreach( Folder *f, folders ) {
-        int num = f->slotWipeBlacklist();
+        int num = f->slotWipeErrorBlacklist();
         qDebug() << num << "entries were removed from"
                  << f->alias() << "blacklist";
 
@@ -255,7 +255,7 @@ void ProtocolWidget::computeResyncButtonEnabled()
     int blacklist_cnt = 0;
     int downloads_cnt = 0;
     foreach( Folder *f, folders ) {
-        blacklist_cnt += f->blackListEntryCount();
+        blacklist_cnt += f->errorBlackListEntryCount();
         downloads_cnt += f->downloadInfoCount();
     }
 

src/gui/wizard/owncloudadvancedsetuppage.cpp

@@ -198,9 +198,9 @@ QString OwncloudAdvancedSetupPage::localFolder() const
     return folder;
 }
 
-QStringList OwncloudAdvancedSetupPage::blacklist() const
+QStringList OwncloudAdvancedSetupPage::selectiveSyncBlacklist() const
 {
-    return _blacklist;
+    return _selectiveSyncBlacklist;
 }
 
 bool OwncloudAdvancedSetupPage::validatePage()
@@ -276,13 +276,13 @@ void OwncloudAdvancedSetupPage::setConfigExists(bool config)
 void OwncloudAdvancedSetupPage::slotSelectiveSyncClicked()
 {
     // Because clicking on it also changes it, restore it to the previous state in case the user cancel the dialog
-    _ui.rSyncEverything->setChecked(_blacklist.isEmpty());
+    _ui.rSyncEverything->setChecked(_selectiveSyncBlacklist.isEmpty());
 
     AccountPtr acc = static_cast<OwncloudWizard *>(wizard())->account();
-    SelectiveSyncDialog *dlg = new SelectiveSyncDialog(acc, _blacklist, this);
+    SelectiveSyncDialog *dlg = new SelectiveSyncDialog(acc, _selectiveSyncBlacklist, this);
     if (dlg->exec() == QDialog::Accepted) {
-        _blacklist = dlg->createBlackList();
-        if (!_blacklist.isEmpty()) {
+        _selectiveSyncBlacklist = dlg->createBlackList();
+        if (!_selectiveSyncBlacklist.isEmpty()) {
             _ui.rSelectiveSync->blockSignals(true);
             _ui.rSelectiveSync->setChecked(true);
             _ui.rSelectiveSync->blockSignals(false);
@@ -296,15 +296,15 @@ void OwncloudAdvancedSetupPage::slotSelectiveSyncClicked()
             _ui.rSyncEverything->setChecked(true);
             _ui.lSelectiveSyncSizeLabel->setText(QString());
         }
-        wizard()->setProperty("blacklist", _blacklist);
+        wizard()->setProperty("blacklist", _selectiveSyncBlacklist);
     }
 }
 
 void OwncloudAdvancedSetupPage::slotSyncEverythingClicked()
 {
     _ui.lSelectiveSyncSizeLabel->setText(QString());
     _ui.rSyncEverything->setChecked(true);
-    _blacklist.clear();
+    _selectiveSyncBlacklist.clear();
 }
 
 void OwncloudAdvancedSetupPage::slotQuotaRetrieved(qint64, qint64 usedQuota)

src/gui/wizard/owncloudadvancedsetuppage.h

@@ -36,7 +36,7 @@ class OwncloudAdvancedSetupPage: public QWizardPage
   virtual int nextId() const Q_DECL_OVERRIDE;
   bool validatePage() Q_DECL_OVERRIDE;
   QString localFolder() const;
-  QStringList blacklist() const;
+  QStringList selectiveSyncBlacklist() const;
   void setRemoteFolder( const QString& remoteFolder);
   void setMultipleFoldersExist( bool exist );
   void directoriesCreated();
@@ -69,7 +69,7 @@ private slots:
   QProgressIndicator* _progressIndi;
   QString _oldLocalFolder;
   QString _remoteFolder;
-  QStringList _blacklist;
+  QStringList _selectiveSyncBlacklist;
 };
 
 } // namespace OCC

src/gui/wizard/owncloudwizard.cpp

@@ -104,9 +104,9 @@ QString OwncloudWizard::localFolder() const
     return(_advancedSetupPage->localFolder());
 }
 
-QStringList OwncloudWizard::blacklist() const
+QStringList OwncloudWizard::selectiveSyncBlacklist() const
 {
-    return _advancedSetupPage->blacklist();
+    return _advancedSetupPage->selectiveSyncBlacklist();
 }
 
 

src/gui/wizard/owncloudwizard.h

@@ -50,7 +50,7 @@ class OwncloudWizard: public QWizard
     void setupCustomMedia( QVariant, QLabel* );
     QString ocUrl() const;
     QString localFolder() const;
-    QStringList blacklist() const;
+    QStringList selectiveSyncBlacklist() const;
 
     void enableFinishOnResultWidget(bool enable);
 

src/libsync/owncloudpropagator.cpp

@@ -57,13 +57,13 @@ int OwncloudPropagator::maximumActiveJob()
  */
 static bool blacklist(SyncJournalDb* journal, const SyncFileItem& item)
 {
-    SyncJournalBlacklistRecord oldEntry = journal->blacklistEntry(item._file);
-    SyncJournalBlacklistRecord newEntry = SyncJournalBlacklistRecord::update(oldEntry, item);
+    SyncJournalErrorBlacklistRecord oldEntry = journal->errorBlacklistEntry(item._file);
+    SyncJournalErrorBlacklistRecord newEntry = SyncJournalErrorBlacklistRecord::update(oldEntry, item);
 
     if (newEntry.isValid()) {
-        journal->updateBlacklistEntry(newEntry);
+        journal->updateErrorBlacklistEntry(newEntry);
     } else if (oldEntry.isValid()) {
-        journal->wipeBlacklistEntry(item._file);
+        journal->wipeErrorBlacklistEntry(item._file);
     }
 
     return newEntry.isValid();
@@ -106,10 +106,10 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
     case SyncFileItem::Restoration:
         if( _item._hasBlacklistEntry ) {
             // wipe blacklist entry.
-            _propagator->_journal->wipeBlacklistEntry(_item._file);
+            _propagator->_journal->wipeErrorBlacklistEntry(_item._file);
             // remove a blacklist entry in case the file was moved.
             if( _item._originalFile != _item._file ) {
-                _propagator->_journal->wipeBlacklistEntry(_item._originalFile);
+                _propagator->_journal->wipeErrorBlacklistEntry(_item._originalFile);
             }
         }
         break;

src/libsync/syncengine.cpp

@@ -163,14 +163,14 @@ QString SyncEngine::csyncErrorToString(CSYNC_STATUS err)
 
 }
 
-bool SyncEngine::checkBlacklisting( SyncFileItem *item )
+bool SyncEngine::checkErrorBlacklisting( SyncFileItem *item )
 {
     if( !_journal ) {
         qWarning() << "Journal is undefined!";
         return false;
     }
 
-    SyncJournalBlacklistRecord entry = _journal->blacklistEntry(item->_file);
+    SyncJournalErrorBlacklistRecord entry = _journal->errorBlacklistEntry(item->_file);
     item->_hasBlacklistEntry = false;
 
     if( !entry.isValid() ) {
@@ -254,7 +254,7 @@ void SyncEngine::deleteStaleUploadInfos()
     _journal->deleteStaleUploadInfos(upload_file_paths);
 }
 
-void SyncEngine::deleteStaleBlacklistEntries()
+void SyncEngine::deleteStaleErrorBlacklistEntries()
 {
     // Find all blacklisted paths that we want to preserve.
     QSet<QString> blacklist_file_paths;
@@ -264,7 +264,7 @@ void SyncEngine::deleteStaleBlacklistEntries()
     }
 
     // Delete from journal.
-    _journal->deleteStaleBlacklistEntries(blacklist_file_paths);
+    _journal->deleteStaleErrorBlacklistEntries(blacklist_file_paths);
 }
 
 int SyncEngine::treewalkLocal( TREE_WALK_FILE* file, void *data )
@@ -451,7 +451,7 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
     item._direction = dir;
     // check for blacklisting of this item.
     // if the item is on blacklist, the instruction was set to IGNORE
-    checkBlacklisting( &item );
+    checkErrorBlacklisting( &item );
 
     if (!item._isDirectory) {
         _progressInfo._totalFileCount++;
@@ -741,7 +741,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
 
     deleteStaleDownloadInfos();
     deleteStaleUploadInfos();
-    deleteStaleBlacklistEntries();
+    deleteStaleErrorBlacklistEntries();
     _journal->commit("post stale entry removal");
 
     // Emit the started signal only after the propagator has been set up.

src/libsync/syncengine.h

@@ -120,7 +120,7 @@ private slots:
     static int treewalkLocal( TREE_WALK_FILE*, void *);
     static int treewalkRemote( TREE_WALK_FILE*, void *);
     int treewalkFile( TREE_WALK_FILE*, bool );
-    bool checkBlacklisting( SyncFileItem *item );
+    bool checkErrorBlacklisting( SyncFileItem *item );
 
     // Cleans up unnecessary downloadinfo entries in the journal as well
     // as their temporary files.
@@ -129,8 +129,8 @@ private slots:
     // Removes stale uploadinfos from the journal.
     void deleteStaleUploadInfos();
 
-    // Removes stale blacklist entries from the journal.
-    void deleteStaleBlacklistEntries();
+    // Removes stale error blacklist entries from the journal.
+    void deleteStaleErrorBlacklistEntries();
 
     // cleanup and emit the finished signal
     void finalize();