crtxcr/looqs
1
0
Fork 0
Koodi Ongelmat Pull-pyynnöt 1 Julkaisut Wiki Toiminta

WIP/outlineindex #41

Avoinna
crtxcr haluaa yhdistää 12 committia lähteestä WIP/outlineindex kohteeseen dev
vedä kohteesta: WIP/outlineindex
merge into: crtxcr:dev
Keskustelu 0 Commitit 12 Muuttuneet tiedostot 24 +5 -6
1 muutettua tiedostoa jossa 5 lisäystä ja 6 poistoa
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 18b18d5103 - Show all commits

11
shared/filesaver.cpp
Näytä tiedosto

@ -110,7 +110,7 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo) SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
{ {
QVector<PageData> pageData; DocumentProcessResult processResult;
QString canonicalPath = fileInfo.canonicalFilePath(); QString canonicalPath = fileInfo.canonicalFilePath();
int processorReturnCode = -1; int processorReturnCode = -1;
@ -169,11 +169,10 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
* finishes. * finishes.
*/ */
QDataStream in(process.readAllStandardOutput()); QDataStream in(process.readAllStandardOutput());
while(!in.atEnd())
if(!in.atEnd())
{ {
PageData pd; in >> processResult;
in >> pd;
pageData.append(pd);
} }
processorReturnCode = process.exitCode(); processorReturnCode = process.exitCode();
if(processorReturnCode != OK && processorReturnCode != OK_WASEMPTY) if(processorReturnCode != OK && processorReturnCode != OK_WASEMPTY)
@ -185,7 +184,7 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
} }
} }
} }
SaveFileResult result = this->dbService->saveFile(fileInfo, pageData, this->fileSaverOptions.metadataOnly); SaveFileResult result = this->dbService->saveFile(fileInfo, processResult, this->fileSaverOptions.metadataOnly);
if(result == OK && processorReturnCode == OK_WASEMPTY) if(result == OK && processorReturnCode == OK_WASEMPTY)
{ {
return OK_WASEMPTY; return OK_WASEMPTY;