mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 05:15:40 +03:00
Rename jobCompleted -> itemCompleted.
Because that's what's going on. A job can 'complete an item' or 'finish'. Note that several jobs could complete the same item: a new directory will complete on the PropagateRemoteMkdir and the PropagateDirectory jobs.
This commit is contained in:
parent
fe42c1a818
commit
5bd631e8e7
12 changed files with 37 additions and 37 deletions
|
@ -861,8 +861,8 @@ void Folder::startSync(const QStringList &pathList)
|
|||
SLOT(slotAboutToRemoveAllFiles(SyncFileItem::Direction,bool*)));
|
||||
connect(_engine.data(), SIGNAL(folderDiscovered(bool,QString)), this, SLOT(slotFolderDiscovered(bool,QString)));
|
||||
connect(_engine.data(), SIGNAL(transmissionProgress(ProgressInfo)), this, SLOT(slotTransmissionProgress(ProgressInfo)));
|
||||
connect(_engine.data(), SIGNAL(jobCompleted(const SyncFileItem &, const PropagatorJob &)),
|
||||
this, SLOT(slotJobCompleted(const SyncFileItem &, const PropagatorJob &)));
|
||||
connect(_engine.data(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)),
|
||||
this, SLOT(slotItemCompleted(const SyncFileItem &, const PropagatorJob &)));
|
||||
connect(_engine.data(), SIGNAL(syncItemDiscovered(const SyncFileItem &)), this, SLOT(slotSyncItemDiscovered(const SyncFileItem &)));
|
||||
connect(_engine.data(), SIGNAL(newBigFolder(QString)), this, SLOT(slotNewBigFolderDiscovered(QString)));
|
||||
|
||||
|
@ -1047,8 +1047,8 @@ void Folder::slotTransmissionProgress(const ProgressInfo &pi)
|
|||
ProgressDispatcher::instance()->setProgressInfo(alias(), pi);
|
||||
}
|
||||
|
||||
// a job is completed: count the errors and forward to the ProgressDispatcher
|
||||
void Folder::slotJobCompleted(const SyncFileItem &item, const PropagatorJob& job)
|
||||
// a item is completed: count the errors and forward to the ProgressDispatcher
|
||||
void Folder::slotItemCompleted(const SyncFileItem &item, const PropagatorJob& job)
|
||||
{
|
||||
if (item.hasErrorStatus()) {
|
||||
_stateLastSyncItemsWithError.insert(item._file);
|
||||
|
@ -1058,7 +1058,7 @@ void Folder::slotJobCompleted(const SyncFileItem &item, const PropagatorJob& job
|
|||
// Count all error conditions.
|
||||
_syncResult.setWarnCount(_syncResult.warnCount()+1);
|
||||
}
|
||||
emit ProgressDispatcher::instance()->jobCompleted(alias(), item, job);
|
||||
emit ProgressDispatcher::instance()->itemCompleted(alias(), item, job);
|
||||
}
|
||||
|
||||
void Folder::slotSyncItemDiscovered(const SyncFileItem & item)
|
||||
|
|
|
@ -242,7 +242,7 @@ private slots:
|
|||
|
||||
void slotFolderDiscovered(bool local, QString folderName);
|
||||
void slotTransmissionProgress(const ProgressInfo& pi);
|
||||
void slotJobCompleted(const SyncFileItem&, const PropagatorJob&);
|
||||
void slotItemCompleted(const SyncFileItem&, const PropagatorJob&);
|
||||
void slotSyncItemDiscovered(const SyncFileItem & item);
|
||||
|
||||
void slotRunEtagJob();
|
||||
|
|
|
@ -43,8 +43,8 @@ ProtocolWidget::ProtocolWidget(QWidget *parent) :
|
|||
|
||||
connect(ProgressDispatcher::instance(), SIGNAL(progressInfo(QString,ProgressInfo)),
|
||||
this, SLOT(slotProgressInfo(QString,ProgressInfo)));
|
||||
connect(ProgressDispatcher::instance(), SIGNAL(jobCompleted(QString,SyncFileItem,PropagatorJob)),
|
||||
this, SLOT(slotJobComplete(QString,SyncFileItem,PropagatorJob)));
|
||||
connect(ProgressDispatcher::instance(), SIGNAL(itemCompleted(QString,SyncFileItem,PropagatorJob)),
|
||||
this, SLOT(slotItemCompleted(QString,SyncFileItem,PropagatorJob)));
|
||||
|
||||
connect(_ui->_treeWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), SLOT(slotOpenFile(QTreeWidgetItem*,int)));
|
||||
|
||||
|
@ -281,7 +281,7 @@ void ProtocolWidget::slotProgressInfo( const QString& folder, const ProgressInfo
|
|||
}
|
||||
}
|
||||
|
||||
void ProtocolWidget::slotJobComplete(const QString &folder, const SyncFileItem &item, const PropagatorJob &job)
|
||||
void ProtocolWidget::slotItemCompleted(const QString &folder, const SyncFileItem &item, const PropagatorJob &job)
|
||||
{
|
||||
if (qobject_cast<const PropagateDirectory*>(&job)) {
|
||||
return;
|
||||
|
|
|
@ -47,7 +47,7 @@ public:
|
|||
|
||||
public slots:
|
||||
void slotProgressInfo( const QString& folder, const ProgressInfo& progress );
|
||||
void slotJobComplete( const QString& folder, const SyncFileItem& item, const PropagatorJob& job);
|
||||
void slotItemCompleted( const QString& folder, const SyncFileItem& item, const PropagatorJob& job);
|
||||
void slotOpenFile( QTreeWidgetItem* item, int );
|
||||
|
||||
protected slots:
|
||||
|
|
|
@ -127,8 +127,8 @@ SocketApi::SocketApi(QObject* parent)
|
|||
|
||||
// folder watcher
|
||||
connect(FolderMan::instance(), SIGNAL(folderSyncStateChange(Folder*)), this, SLOT(slotUpdateFolderView(Folder*)));
|
||||
connect(ProgressDispatcher::instance(), SIGNAL(jobCompleted(QString, const SyncFileItem &, const PropagatorJob &)),
|
||||
SLOT(slotJobCompleted(QString, const SyncFileItem &)));
|
||||
connect(ProgressDispatcher::instance(), SIGNAL(itemCompleted(QString, const SyncFileItem &, const PropagatorJob &)),
|
||||
SLOT(slotItemCompleted(QString, const SyncFileItem &)));
|
||||
connect(ProgressDispatcher::instance(), SIGNAL(syncItemDiscovered(QString, const SyncFileItem &)),
|
||||
this, SLOT(slotSyncItemDiscovered(QString, const SyncFileItem &)));
|
||||
}
|
||||
|
@ -275,7 +275,7 @@ void SocketApi::slotUpdateFolderView(Folder *f)
|
|||
}
|
||||
}
|
||||
|
||||
void SocketApi::slotJobCompleted(const QString &folder, const SyncFileItem &item)
|
||||
void SocketApi::slotItemCompleted(const QString &folder, const SyncFileItem &item)
|
||||
{
|
||||
if (_listeners.isEmpty()) {
|
||||
return;
|
||||
|
|
|
@ -66,7 +66,7 @@ private slots:
|
|||
void slotNewConnection();
|
||||
void onLostConnection();
|
||||
void slotReadSocket();
|
||||
void slotJobCompleted(const QString &, const SyncFileItem &);
|
||||
void slotItemCompleted(const QString &, const SyncFileItem &);
|
||||
void slotSyncItemDiscovered(const QString &, const SyncFileItem &);
|
||||
|
||||
private:
|
||||
|
|
|
@ -135,7 +135,7 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
|
|||
|
||||
_item->_status = status;
|
||||
|
||||
emit completed(*_item, *this);
|
||||
emit itemCompleted(*_item, *this);
|
||||
emit finished(status);
|
||||
}
|
||||
|
||||
|
@ -187,8 +187,8 @@ bool PropagateItemJob::checkForProblemsWithShared(int httpStatusCode, const QStr
|
|||
if( newJob ) {
|
||||
newJob->setRestoreJobMsg(msg);
|
||||
_restoreJob.reset(newJob);
|
||||
connect(_restoreJob.data(), SIGNAL(completed(const SyncFileItemPtr &, const PropagatorJob &)),
|
||||
this, SLOT(slotRestoreJobCompleted(const SyncFileItemPtr &, const PropagatorJob &)));
|
||||
connect(_restoreJob.data(), SIGNAL(itemCompleted(const SyncFileItemPtr &, const PropagatorJob &)),
|
||||
this, SLOT(slotRestoreJobCompleted(const SyncFileItemPtr &)));
|
||||
QMetaObject::invokeMethod(newJob, "start");
|
||||
}
|
||||
return true;
|
||||
|
@ -354,8 +354,8 @@ void OwncloudPropagator::start(const SyncFileItemVector& items)
|
|||
_rootJob->append(it);
|
||||
}
|
||||
|
||||
connect(_rootJob.data(), SIGNAL(completed(const SyncFileItem &, const PropagatorJob &)),
|
||||
this, SIGNAL(completed(const SyncFileItem &, const PropagatorJob &)));
|
||||
connect(_rootJob.data(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)),
|
||||
this, SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
|
||||
connect(_rootJob.data(), SIGNAL(progress(const SyncFileItem &,quint64)), this, SIGNAL(progress(const SyncFileItem &,quint64)));
|
||||
connect(_rootJob.data(), SIGNAL(finished(SyncFileItem::Status)), this, SLOT(emitFinished()));
|
||||
connect(_rootJob.data(), SIGNAL(ready()), this, SLOT(scheduleNextJob()), Qt::QueuedConnection);
|
||||
|
@ -612,7 +612,7 @@ void PropagateDirectory::slotSubJobFinished(SyncFileItem::Status status)
|
|||
(sender() == _firstJob.data() && status != SyncFileItem::Success && status != SyncFileItem::Restoration)) {
|
||||
abort();
|
||||
_state = Finished;
|
||||
emit completed(*_item, *this);
|
||||
emit itemCompleted(*_item, *this);
|
||||
emit finished(status);
|
||||
return;
|
||||
} else if (status == SyncFileItem::NormalError || status == SyncFileItem::SoftError) {
|
||||
|
@ -656,7 +656,7 @@ void PropagateDirectory::finalize()
|
|||
}
|
||||
}
|
||||
_state = Finished;
|
||||
emit completed(*_item, *this);
|
||||
emit itemCompleted(*_item, *this);
|
||||
emit finished(_hasError == SyncFileItem::NoStatus ? SyncFileItem::Success : _hasError);
|
||||
}
|
||||
|
||||
|
|
|
@ -94,7 +94,7 @@ signals:
|
|||
/**
|
||||
* Emitted when one item has been completed within a job.
|
||||
*/
|
||||
void completed(const SyncFileItem &, const PropagatorJob &);
|
||||
void itemCompleted(const SyncFileItem &, const PropagatorJob &);
|
||||
|
||||
/**
|
||||
* Emitted when all the sub-jobs have been finished and
|
||||
|
@ -207,8 +207,8 @@ private slots:
|
|||
bool possiblyRunNextJob(PropagatorJob *next) {
|
||||
if (next->_state == NotYetStarted) {
|
||||
connect(next, SIGNAL(finished(SyncFileItem::Status)), this, SLOT(slotSubJobFinished(SyncFileItem::Status)), Qt::QueuedConnection);
|
||||
connect(next, SIGNAL(completed(const SyncFileItem &, const PropagatorJob &)),
|
||||
this, SIGNAL(completed(const SyncFileItem &, const PropagatorJob &)));
|
||||
connect(next, SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)),
|
||||
this, SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
|
||||
connect(next, SIGNAL(progress(const SyncFileItem &,quint64)), this, SIGNAL(progress(const SyncFileItem &,quint64)));
|
||||
connect(next, SIGNAL(ready()), this, SIGNAL(ready()));
|
||||
_runningNow++;
|
||||
|
@ -334,7 +334,7 @@ private slots:
|
|||
void scheduleNextJob();
|
||||
|
||||
signals:
|
||||
void completed(const SyncFileItem &, const PropagatorJob &);
|
||||
void itemCompleted(const SyncFileItem &, const PropagatorJob &);
|
||||
void progress(const SyncFileItem&, quint64 bytes);
|
||||
void finished();
|
||||
/**
|
||||
|
|
|
@ -239,11 +239,11 @@ signals:
|
|||
*/
|
||||
void progressInfo( const QString& folder, const ProgressInfo& progress );
|
||||
/**
|
||||
* @brief: the item's job is completed
|
||||
* @brief: the item was completed by a job
|
||||
*/
|
||||
void jobCompleted(const QString &folder,
|
||||
const SyncFileItem & item,
|
||||
const PropagatorJob & job);
|
||||
void itemCompleted(const QString &folder,
|
||||
const SyncFileItem & item,
|
||||
const PropagatorJob & job);
|
||||
|
||||
void syncItemDiscovered(const QString &folder, const SyncFileItem & item);
|
||||
|
||||
|
|
|
@ -682,7 +682,7 @@ void PropagateUploadFileQNAM::slotPutFinished()
|
|||
qWarning() << "Server do not support X-OC-MTime" << job->reply()->rawHeader("X-OC-MTime");
|
||||
#ifdef USE_NEON
|
||||
PropagatorJob *newJob = new UpdateMTimeAndETagJob(_propagator, _item);
|
||||
QObject::connect(newJob, SIGNAL(completed(SyncFileItem, PropagatorJob)),
|
||||
QObject::connect(newJob, SIGNAL(itemCompleted(SyncFileItem, PropagatorJob)),
|
||||
this, SLOT(finalize(SyncFileItem)));
|
||||
QMetaObject::invokeMethod(newJob, "start");
|
||||
return;
|
||||
|
|
|
@ -802,8 +802,8 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
|
|||
|
||||
_propagator = QSharedPointer<OwncloudPropagator>(
|
||||
new OwncloudPropagator (_account, session, _localPath, _remoteUrl, _remotePath, _journal, &_thread));
|
||||
connect(_propagator.data(), SIGNAL(completed(const SyncFileItem &, const PropagatorJob &)),
|
||||
this, SLOT(slotJobCompleted(const SyncFileItem &, const PropagatorJob &)));
|
||||
connect(_propagator.data(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)),
|
||||
this, SLOT(slotItemCompleted(const SyncFileItem &, const PropagatorJob &)));
|
||||
connect(_propagator.data(), SIGNAL(progress(const SyncFileItem &,quint64)),
|
||||
this, SLOT(slotProgress(const SyncFileItem &,quint64)));
|
||||
connect(_propagator.data(), SIGNAL(adjustTotalTransmissionSize(qint64)), this, SLOT(slotAdjustTotalTransmissionSize(qint64)));
|
||||
|
@ -858,7 +858,7 @@ void SyncEngine::setNetworkLimits(int upload, int download)
|
|||
}
|
||||
}
|
||||
|
||||
void SyncEngine::slotJobCompleted(const SyncFileItem &item, const PropagatorJob &job)
|
||||
void SyncEngine::slotItemCompleted(const SyncFileItem &item, const PropagatorJob &job)
|
||||
{
|
||||
const char * instruction_str = csync_instruction_str(item._instruction);
|
||||
qDebug() << Q_FUNC_INFO << item._file << instruction_str << item._status << item._errorString;
|
||||
|
@ -870,7 +870,7 @@ void SyncEngine::slotJobCompleted(const SyncFileItem &item, const PropagatorJob
|
|||
}
|
||||
|
||||
emit transmissionProgress(*_progressInfo);
|
||||
emit jobCompleted(item, job);
|
||||
emit itemCompleted(item, job);
|
||||
}
|
||||
|
||||
void SyncEngine::slotFinished()
|
||||
|
|
|
@ -101,8 +101,8 @@ signals:
|
|||
// after the above signals. with the items that actually need propagating
|
||||
void aboutToPropagate(SyncFileItemVector&);
|
||||
|
||||
// after each job (successful or not)
|
||||
void jobCompleted(const SyncFileItem&, const PropagatorJob&);
|
||||
// after each item completed by a job (successful or not)
|
||||
void itemCompleted(const SyncFileItem&, const PropagatorJob&);
|
||||
|
||||
// after sync is done
|
||||
void treeWalkResult(const SyncFileItemVector&);
|
||||
|
@ -122,7 +122,7 @@ signals:
|
|||
|
||||
private slots:
|
||||
void slotRootEtagReceived(QString);
|
||||
void slotJobCompleted(const SyncFileItem& item, const PropagatorJob & job);
|
||||
void slotItemCompleted(const SyncFileItem& item, const PropagatorJob & job);
|
||||
void slotFinished();
|
||||
void slotProgress(const SyncFileItem& item, quint64 curent);
|
||||
void slotAdjustTotalTransmissionSize(qint64 change);
|
||||
|
|
Loading…
Reference in a new issue