core/desktopentry: add more logs for diagnosing why terminal isn't being chosen

Author: RGBCube

src/core/desktopentry.cpp

@@ -379,13 +379,19 @@ void DesktopEntry::doExec(
 		auto found = false;
 
 		for (const auto& term: manager->resolvedTerminals) {
-			// Skip if TryExec exists but the binary doesn't.
-			if (!term.tryExec.isEmpty() && QStandardPaths::findExecutable(term.tryExec).isEmpty())
+			if (!term.tryExec.isEmpty() && QStandardPaths::findExecutable(term.tryExec).isEmpty()) {
+				qCWarning(logDesktopEntry) << "Terminal" << term.command.first() << "TryExec"
+				                           << term.tryExec << "not found in PATH (skipping)";
 				continue;
+			}
 
-			// Skip if command is empty or the first item (the executable) doesn't exist.
 			if (term.command.isEmpty() || QStandardPaths::findExecutable(term.command.first()).isEmpty())
+			{
+				qCWarning(logDesktopEntry)
+				    << "Terminal executable" << (term.command.isEmpty() ? "(empty)" : term.command.first())
+				    << "not found in PATH (skipping)";
 				continue;
+			}
 
 			command = QList<QString>();
 			command.append(term.command);
@@ -816,10 +822,19 @@ void DesktopEntryManager::onScanCompleted(const QList<ParsedDesktopEntryData>& s
 		};
 
 		// Scan-time validation: structural checks only, no PATH lookups.
-		auto isValidTerminal = [](const DesktopEntry* entry) -> bool {
-			if (!entry->bCategories.value().contains("TerminalEmulator")) return false;
-			if (entry->bCommand.value().isEmpty()) return false;
-			if (!entry->terminal.execArg.has_value()) return false;
+		auto isValidTerminal = [](const DesktopEntry* entry, auto&& log) -> bool {
+			if (!entry->bCategories.value().contains("TerminalEmulator")) {
+				log(entry->mId, "missing TerminalEmulator category");
+				return false;
+			}
+			if (entry->bCommand.value().isEmpty()) {
+				log(entry->mId, "has empty Exec command");
+				return false;
+			}
+			if (!entry->terminal.execArg.has_value()) {
+				log(entry->mId, "missing [X-]TerminalArgExec");
+				return false;
+			}
 			return true;
 		};
 
@@ -843,19 +858,24 @@ void DesktopEntryManager::onScanCompleted(const QList<ParsedDesktopEntryData>& s
 			if (configEntry.exclude || configEntry.protect) continue;
 
 			auto* dentry = this->byId(configEntry.id);
-			if (!dentry || !isValidTerminal(dentry)) continue;
+			if (!dentry) {
+				qCWarning(logDesktopEntry)
+				    << "Terminal" << configEntry.id
+				    << "not found in desktop entries (instructed from xdg-terminals.list)";
+				continue;
+			}
+			if (!isValidTerminal(dentry, termWarn)) continue;
 
 			auto command = dentry->bCommand.value();
 			if (!configEntry.action.isEmpty()) {
-				auto found = false;
-				for (auto* action: dentry->actions()) {
-					if (action->mId == configEntry.action) {
-						command = action->bCommand.value();
-						found = true;
-						break;
-					}
+				auto actions = dentry->actions();
+				auto action = std::ranges::find(actions, configEntry.action, &DesktopAction::mId);
+				if (action == actions.end()) {
+					qCWarning(logDesktopEntry)
+					    << "Terminal entry" << configEntry.id << "no action named" << configEntry.action;
+					continue;
 				}
-				if (!found) continue;
+				command = (*action)->bCommand.value();
 			}
 
 			addResolved(dentry, command);
@@ -870,7 +890,7 @@ void DesktopEntryManager::onScanCompleted(const QList<ParsedDesktopEntryData>& s
 		std::ranges::sort(fallbackEntries, {}, &DesktopEntry::mId);
 		for (auto* entry: fallbackEntries) {
 			if (addedIds.contains(entry->mId)) continue;
-			if (!isValidTerminal(entry)) continue;
+			if (!isValidTerminal(entry, termDebug)) continue;
 			if (excludedIds.contains(entry->mId) && !protectedIds.contains(entry->mId)) continue;
 
 			addResolved(entry, entry->bCommand.value());