From b6b3e2f3c0dd71a794e5d2c6dd1d29e6d588c0ee Mon Sep 17 00:00:00 2001
From: Albert S <mail@quitesimple.org>
Date: Fri, 24 Jun 2022 17:10:43 +0200
Subject: [PATCH] shared SandBoxedProcessor: Return SaveFileResult, remove
 defines

Not entirely ideal as SandboxedProcessor does not save anything,
but an improvement nevertheless over the current mess
---
 cli/main.cpp                  |  2 +-
 gui/main.cpp                  |  2 +-
 shared/processor.h            |  3 ---
 shared/sandboxedprocessor.cpp | 10 +++++-----
 shared/sandboxedprocessor.h   |  3 ++-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/cli/main.cpp b/cli/main.cpp
index dab030f..408bf7b 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
 
 		QString file = args.at(1);
 		SandboxedProcessor processor(file);
-		return processor.process();
+		return static_cast<int>(processor.process());
 	}
 	Command *cmd = commandFromName(commandName, dbService);
 	if(cmd != nullptr)
diff --git a/gui/main.cpp b/gui/main.cpp
index 2c7d1a4..a421c76 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
 
 			QString file = args.at(2);
 			SandboxedProcessor processor(file);
-			return processor.process();
+			return static_cast<int>(processor.process());
 		}
 	}
 	QString ipcSocketPath = Common::ipcSocketPath();
diff --git a/shared/processor.h b/shared/processor.h
index 4e7d26f..04bd04a 100644
--- a/shared/processor.h
+++ b/shared/processor.h
@@ -10,9 +10,6 @@ enum DataSource
 	ARRAY
 };
 
-#define NOTHING_PROCESSED 4
-#define NO_ACCESS 5
-
 class Processor
 {
   public:
diff --git a/shared/sandboxedprocessor.cpp b/shared/sandboxedprocessor.cpp
index 003fd92..5ae5f7a 100644
--- a/shared/sandboxedprocessor.cpp
+++ b/shared/sandboxedprocessor.cpp
@@ -80,7 +80,7 @@ void SandboxedProcessor::printResults(const QVector<PageData> &pageData)
 	fsstdout.close();
 }
 
-int SandboxedProcessor::process()
+SaveFileResult SandboxedProcessor::process()
 {
 	QFileInfo fileInfo(this->filePath);
 	Processor *processor = processors.value(fileInfo.suffix(), nullptr);
@@ -94,12 +94,12 @@ int SandboxedProcessor::process()
 	}
 	if(!fileInfo.isReadable())
 	{
-		return NO_ACCESS;
+		return NOACCESS;
 	}
 	if(processor == nullptr || processor == nothingProcessor)
 	{
 		/* Nothing to do */
-		return NOTHING_PROCESSED;
+		return OK;
 	}
 
 	QVector<PageData> pageData;
@@ -123,9 +123,9 @@ int SandboxedProcessor::process()
 	catch(LooqsGeneralException &e)
 	{
 		Logger::error() << "SandboxedProcessor: Error while processing" << absPath << ":" << e.message << Qt::endl;
-		return 3 /* PROCESSFAIL */;
+		return PROCESSFAIL;
 	}
 
 	printResults(pageData);
-	return 0;
+	return pageData.isEmpty() ? OK_WASEMPTY : OK;
 }
diff --git a/shared/sandboxedprocessor.h b/shared/sandboxedprocessor.h
index cf4a575..72a8ea1 100644
--- a/shared/sandboxedprocessor.h
+++ b/shared/sandboxedprocessor.h
@@ -3,6 +3,7 @@
 #include <QString>
 #include <QMimeDatabase>
 #include "pagedata.h"
+#include "savefileresult.h"
 
 class SandboxedProcessor
 {
@@ -19,7 +20,7 @@ class SandboxedProcessor
 		this->filePath = filepath;
 	}
 
-	int process();
+	SaveFileResult process();
 };
 
 #endif // SANDBOXEDPROCESSOR_H