crtxcr
/
looqs
1
0
Forka 0
Codice Problemi Pull Requests 1 Rilasci Wiki Attività

shared: FileSaver: Return OK_WASEMPTY 

We get OK_WASEMPTY from the processor when there
usually should be something. Rarely, this is not the case.

Let the callers know about this state at least
This commit is contained in:
Albert S. 2022-06-24 17:34:11 +02:00
parent 69837ed60f
commit 83ed935790
1 ha cambiato i file con 9 aggiunte e 11 eliminazioni
Mostra statistiche Scarica il file Patch Scarica il file Diff Expand all files Collapse all files

20
shared/filesaver.cpp
Vedi File

@ -98,7 +98,7 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
QVector<PageData> pageData;
QString canonicalPath = fileInfo.canonicalFilePath();
int status = -1;
int processorReturnCode = -1;
if(!fileInfo.isReadable())
{
@ -143,21 +143,19 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
in >> pd;
pageData.append(pd);
}
status = process.exitCode();
if(status != OK)
processorReturnCode = process.exitCode();
if(processorReturnCode != OK && processorReturnCode != OK_WASEMPTY)
{
Logger::error() << "FileSaver::saveFile(): Error while processing" << canonicalPath << ":"
<< "Exit code " << status << Qt::endl;
<< "Exit code " << processorReturnCode << Qt::endl;
return static_cast<SaveFileResult>(status);
return static_cast<SaveFileResult>(processorReturnCode);
}
}
// Could happen if a file corrupted for example
if(pageData.isEmpty() && status != OK)
SaveFileResult result = this->dbService->saveFile(fileInfo, pageData);
if(result == OK && processorReturnCode == OK_WASEMPTY)
{
Logger::error() << "Could not get any content for " << canonicalPath << Qt::endl;
return OK_WASEMPTY;
}
return this->dbService->saveFile(fileInfo, pageData);
return result;
}