Remove temp .ffraw file by default (pass -k to keep .ffraw)

I

Author: uhhKnife

README.md

@@ -51,15 +51,17 @@ Example (default):
 linker.exe patch
 ```
 
-Produces `patch.ff` and `patch.ffraw`.
+Produces `patch.ff`.
 
 Example (force .ffm):
 
 ```
 linker.exe -m patch
 ```
 
-Produces `patch.ffm` and `patch.ffraw`.
+Produces `patch.ffm`.
+
+Note: pass `-k` to keep the generated `.ffraw`; by default it is removed.
 
 ### Unlinker
 

src/linker.cpp

@@ -250,27 +250,47 @@ int main(int argc, char** argv)
 	init_asset_handlers();
 	if (argc < 2)
 	{
-		std::cerr << "Usage: " << argv[0] << " [-m] <modname>    (-m: produce .ffm; default: .ff)" << std::endl;
+		std::cerr << "Usage: " << argv[0] << " [-m] [-k] <modname>    (-m: produce .ffm; default: .ff; -k: keep .ffraw)" << std::endl;
 		return 1;
 	}
 
 	bool make_ffm = false;
+	bool keep_raw = false;
 	std::string name;
 
-	if (argc == 2)
+	for (int i = 1; i < argc; ++i)
 	{
-		fs::path argpath(argv[1]);
-		name = argpath.stem().string();
-	}
-	else if (argc >= 3 && std::string(argv[1]) == "-m")
-	{
-		make_ffm = true;
-		fs::path argpath(argv[2]);
-		name = argpath.stem().string();
+		std::string a(argv[i]);
+		if (a == "-m")
+		{
+			make_ffm = true;
+		}
+		else if (a == "-k")
+		{
+			keep_raw = true;
+		}
+		else if (!a.empty() && a[0] == '-')
+		{
+			std::cerr << "Unknown option: " << a << std::endl;
+			std::cerr << "Usage: " << argv[0] << " [-m] [-k] <modname>    (-m: produce .ffm; default: .ff; -k: keep .ffraw)" << std::endl;
+			return 1;
+		}
+		else
+		{
+			if (name.empty())
+				name = fs::path(a).stem().string();
+			else
+			{
+				std::cerr << "Unexpected argument: " << a << std::endl;
+				std::cerr << "Usage: " << argv[0] << " [-m] [-k] <modname>    (-m: produce .ffm; default: .ff; -k: keep .ffraw)" << std::endl;
+				return 1;
+			}
+		}
 	}
-	else
+
+	if (name.empty())
 	{
-		std::cerr << "Usage: " << argv[0] << " [-m] <modname>    (-m: produce .ffm; default: .ff)" << std::endl;
+		std::cerr << "Usage: " << argv[0] << " [-m] [-k] <modname>    (-m: produce .ffm; default: .ff; -k: keep .ffraw)" << std::endl;
 		return 1;
 	}
 
@@ -306,5 +326,18 @@ int main(int argc, char** argv)
 		return 1;
 	}
 	std::cout << "Successfully wrote: " << ff_out << std::endl;
+
+	if (!keep_raw)
+	{
+		std::error_code ec;
+		if (fs::remove(ffraw, ec))
+		{
+			std::cout << "Removed temporary file: " << ffraw << std::endl;
+		}
+		else if (ec)
+		{
+			std::cerr << "Warning: failed to remove temporary file " << ffraw << ": " << ec.message() << std::endl;
+		}
+	}
 	return 0;
 }