From 13dfb9b1f065eac55e78f8d28fc5c295cc4e19a4 Mon Sep 17 00:00:00 2001
From: Carl Philipp Klemm <philipp@uvos.xyz>
Date: Fri, 10 Feb 2023 14:26:55 +0100
Subject: [PATCH] relaxis: improve error handling some

---
 src/relaxis.cpp | 68 +++++++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/src/relaxis.cpp b/src/relaxis.cpp
index fd6da8b..070c0b2 100644
--- a/src/relaxis.cpp
+++ b/src/relaxis.cpp
@@ -36,47 +36,55 @@ int main(int argc, char** argv)
 	if(!checkDir(outDir))
 		return 1;
 
-	int arg = 1;
-	try
+	for(int arg = 1; arg < argc; ++arg)
 	{
-		for(; arg < argc; ++arg)
+		if(ignoreArgs.find(arg) != ignoreArgs.end())
+			continue;
+		rlx::File file(argv[arg]);
+
+		std::cout<<"Loaded "<<argv[arg]<<" file has "<<file.getProjectCount()<<" project(s)\n";
+
+		for(size_t i = 0; i < file.getProjectCount(); ++i)
 		{
-			if(ignoreArgs.find(arg) != ignoreArgs.end())
-				continue;
-			rlx::File file(argv[arg]);
-
-			std::cout<<"Loaded "<<argv[arg]<<" file has "<<file.getProjectCount()<<" project(s)\n";
-
-			for(size_t i = 0; i < file.getProjectCount(); ++i)
+			try
 			{
 				rlx::Project project = file.getProject(i);
 				std::cout<<"Project "<<i<<" has "<<project.getSpectraCount()<<" spectra\n";
 				for(size_t j = 0; j < project.getSpectraCount(); ++j)
 				{
-					rlx::Spectra spectra = project.getSpectra(j);
-					if(!spectra.fitted)
+					try
 					{
-						std::cout<<"skipping spectra "<<spectra.id<<" as this spectra is not fitted\n";
-						continue;
-					}
-					if(spectra.model.empty())
-					{
-						std::cout<<"skipping spectra "<<spectra.id<<" as this spectra has no model\n";
-						continue;
-					}
+						rlx::Spectra spectra = project.getSpectra(j);
+						if(!spectra.fitted)
+						{
+							std::cout<<"skipping spectra "<<spectra.id<<" as this spectra is not fitted\n";
+							continue;
+						}
+						if(spectra.model.empty())
+						{
+							std::cout<<"skipping spectra "<<spectra.id<<" as this spectra has no model\n";
+							continue;
+						}
 
-					ModelData data;
-					data.data = spectra.data;
-					data.modelStr = spectra.model;
-					data.id = std::to_string(spectra.id);
-					saveData("relaxis", data, outDir, argv[arg]);
+						ModelData data;
+						data.data = spectra.data;
+						data.modelStr = spectra.model;
+						data.id = std::to_string(spectra.id);
+						saveData("relaxis", data, outDir, argv[arg]);
+					}
+					catch(const eis::file_error& err)
+					{
+						std::cerr<<"error spectra " <<i<<" from file "<<argv[arg]<<" librelaxisloaderpp: "<<err.what()<<std::endl;
+						continue;
+					}
 				}
 			}
+			catch(const eis::file_error& err)
+			{
+				std::cerr<<"error reading file "<<argv[arg]<<" librelaxisloaderpp: "<<err.what()<<std::endl;
+				continue;
+			}
 		}
 	}
-	catch(const eis::file_error& err)
-	{
-		std::cerr<<"error reading file "<<argv[arg]<<" librelaxisloaderpp: "<<err.what()<<std::endl;
-		return 1;
-	}
+	return 0;
 }