mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

SocketAPI: Merge command_RETRIEVE_FOLDER_STATUS and command_RETRIEVE_FILE_STATUS

Browse Source 
They do the same thing because fileStatus calls recursiveFolderStatus
for directories anyway
This commit is contained in:
Olivier Goffart 2014-06-19 15:02:27 +02:00
parent f4ea34e63b
commit db2c198feb
1 changed files with 3 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/mirall/socketapi.cpp
View File

@ -292,58 +292,10 @@ void SocketApi::broadcastMessage(const QString& message)
void SocketApi::command_RETRIEVE_FOLDER_STATUS(const QString& argument, QLocalSocket* socket)
{
// This command is the same as RETRIEVE_FILE_STATUS
qDebug() << Q_FUNC_INFO << argument;
QString statusString;
if( !socket ) {
qDebug() << "No valid socket object.";
return;
}
Folder* folder = FolderMan::instance()->folderForPath( QUrl::fromLocalFile(argument) );
// this can happen in offline mode e.g.: nothing to worry about
if (!folder) {
DEBUG << "folder offline or not watched:" << argument;
statusString = QLatin1String("NOP");
}
QDir dir(argument);
if( statusString.isEmpty() ) {
const QStringList fileEntries = dir.entryList( QDir::Files );
foreach(const QString file, fileEntries) {
const QString absoluteFilePath = dir.absoluteFilePath(file);
SyncFileStatus fileStatus = SocketApiHelper::fileStatus(folder, absoluteFilePath.mid(folder->path().length()) );
if( fileStatus == FILE_STATUS_STAT_ERROR ) {
qDebug() << "XXXXXXXXXXXX FileStatus is STAT ERROR for " << absoluteFilePath;
}
if( fileStatus != FILE_STATUS_SYNC ) {
qDebug() << "SyncFileStatus for " << absoluteFilePath << " is " << fileStatus;
// we found something that is not in sync
statusString = QLatin1String("NEED_SYNC");
break;
}
}
}
if( statusString.isEmpty() ) { // if it is still empty, we check the dirs recursively.
const QStringList dirEntries = dir.entryList( QDir::AllDirs | QDir::NoDotAndDotDot );
foreach(const QString entry, dirEntries) {
QString absoluteFilePath = dir.absoluteFilePath(entry);
SyncFileStatus sfs = SocketApiHelper::recursiveFolderStatus(folder, absoluteFilePath.mid(folder->path().length()) );
if( sfs != FILE_STATUS_SYNC ) {
statusString = QLatin1String("NEED_SYNC");
break;
}
}
}
if( statusString.isEmpty() ) {
statusString = QLatin1String("OK");
}
QString message = QLatin1String("STATUS:")+statusString+QLatin1Char(':')+argument;
sendMessage(socket, message);
command_RETRIEVE_FILE_STATUS(argument, socket);
}
void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, QLocalSocket* socket)