configuration/main: Set content hash filename for bash in a single place

SimonKagstrom · Jul 9, 2024 · c3f7618 · c3f7618
1 parent 0f11044
commit c3f7618
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/src/configuration.cc b/src/configuration.cc
@@ -493,11 +493,26 @@ class Configuration : public IConfiguration
 			setKey("binary-path", tmp.first);
 			binaryName = tmp.second;
 
+			setKey("binary-name", binaryName);
+
 			if (!keyAsInt("cobertura-only"))
 			{
-				setKey("target-directory",
-						fmt("%s/%s.%08zx", outDirectory.c_str(), binaryName.c_str(),
-								(size_t)hash_file(get_real_path(binaryPath))));
+					IFileParser *parser = IParserManager::getInstance().matchParser(binaryPath);
+
+				if (parser && (parser->getParserType() == "bash" ||
+					parser->getParserType() == "python"))
+				{
+					// Use the path as the hash for non-compiled languages
+					setKey("target-directory",
+							fmt("%s/%s.%08zx", keyAsString("out-directory").c_str(), keyAsString("binary-name").c_str(),
+							std::hash<std::string>()(keyAsString("binary-name").c_str())));
+				}
+				else
+				{
+					setKey("target-directory",
+							fmt("%s/%s.%08zx", outDirectory.c_str(), binaryName.c_str(),
+									(size_t)hash_file(get_real_path(binaryPath))));
+				}
 			}
 			else
 			{
@@ -511,8 +526,6 @@ class Configuration : public IConfiguration
 				return usage();
 			}
 
-			setKey("binary-name", binaryName);
-
 			if (keyAsString("command-name") == "")
 				setKey("command-name", binaryName);
 		}

diff --git a/src/main.cc b/src/main.cc
@@ -224,16 +224,6 @@ static int runKcov(IConfiguration::RunMode_t runningMode)
 		return 1;
 	}
 
-	if ((parser->getParserType() == "bash" ||
-		parser->getParserType() == "python") &&
-		!conf.keyAsInt("cobertura-only"))
-	{
-		// Use the path as the hash for non-compiled languages
-		conf.setKey("target-directory",
-				fmt("%s/%s.%08zx", conf.keyAsString("out-directory").c_str(), conf.keyAsString("binary-name").c_str(),
-				std::hash<std::string>()(conf.keyAsString("binary-name").c_str())));
-	}
-
 	// Match and create an engine
 	IEngineFactory::IEngineCreator &engineCreator =
 			IEngineFactory::getInstance().matchEngine(file);