Skip to content
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.

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

State Check on Startup #8

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
schemas/*.compiled
163 changes: 142 additions & 21 deletions extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -513,41 +513,162 @@ export default class CustomQuickToggleExtension extends Extension {
buttonClick5 = this._settings.get_int('buttonclick5-setting');
buttonClick6 = this._settings.get_int('buttonclick6-setting');

function checkDynamicState(command, callback) {
try {
let [success, pid] = GLib.spawn_async(
null,
["/bin/bash", "-c", command],
null,
GLib.SpawnFlags.SEARCH_PATH |
GLib.SpawnFlags.DO_NOT_REAP_CHILD |
GLib.SpawnFlags.STDOUT_TO_DEV_NULL,
null,
);

if (success) {
GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, (pid, status) => {
try {
let result = status === 0; // Assuming exit code 0 means true
callback(result);
} catch (e) {
console.log(`Error in dynamic state callback: ${e}`);
callback(false);
}
});
} else {
console.log("Failed to spawn command");
callback(false);
}
} catch (e) {
console.log(`Error checking dynamic state: ${e}`);
callback(false);
}
}

switch (initialState1) {
case 0: toggleState1 = true; this._settings.set_boolean('togglestate1-setting', true); break;
case 1: toggleState1 = false; this._settings.set_boolean('togglestate1-setting', false); break;
case 2: toggleState1 = this._settings.get_boolean('togglestate1-setting'); break;
case 0:
toggleState1 = true;
break;
case 1:
toggleState1 = false;
break;
case 2:
toggleState1 = this._settings.get_boolean("togglestate1-setting");
break;
case 3:
let cmd = this._settings.get_string("checkcommand1-setting");
checkDynamicState(cmd, (result) => {
toggleState1 = result;
this._indicator1.toggle1.checked = result;
});
break;
}

switch (initialState2) {
case 0: toggleState2 = true; this._settings.set_boolean('togglestate2-setting', true); break;
case 1: toggleState2 = false; this._settings.set_boolean('togglestate2-setting', false); break;
case 2: toggleState2 = this._settings.get_boolean('togglestate2-setting'); break;
case 0:
toggleState2 = true;
this._settings.set_boolean("togglestate2-setting", true);
break;
case 1:
toggleState2 = false;
this._settings.set_boolean("togglestate2-setting", false);
break;
case 2:
toggleState2 = this._settings.get_boolean("togglestate2-setting");
break;
case 3:
let cmd = this._settings.get_string("checkcommand2-setting");
checkDynamicState(cmd, (result) => {
toggleState2 = result;
this._indicator2.toggle1.checked = result;
});
break;
}
switch (initialState3) {
case 0: toggleState3 = true; this._settings.set_boolean('togglestate3-setting', true); break;
case 1: toggleState3 = false; this._settings.set_boolean('togglestate3-setting', false); break;
case 2: toggleState3 = this._settings.get_boolean('togglestate3-setting'); break;
case 0:
toggleState3 = true;
this._settings.set_boolean("togglestate3-setting", true);
break;
case 1:
toggleState3 = false;
this._settings.set_boolean("togglestate3-setting", false);
break;
case 2:
toggleState3 = this._settings.get_boolean("togglestate3-setting");
break;
case 3:
let cmd = this._settings.get_string("checkcommand3-setting");
checkDynamicState(cmd, (result) => {
toggleState3 = result;
this._indicator3.toggle1.checked = result;
});
break;
}
switch (initialState4) {
case 0: toggleState4 = true; this._settings.set_boolean('togglestate4-setting', true); break;
case 1: toggleState4 = false; this._settings.set_boolean('togglestate4-setting', false); break;
case 2: toggleState4 = this._settings.get_boolean('togglestate4-setting'); break;
case 0:
toggleState4 = true;
this._settings.set_boolean("togglestate4-setting", true);
break;
case 1:
toggleState4 = false;
this._settings.set_boolean("togglestate4-setting", false);
break;
case 2:
toggleState4 = this._settings.get_boolean("togglestate4-setting");
break;
case 3:
let cmd = this._settings.get_string("checkcommand4-setting");
checkDynamicState(cmd, (result) => {
toggleState4 = result;
this._indicator4.toggle1.checked = result;
});
break;
}
switch (initialState5) {
case 0: toggleState5 = true; this._settings.set_boolean('togglestate5-setting', true); break;
case 1: toggleState5 = false; this._settings.set_boolean('togglestate5-setting', false); break;
case 2: toggleState5 = this._settings.get_boolean('togglestate5-setting'); break;
case 0:
toggleState5 = true;
this._settings.set_boolean("togglestate5-setting", true);
break;
case 1:
toggleState5 = false;
this._settings.set_boolean("togglestate5-setting", false);
break;
case 2:
toggleState5 = this._settings.get_boolean("togglestate5-setting");
break;
case 3:
let cmd = this._settings.get_string("checkcommand5-setting");
checkDynamicState(cmd, (result) => {
toggleState5 = result;
this._indicator5.toggle1.checked = result;
});
break;
}
switch (initialState6) {
case 0: toggleState6 = true; this._settings.set_boolean('togglestate6-setting', true); break;
case 1: toggleState6 = false; this._settings.set_boolean('togglestate6-setting', false); break;
case 2: toggleState6 = this._settings.get_boolean('togglestate6-setting'); break;
case 0:
toggleState6 = true;
this._settings.set_boolean("togglestate6-setting", true);
break;
case 1:
toggleState6 = false;
this._settings.set_boolean("togglestate6-setting", false);
break;
case 2:
toggleState6 = this._settings.get_boolean("togglestate6-setting");
break;
case 3:
let cmd = this._settings.get_string("checkcommand6-setting");
checkDynamicState(cmd, (result) => {
toggleState6 = result;
this._indicator6.toggle1.checked = result;
});
break;
}

refreshIndicator.call(this);

// Run commands at boot

// Run commands at boot
let toggleStates = [ toggleState1, toggleState2, toggleState3, toggleState4, toggleState5, toggleState6 ];
for (let i = 1; i <= numToggleButtons; i++) {
const runAtBootSetting = this._settings.get_boolean(`runcommandatboot${i}-setting`);
Expand Down
23 changes: 20 additions & 3 deletions prefs.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,33 @@ export default class CustomCommandTogglePreferences extends ExtensionPreferences
groups.push(group3);

const optionList = new Gtk.StringList();
[_('On'), _('Off'), _('Previous state')].forEach(choice => optionList.append(choice));
[_('On'), _('Off'), _('Previous state'), _('Check state dynamically')].forEach(choice => optionList.append(choice));

const comboRow = new Adw.ComboRow({
title: _('Initial State'),
subtitle: _('State of the toggle button at login/startup'),
model: optionList,
selected: window._settings.get_int(`initialtogglestate${pageIndex}-setting`),
});
group3.add(comboRow);


const checkCommandRow = new Adw.EntryRow({
title: _("Check State Command:"),
});
checkCommandRow.visible = comboRow.selected === 3;
group3.add(checkCommandRow);

comboRow.connect("notify::selected", () => {
checkCommandRow.visible = comboRow.selected === 3;
});

window._settings.bind(
`checkcommand${pageIndex}-setting`,
checkCommandRow,
"text",
Gio.SettingsBindFlags.DEFAULT,
);

const expanderRow = new Adw.ExpanderRow({
title: _('Run Command at Startup'),
subtitle: _('Run associated toggle command at login/startup'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
<schema id="org.gnome.shell.extensions.custom-command-toggle" path="/org/gnome/shell/extensions/custom-command-toggle/">

<key name="numbuttons-setting" type="i">
<default>1</default>
</key>
Expand All @@ -24,6 +24,11 @@
<key name="togglestate1-setting" type="b">
<default>false</default>
</key>
<key name="checkcommand1-setting" type="s">
<default>''</default>
<summary>Check state command for button 1</summary>
<description>Command to check current state for button 1</description>
</key>
<key name="runcommandatboot1-setting" type="b">
<default>false</default>
</key>
Expand Down Expand Up @@ -61,6 +66,11 @@
<key name="togglestate2-setting" type="b">
<default>false</default>
</key>
<key name="checkcommand2-setting" type="s">
<default>''</default>
<summary>Check state command for button 2</summary>
<description>Command to check current state for button 2</description>
</key>
<key name="runcommandatboot2-setting" type="b">
<default>false</default>
</key>
Expand All @@ -75,7 +85,7 @@
</key>
<key name="closemenu2-setting" type="b">
<default>false</default>
</key>
</key>
<key name='keybinding2-setting' type='as'>
<default><![CDATA[['']]]></default>
</key>
Expand All @@ -98,12 +108,22 @@
<key name="togglestate3-setting" type="b">
<default>false</default>
</key>
<key name="checkcommand3-setting" type="s">
<default>''</default>
<summary>Check state command for button 2</summary>
<description>Command to check current state for button 2</description>
</key>
<key name="checkregex3-setting" type="s">
<default>''</default>
<summary>Check state regex for button 2</summary>
<description>Regex pattern to match for ON state for button 2</description>
</key>
<key name="runcommandatboot3-setting" type="b">
<default>false</default>
</key>
<key name="delaytime3-setting" type="i">
<default>3</default>
</key>
</key>
<key name="showindicator3-setting" type="b">
<default>true</default>
</key>
Expand All @@ -112,7 +132,7 @@
</key>
<key name="closemenu3-setting" type="b">
<default>false</default>
</key>
</key>
<key name='keybinding3-setting' type='as'>
<default><![CDATA[['']]]></default>
</key>
Expand All @@ -135,6 +155,11 @@
<key name="togglestate4-setting" type="b">
<default>false</default>
</key>
<key name="checkcommand4-setting" type="s">
<default>''</default>
<summary>Check state command for button 2</summary>
<description>Command to check current state for button 2</description>
</key>
<key name="runcommandatboot4-setting" type="b">
<default>false</default>
</key>
Expand All @@ -149,7 +174,7 @@
</key>
<key name="closemenu4-setting" type="b">
<default>false</default>
</key>
</key>
<key name='keybinding4-setting' type='as'>
<default><![CDATA[['']]]></default>
</key>
Expand All @@ -172,6 +197,11 @@
<key name="togglestate5-setting" type="b">
<default>false</default>
</key>
<key name="checkcommand5-setting" type="s">
<default>''</default>
<summary>Check state command for button 2</summary>
<description>Command to check current state for button 2</description>
</key>
<key name="runcommandatboot5-setting" type="b">
<default>false</default>
</key>
Expand All @@ -189,7 +219,7 @@
</key>
<key name='keybinding5-setting' type='as'>
<default><![CDATA[['']]]></default>
</key>
</key>

<key name="entryrow16-setting" type="s">
<default>'notify-send "Custom Command Toggle" "Button 6 toggled on"'</default>
Expand All @@ -209,6 +239,11 @@
<key name="togglestate6-setting" type="b">
<default>false</default>
</key>
<key name="checkcommand6-setting" type="s">
<default>''</default>
<summary>Check state command for button 2</summary>
<description>Command to check current state for button 2</description>
</key>
<key name="runcommandatboot6-setting" type="b">
<default>false</default>
</key>
Expand All @@ -223,10 +258,10 @@
</key>
<key name="closemenu6-setting" type="b">
<default>false</default>
</key>
</key>
<key name='keybinding6-setting' type='as'>
<default><![CDATA[['']]]></default>
</key>
</key>

</schema>
</schemalist>