lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

ScreenRecorderService: filter canceled by user (stdout and stderr)

Browse Source
This commit is contained in:
Ly-sec
2025-12-19 13:16:27 +01:00
parent 8202da182f
commit 7fbecc139c
1 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Services/Media/ScreenRecorderService.qml
+27 -11
View File
@@ -105,19 +105,36 @@ Singleton {
killTimer.running = true;
}
// Helper function to check if output indicates user cancellation
function isCancelledByUser(stdoutText, stderrText) {
const stdout = String(stdoutText || "").toLowerCase();
const stderr = String(stderrText || "").toLowerCase();
const combined = stdout + " " + stderr;
// Check for various forms of cancellation messages (case-insensitive)
return combined.includes("canceled by") ||
combined.includes("cancelled by") ||
combined.includes("canceled by user") ||
combined.includes("cancelled by user") ||
combined.includes("canceled by the user") ||
combined.includes("cancelled by the user");
}
// Process to run and monitor gpu-screen-recorder
Process {
id: recorderProcess
stdout: StdioCollector {}
stderr: StdioCollector {}
onExited: function (exitCode, exitStatus) {
const stdout = String(recorderProcess.stdout.text || "").trim();
const stderr = String(recorderProcess.stderr.text || "").trim();
const wasCancelled = isCancelledByUser(stdout, stderr);
if (isPending) {
// Process ended while we were pending - likely cancelled or error
isPending = false;
pendingTimer.running = false;
// Check if gpu-screen-recorder is not installed
const stdout = String(recorderProcess.stdout.text || "").trim();
if (stdout === "GPU_SCREEN_RECORDER_NOT_INSTALLED") {
ToastService.showError(I18n.tr("toast.recording.not-installed"), I18n.tr("toast.recording.not-installed-desc"));
return;
@@ -126,11 +143,8 @@ Singleton {
// If it failed to start, show a clear error toast with stderr
// But don't show error if user intentionally cancelled via portal
if (exitCode !== 0) {
const err = String(recorderProcess.stderr.text || "").trim();
// Check if this was a user cancellation
const wasCancelled = err.includes("canceled by the user") || err.includes("cancelled by the user");
if (err.length > 0 && !wasCancelled) {
ToastService.showError(I18n.tr("toast.recording.failed-start"), err);
if (stderr.length > 0 && !wasCancelled) {
ToastService.showError(I18n.tr("toast.recording.failed-start"), stderr);
}
// If user cancelled, silently return without error toast
}
@@ -142,11 +156,13 @@ Singleton {
if (exitCode === 0) {
ToastService.showNotice(I18n.tr("toast.recording.saved"), outputPath, "settings-screen-recorder");
} else {
const err2 = String(recorderProcess.stderr.text || "").trim();
if (err2.length > 0)
ToastService.showError(I18n.tr("toast.recording.failed-start"), err2);
else
ToastService.showError(I18n.tr("toast.recording.failed-start"), I18n.tr("toast.recording.failed-general"));
// Don't show error if user intentionally cancelled
if (!wasCancelled) {
if (stderr.length > 0)
ToastService.showError(I18n.tr("toast.recording.failed-start"), stderr);
else
ToastService.showError(I18n.tr("toast.recording.failed-start"), I18n.tr("toast.recording.failed-general"));
}
}
}
}