Skip to content

disable() stops the scanner it started #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jackicus merged 1 commit into from
Oct 7, 2026
Merged

disable() stops the scanner it started #98

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions src/lib/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export class LibraryApp {
this._builtBounds = null;
this._rebuildTimer = 0;
this._closeTimer = 0;
this._scanCancel = null;
this._scanProc = null;
this._keptAlive = [];
this._libraryWorkspace = null;
this._detailWorkspace = null;
Expand Down Expand Up @@ -243,8 +243,8 @@ export class LibraryApp {
}
this._rebuildTimer = 0;
this._closeTimer = 0;
this._scanCancel?.cancel();
this._scanCancel = null;
this._scanProc?.force_exit();
this._scanProc = null;
this._leaving.clear();
this._teardown();
settle('slide hook', () => removeSlideHook());
Expand Down Expand Up @@ -604,24 +604,23 @@ export class LibraryApp {

// In a process of its own, as the preferences' Rescan runs it (backend/CLAUDE.md).
_scan(key) {
if (this._scanCancel)
if (this._scanProc)
return;
const cancel = new Gio.Cancellable();
this._scanCancel = cancel;
const scanner = GLib.build_filenamev([this._extension.path, 'backend', 'scanLibrary.js']);
let proc;
try {
proc = Gio.Subprocess.new(['gjs', '-m', scanner, '--only', key],
Gio.SubprocessFlags.STDOUT_SILENCE | Gio.SubprocessFlags.STDERR_PIPE);
} catch (e) {
this._scanCancel = null;
this._scanFailed(e.message);
return;
}
proc.communicate_utf8_async(null, cancel, (_proc, result) => {
if (cancel.is_cancelled())
this._scanProc = proc;
// A scan that disable() stopped still lands here, and is not ours any more.
proc.communicate_utf8_async(null, null, (_proc, result) => {
if (this._scanProc !== proc)
return;
this._scanCancel = null;
this._scanProc = null;
try {
const [, , stderr] = proc.communicate_utf8_finish(result);
if (!proc.get_successful())
Expand Down
Loading