kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

added NoResultButton for search

Browse Source
This commit is contained in:
Myryk
2024-06-06 03:31:22 +02:00
parent d9b4d7033d
commit 7656113e59
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.config/ags/modules/overview/searchbuttons.js
+9
View File
@@ -7,6 +7,15 @@ import { searchItem } from './searchitem.js';
import { execAndClose, couldBeMath, launchCustomCommand } from './miscfunctions.js'; import { execAndClose, couldBeMath, launchCustomCommand } from './miscfunctions.js';
import GeminiService from '../../services/gemini.js'; import GeminiService from '../../services/gemini.js';
export const NoResultButton = () => searchItem({
materialIconName: 'Error',
name: "Search invalid",
content: "No results found!",
onActivate: () => {
App.closeWindow('overview');
},
});
export const DirectoryButton = ({ parentPath, name, type, icon }) => { export const DirectoryButton = ({ parentPath, name, type, icon }) => {
const actionText = Widget.Revealer({ const actionText = Widget.Revealer({
revealChild: false, revealChild: false,
.config/ags/modules/overview/windowcontent.js
+23 -13
View File
@@ -8,7 +8,7 @@ const { execAsync, exec } = Utils;
import { execAndClose, expandTilde, hasUnterminatedBackslash, couldBeMath, launchCustomCommand, ls } from './miscfunctions.js'; import { execAndClose, expandTilde, hasUnterminatedBackslash, couldBeMath, launchCustomCommand, ls } from './miscfunctions.js';
import { import {
CalculationResultButton, CustomCommandButton, DirectoryButton, CalculationResultButton, CustomCommandButton, DirectoryButton,
DesktopEntryButton, ExecuteCommandButton, SearchButton, AiButton DesktopEntryButton, ExecuteCommandButton, SearchButton, AiButton, NoResultButton,
} from './searchbuttons.js'; } from './searchbuttons.js';
import { checkKeybind } from '../.widgetutils/keybind.js'; import { checkKeybind } from '../.widgetutils/keybind.js';
import GeminiService from '../../services/gemini.js'; import GeminiService from '../../services/gemini.js';
@@ -99,7 +99,7 @@ export const SearchAndWindows = () => {
const isAction = text.startsWith('>'); const isAction = text.startsWith('>');
const isDir = (['/', '~'].includes(entry.text[0])); const isDir = (['/', '~'].includes(entry.text[0]));
if (couldBeMath(text)) { // Eval on typing is dangerous, this is a workaround if (userOptions.search.enableMathResults && couldBeMath(text)) { // Eval on typing is dangerous, this is a workaround
try { try {
const fullResult = eval(text.replace(/\^/g, "**")); const fullResult = eval(text.replace(/\^/g, "**"));
// copy // copy
@@ -110,7 +110,7 @@ export const SearchAndWindows = () => {
// console.log(e); // console.log(e);
} }
} }
if (isDir) { if (userOptions.search.enableDirectorySearch && isDir) {
App.closeWindow('overview'); App.closeWindow('overview');
execAsync(['bash', '-c', `xdg-open "${expandTilde(text)}"`, `&`]).catch(print); execAsync(['bash', '-c', `xdg-open "${expandTilde(text)}"`, `&`]).catch(print);
return; return;
@@ -120,24 +120,31 @@ export const SearchAndWindows = () => {
_appSearchResults[0].launch(); _appSearchResults[0].launch();
return; return;
} }
else if (text[0] == '>') { // Custom commands else if (userOptions.search.enableActions && text[0] == '>') { // Custom commands
App.closeWindow('overview'); App.closeWindow('overview');
launchCustomCommand(text); launchCustomCommand(text);
return; return;
} }
// Fallback: Execute command // Fallback: Execute command
if (!isAction && exec(`bash -c "command -v ${text.split(' ')[0]}"`) != '') { if (userOptions.search.enableCommands && !isAction && exec(`bash -c "command -v ${text.split(' ')[0]}"`) != '') {
if (text.startsWith('sudo')) if (text.startsWith('sudo'))
execAndClose(text, true); execAndClose(text, true);
else else
execAndClose(text, false); execAndClose(text, false);
} }
else if (userOptions.search.enableAiSearch) {
else {
GeminiService.send(text); GeminiService.send(text);
App.closeWindow('overview'); App.closeWindow('overview');
App.openWindow('sideleft'); App.openWindow('sideleft');
} }
else if (userOptions.search.enableWebSearch) {
App.closeWindow('overview');
let search = userOptions.search.engineBaseUrl + text;
for (let site of userOptions.search.excludedSites) {
if (site) search += ` -site:${site}`;
}
execAsync(['bash', '-c', `xdg-open '${search}' &`]).catch(print);
}
}, },
onChange: (entry) => { // this is when you type onChange: (entry) => { // this is when you type
const isAction = entry.text[0] == '>'; const isAction = entry.text[0] == '>';
@@ -162,7 +169,7 @@ export const SearchAndWindows = () => {
_appSearchResults = Applications.query(text); _appSearchResults = Applications.query(text);
// Calculate // Calculate
if (couldBeMath(text)) { // Eval on typing is dangerous; this is a small workaround. if (userOptions.search.enableMathResults && couldBeMath(text)) { // Eval on typing is dangerous; this is a small workaround.
try { try {
const fullResult = eval(text.replace(/\^/g, "**")); const fullResult = eval(text.replace(/\^/g, "**"));
resultsBox.add(CalculationResultButton({ result: fullResult, text: text })); resultsBox.add(CalculationResultButton({ result: fullResult, text: text }));
@@ -170,14 +177,14 @@ export const SearchAndWindows = () => {
// console.log(e); // console.log(e);
} }
} }
if (isDir) { if (userOptions.search.enableDirectorySearch && isDir) {
var contents = []; var contents = [];
contents = ls({ path: text, silent: true }); contents = ls({ path: text, silent: true });
contents.forEach((item) => { contents.forEach((item) => {
resultsBox.add(DirectoryButton(item)); resultsBox.add(DirectoryButton(item));
}) })
} }
if (isAction) { // Eval on typing is dangerous, this is a workaround. if (userOptions.search.enableActions && isAction) { // Eval on typing is dangerous, this is a workaround.
resultsBox.add(CustomCommandButton({ text: entry.text })); resultsBox.add(CustomCommandButton({ text: entry.text }));
} }
// Add application entries // Add application entries
@@ -190,13 +197,16 @@ export const SearchAndWindows = () => {
// Fallbacks // Fallbacks
// if the first word is an actual command // if the first word is an actual command
if (!isAction && !hasUnterminatedBackslash(text) && exec(`bash -c "command -v ${text.split(' ')[0]}"`) != '') { if (userOptions.search.enableCommands && !isAction && !hasUnterminatedBackslash(text) && exec(`bash -c "command -v ${text.split(' ')[0]}"`) != '') {
resultsBox.add(ExecuteCommandButton({ command: entry.text, terminal: entry.text.startsWith('sudo') })); resultsBox.add(ExecuteCommandButton({ command: entry.text, terminal: entry.text.startsWith('sudo') }));
} }
// Add fallback: search // Add fallback: search
resultsBox.add(AiButton({ text: entry.text })); if (userOptions.search.enableAiSearch)
resultsBox.add(SearchButton({ text: entry.text })); resultsBox.add(AiButton({ text: entry.text }));
if (userOptions.search.enableWebSearch)
resultsBox.add(SearchButton({ text: entry.text }));
if (resultsBox.children.length == 0) resultsBox.add(NoResultButton());
resultsBox.show_all(); resultsBox.show_all();
}, },
}); });