Merge pull request #666 from Rigelyon/update-web-search

feat(web-search): Add direct URL and IP opening functionality

Author: spiros132

web-search/LauncherProvider.qml

@@ -20,6 +20,7 @@ Item {
     readonly property string engineName: cfg.search_engine ?? defaults.search_engine ?? "Google"
     readonly property bool showSuggestions: cfg.show_suggestions ?? defaults.show_suggestions ?? true
     readonly property int maxResults: cfg.max_results ?? defaults.max_results ?? 5
+    readonly property bool directUrl: cfg.direct_url ?? defaults.direct_url ?? true
 
     readonly property var engine: {
         if (engineName === "DuckDuckGo") {
@@ -35,6 +36,33 @@ Item {
         }
     }
 
+    function isUrl(text) {
+        if (!text || text.includes(" ")) return false;
+
+        if (/^https?:\/\//i.test(text)) return true;
+
+        const localhostPattern = /^localhost(:[0-9]+)?(\/\S*)?$/i;
+        const ipPattern = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(:[0-9]+)?(\/\S*)?$/;
+        const domainPattern = /^[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z]{2,})+(:[0-9]+)?(\/\S*)?$/;
+
+        return localhostPattern.test(text) || ipPattern.test(text) || domainPattern.test(text);
+    }
+
+    function normalizeUrl(text) {
+        text = text.trim();
+        if (!text) return "";
+        if (/^[a-z0-9]+:\/\//i.test(text)) return text;
+
+        const isLocal = /^localhost(:[0-9]+)?(\/\S*)?$/i.test(text) || 
+                        /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(:[0-9]+)?(\/\S*)?$/.test(text);
+        
+        if (isLocal) {
+            return "http://" + text;
+        }
+
+        return "https://" + text;
+    }
+
     function getResults(searchText) {
         let results = [];
         let rawText = searchText.trim();
@@ -57,6 +85,21 @@ Item {
             }];
         }
 
+        if (directUrl && isUrl(query)) {
+            let url = normalizeUrl(query);
+            results.push({
+                "name": pluginApi?.tr("launcher.openUrl", { url: url }),
+                "description": pluginApi?.tr("launcher.openUrlDescription"),
+                "icon": "link",
+                "isTablerIcon": true,
+                "_score": isCommand ? 1000 : -4,
+                "onActivate": function() {
+                    Qt.openUrlExternally(url);
+                    if (launcher) launcher.close();
+                }
+            });
+        }
+
         results.push({
             "name": pluginApi?.tr("launcher.search", { query: query }),
             "description": pluginApi?.tr("launcher.openIn", { engine: engineName }),

web-search/README.md

@@ -7,33 +7,87 @@ A launcher provider plugin that allows you to quickly search the internet direct
 - **Quick Web Searching**: Search the web instantly without opening a browser first
 - **Live Autocomplete**: Get search suggestions from your preferred engine as you type
 - **Multiple Search Engines**: Support for Google, DuckDuckGo, Bing, Brave, and Yandex
+- **Smart URL Detection**: Automatically detects URLs, IP addresses, and localhost and opens them directly in the browser
 - **Smart Priorities**: Web search acts as a fallback when searching for apps, or takes absolute priority when using the explicit `>web` command
 
 ## Usage
 
 1. Open the Noctalia launcher
-2. Type `>web` to enter web search mode exclusively, OR just type your query directly into the launcher and scroll to the bottom to see web search fallbacks.
-3. Your live suggestions will populate underneath the main result
-4. Hit Enter to open the query in your default browser
+2. Type `>web` followed by your query to enter web search mode exclusively
+3. Or just type your query directly. Web search results appear as fallbacks below matched applications
+4. Live suggestions populate underneath the main result as you type
+5. Press Enter on any result to open it in your default browser
 
 ### Examples
 
-```bash
-# Explicitly search for recipes, bypassing all local files/apps
+**Search with the `>web` command:**
+```
 >web chocolate cake recipe
+```
+This bypasses all local apps/files and shows only web search results. The top result will open a search for "chocolate cake recipe" in your configured engine, with autocomplete suggestions listed below.
 
-# Search fallbacks (appears at bottom of launcher below matched applications)
+**Fallback search:**
+```
 discord
 ```
+Type a query normally. If it matches an installed app, the app appears first. Web search results appear at the bottom as fallbacks, so you can still search for "discord" on the web if the app isn't what you wanted.
+
+**Direct URL navigation:**
+```
+>web github.com/noctalia-dev
+```
+When Direct URL Opening is enabled, the plugin detects that `github.com/noctalia-dev` is a URL and offers to open it directly in your browser, alongside the regular search result.
+
+**Open localhost or IP addresses:**
+```
+>web localhost:3000
+>web 192.168.1.1
+```
+Local addresses and IPs are detected as URLs and offered for direct opening. Localhost and IP addresses default to `http://`, while domain names default to `https://`.
+
+## IPC Commands
+
+You can control the web search plugin via the command line using the Noctalia IPC interface.
+
+### Available Commands
+
+| Command | Description | Example |
+|---|---|---|
+| `toggle` | Opens or closes the launcher on the current screen | `qs -c noctalia-shell ipc call plugin:web-search toggle` |
 
 ## Configuration
 
-You can configure the plugin directly via Noctalia's Plugin API Settings:
-- **Search Engine**: Choose between Google, DuckDuckGo, Bing, Brave, or Yandex
-- **Show Search Suggestions**: Toggle whether to fetch real-time suggestions while typing
-- **Maximum Results**: Control how many autocomplete suggestions appear in the launcher at once (1 to 10)
+You can configure the plugin directly via Noctalia's Plugin Settings:
+
+| Setting | Description | Default |
+|---|---|---|
+| **Search Engine** | Choose between Google, DuckDuckGo, Bing, Brave, or Yandex | Google |
+| **Direct URL Opening** | Automatically detect URLs and open them directly in the browser instead of searching | Enabled |
+| **Show Search Suggestions** | Fetch real-time autocomplete suggestions while typing | Enabled |
+| **Maximum Results** | Number of autocomplete suggestions shown in the launcher (1–10) | 5 |
 
 ## Requirements
 
 - Noctalia 3.9.0 or later
-- Internet connection (for search suggestions)
+- Internet connection (for search suggestions)
+
+## Changelog
+
+### 1.1.0
+- Added Direct URL Opening. Automatically detects URLs, IP addresses, and localhost and opens them directly in the browser
+- Added configurable toggle for the Direct URL feature
+- Smart protocol handling
+
+### 1.0.2
+- Added French translation
+
+### 1.0.1
+- Added German translation
+
+### 1.0.0
+- Initial release
+- Live autocomplete suggestions from the selected search engine
+- Support for Google, DuckDuckGo, Bing, Brave, and Yandex
+- Configurable suggestion count and toggle
+- Fallback results when typing normally in the launcher
+- English translation

web-search/Settings.qml

@@ -11,6 +11,7 @@ ColumnLayout {
     property var defaults: pluginApi?.manifest?.metadata?.defaultSettings || ({})
 
     property string valueSearchEngine: cfg.search_engine ?? defaults.search_engine ?? "Google"
+    property bool valueDirectUrl: cfg.direct_url ?? defaults.direct_url ?? true
     property bool valueShowSuggestions: cfg.show_suggestions ?? defaults.show_suggestions ?? true
     property int valueMaxResults: cfg.max_results ?? defaults.max_results ?? 5
 
@@ -36,6 +37,13 @@ ColumnLayout {
             onSelected: key => root.valueSearchEngine = key
         }
 
+        NToggle {
+            label: pluginApi?.tr("settings.directUrl.label")
+            description: pluginApi?.tr("settings.directUrl.description")
+            checked: root.valueDirectUrl
+            onToggled: root.valueDirectUrl = checked
+        }
+
         NToggle {
             label: pluginApi?.tr("settings.suggestions.label")
             description: pluginApi?.tr("settings.suggestions.description")
@@ -92,6 +100,7 @@ ColumnLayout {
         }
 
         pluginApi.pluginSettings.search_engine = root.valueSearchEngine;
+        pluginApi.pluginSettings.direct_url = root.valueDirectUrl;
         pluginApi.pluginSettings.show_suggestions = root.valueShowSuggestions;
         pluginApi.pluginSettings.max_results = root.valueMaxResults;
         pluginApi.saveSettings();

web-search/i18n/de.json

@@ -4,6 +4,10 @@
       "label": "Suchmaschine",
       "description": "Standard-Suchmaschine, die beim Suchen im Internet geöffnet wird"
     },
+    "directUrl": {
+      "label": "Direkte URL-Öffnung",
+      "description": "URLs direkt im Browser öffnen, anstatt danach zu suchen"
+    },
     "suggestions": {
       "label": "Suchvorschläge anzeigen",
       "description": "Echtzeit-Vorschläge während der Eingabe abrufen"
@@ -18,6 +22,8 @@
     "searchInternet": "Mit {engine} im Internet suchen",
     "search": "„{query}“ suchen",
     "openIn": "In {engine} öffnen",
+    "openUrl": "{url} öffnen",
+    "openUrlDescription": "URL direkt im Browser öffnen",
     "suggestion": "Vorschlag von {engine}",
     "command": {
       "description": "Im Internet nach etwas suchen"

web-search/i18n/en.json

@@ -4,6 +4,10 @@
             "label": "Search Engine",
             "description": "Default search engine to open when searching the web"
         },
+        "directUrl": {
+            "label": "Direct URL Opening",
+            "description": "Open URLs directly in the browser instead of searching for them"
+        },
         "suggestions": {
             "label": "Show Search Suggestions",
             "description": "Fetch real-time suggestions while typing"
@@ -18,6 +22,8 @@
         "searchInternet": "Search internet from {engine}",
         "search": "Search \"{query}\"",
         "openIn": "Open in {engine}",
+        "openUrl": "Open {url}",
+        "openUrlDescription": "Open URL directly in browser",
         "suggestion": "Suggestion from {engine}",
         "command": {
             "description": "Search something from the internet"

web-search/i18n/fr.json

@@ -4,6 +4,10 @@
             "label": "Moteur de recherche",
             "description": "Moteur de recherche par défaut à ouvrir lors de la recherche sur le Web"
         },
+        "directUrl": {
+            "label": "Ouverture directe d'URL",
+            "description": "Ouvrir les URL directement dans le navigateur au lieu de les rechercher"
+        },
         "suggestions": {
             "label": "Afficher les suggestions de recherche",
             "description": "Récupérer des suggestions en temps réel pendant la saisie"
@@ -18,6 +22,8 @@
         "searchInternet": "Rechercher sur Internet depuis {engine}",
         "search": "Rechercher \"{query}\"",
         "openIn": "Ouvrir dans {engine}",
+        "openUrl": "Ouvrir {url}",
+        "openUrlDescription": "Ouvrir l'URL directement dans le navigateur",
         "suggestion": "Suggestion de {engine}",
         "command": {
             "description": "Rechercher quelque chose sur Internet"

web-search/manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "web-search",
     "name": "Web Search",
-    "version": "1.0.2",
+    "version": "1.1.0",
     "author": "Rigelyon",
     "license": "MIT",
     "description": "Search the Internet from the Launcher.",
@@ -23,6 +23,7 @@
         "commandPrefix": "web",
         "defaultSettings": {
             "search_engine": "Google",
+            "direct_url": true,
             "show_suggestions": true,
             "max_results": 5
         }