Compare commits
5 Commits
owlry-core
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| a920588df9 | |||
| c32b6c5456 | |||
| 2a5f184230 | |||
| b2f068269a | |||
| e210a604f7 |
4
Cargo.lock
generated
4
Cargo.lock
generated
@@ -2584,7 +2584,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "owlry-lua"
|
name = "owlry-lua"
|
||||||
version = "1.1.0"
|
version = "1.1.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"abi_stable",
|
"abi_stable",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -2610,7 +2610,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "owlry-rune"
|
name = "owlry-rune"
|
||||||
version = "1.1.0"
|
version = "1.1.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"dirs",
|
"dirs",
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
pkgbase = owlry-core
|
pkgbase = owlry-core
|
||||||
pkgdesc = Core daemon for the Owlry application launcher — manages plugins, providers, and search
|
pkgdesc = Core daemon for the Owlry application launcher — manages plugins, providers, and search
|
||||||
pkgver = 1.3.0
|
pkgver = 1.3.1
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
url = https://somegit.dev/Owlibou/owlry
|
url = https://somegit.dev/Owlibou/owlry
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
license = GPL-3.0-or-later
|
license = GPL-3.0-or-later
|
||||||
makedepends = cargo
|
makedepends = cargo
|
||||||
depends = gcc-libs
|
depends = gcc-libs
|
||||||
source = owlry-core-1.3.0.tar.gz::https://somegit.dev/Owlibou/owlry/archive/owlry-core-v1.3.0.tar.gz
|
source = owlry-core-1.3.1.tar.gz::https://somegit.dev/Owlibou/owlry/archive/owlry-core-v1.3.1.tar.gz
|
||||||
b2sums = 99b3ce396b3903bf4427209df20356bbbfb16edd267be39db3ff91ccf0e3931a2ec03c47b278ba48b9af3bba8c36d50774899c365f05ec966ce7799512e18424
|
b2sums = e37383fd650a3bf9a2c554eb37676037e3ae72bbc2e1aad7c316809094254173b6fcd5ac87907c2f38ce5506e9f26201ec62f82446bc789153c280373e31fc9e
|
||||||
|
|
||||||
pkgname = owlry-core
|
pkgname = owlry-core
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Maintainer: vikingowl <christian@nachtigall.dev>
|
# Maintainer: vikingowl <christian@nachtigall.dev>
|
||||||
pkgname=owlry-core
|
pkgname=owlry-core
|
||||||
pkgver=1.3.0
|
pkgver=1.3.1
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc='Core daemon for the Owlry application launcher — manages plugins, providers, and search'
|
pkgdesc='Core daemon for the Owlry application launcher — manages plugins, providers, and search'
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
@@ -9,7 +9,7 @@ license=('GPL-3.0-or-later')
|
|||||||
depends=('gcc-libs')
|
depends=('gcc-libs')
|
||||||
makedepends=('cargo')
|
makedepends=('cargo')
|
||||||
source=("$pkgname-$pkgver.tar.gz::https://somegit.dev/Owlibou/owlry/archive/owlry-core-v$pkgver.tar.gz")
|
source=("$pkgname-$pkgver.tar.gz::https://somegit.dev/Owlibou/owlry/archive/owlry-core-v$pkgver.tar.gz")
|
||||||
b2sums=('99b3ce396b3903bf4427209df20356bbbfb16edd267be39db3ff91ccf0e3931a2ec03c47b278ba48b9af3bba8c36d50774899c365f05ec966ce7799512e18424')
|
b2sums=('e37383fd650a3bf9a2c554eb37676037e3ae72bbc2e1aad7c316809094254173b6fcd5ac87907c2f38ce5506e9f26201ec62f82446bc789153c280373e31fc9e')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd "owlry"
|
cd "owlry"
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
pkgbase = owlry-lua
|
pkgbase = owlry-lua
|
||||||
pkgdesc = Lua scripting runtime for Owlry — enables user-created Lua plugins
|
pkgdesc = Lua scripting runtime for Owlry — enables user-created Lua plugins
|
||||||
pkgver = 1.1.0
|
pkgver = 1.1.1
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
url = https://somegit.dev/Owlibou/owlry
|
url = https://somegit.dev/Owlibou/owlry
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
license = GPL-3.0-or-later
|
license = GPL-3.0-or-later
|
||||||
makedepends = cargo
|
makedepends = cargo
|
||||||
depends = owlry-core
|
depends = owlry-core
|
||||||
source = owlry-lua-1.1.0.tar.gz::https://somegit.dev/Owlibou/owlry/archive/owlry-lua-v1.1.0.tar.gz
|
source = owlry-lua-1.1.1.tar.gz::https://somegit.dev/Owlibou/owlry/archive/owlry-lua-v1.1.1.tar.gz
|
||||||
b2sums = d4b200446a31301b1240fd8eede6e10764d7bbc551f2e5549bfdbdcc0fa4a717677c3c2c69778d2dfa336711ac5b74d4987e46082ea589fed961c9d2ff95af76
|
b2sums = a0e1fa032db8dda8e6bc24457f3c04948129d3f14c1d3e61b8e080340b24f560d43294beb133ad4b1c6eb7942d401108ea91c367b074eaeeefa284e9b2a9dbc8
|
||||||
|
|
||||||
pkgname = owlry-lua
|
pkgname = owlry-lua
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Maintainer: vikingowl <christian@nachtigall.dev>
|
# Maintainer: vikingowl <christian@nachtigall.dev>
|
||||||
pkgname=owlry-lua
|
pkgname=owlry-lua
|
||||||
pkgver=1.1.0
|
pkgver=1.1.1
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Lua scripting runtime for Owlry — enables user-created Lua plugins"
|
pkgdesc="Lua scripting runtime for Owlry — enables user-created Lua plugins"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
@@ -9,7 +9,7 @@ license=('GPL-3.0-or-later')
|
|||||||
depends=('owlry-core')
|
depends=('owlry-core')
|
||||||
makedepends=('cargo')
|
makedepends=('cargo')
|
||||||
source=("$pkgname-$pkgver.tar.gz::https://somegit.dev/Owlibou/owlry/archive/owlry-lua-v$pkgver.tar.gz")
|
source=("$pkgname-$pkgver.tar.gz::https://somegit.dev/Owlibou/owlry/archive/owlry-lua-v$pkgver.tar.gz")
|
||||||
b2sums=('d4b200446a31301b1240fd8eede6e10764d7bbc551f2e5549bfdbdcc0fa4a717677c3c2c69778d2dfa336711ac5b74d4987e46082ea589fed961c9d2ff95af76')
|
b2sums=('a0e1fa032db8dda8e6bc24457f3c04948129d3f14c1d3e61b8e080340b24f560d43294beb133ad4b1c6eb7942d401108ea91c367b074eaeeefa284e9b2a9dbc8')
|
||||||
|
|
||||||
_cratename=owlry-lua
|
_cratename=owlry-lua
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
pkgbase = owlry-rune
|
pkgbase = owlry-rune
|
||||||
pkgdesc = Rune scripting runtime for Owlry — enables user-created Rune plugins
|
pkgdesc = Rune scripting runtime for Owlry — enables user-created Rune plugins
|
||||||
pkgver = 1.1.0
|
pkgver = 1.1.1
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
url = https://somegit.dev/Owlibou/owlry
|
url = https://somegit.dev/Owlibou/owlry
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
license = GPL-3.0-or-later
|
license = GPL-3.0-or-later
|
||||||
makedepends = cargo
|
makedepends = cargo
|
||||||
depends = owlry-core
|
depends = owlry-core
|
||||||
source = owlry-rune-1.1.0.tar.gz::https://somegit.dev/Owlibou/owlry/archive/owlry-rune-v1.1.0.tar.gz
|
source = owlry-rune-1.1.1.tar.gz::https://somegit.dev/Owlibou/owlry/archive/owlry-rune-v1.1.1.tar.gz
|
||||||
b2sums = d4b200446a31301b1240fd8eede6e10764d7bbc551f2e5549bfdbdcc0fa4a717677c3c2c69778d2dfa336711ac5b74d4987e46082ea589fed961c9d2ff95af76
|
b2sums = a0e1fa032db8dda8e6bc24457f3c04948129d3f14c1d3e61b8e080340b24f560d43294beb133ad4b1c6eb7942d401108ea91c367b074eaeeefa284e9b2a9dbc8
|
||||||
|
|
||||||
pkgname = owlry-rune
|
pkgname = owlry-rune
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Maintainer: vikingowl <christian@nachtigall.dev>
|
# Maintainer: vikingowl <christian@nachtigall.dev>
|
||||||
pkgname=owlry-rune
|
pkgname=owlry-rune
|
||||||
pkgver=1.1.0
|
pkgver=1.1.1
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Rune scripting runtime for Owlry — enables user-created Rune plugins"
|
pkgdesc="Rune scripting runtime for Owlry — enables user-created Rune plugins"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
@@ -9,7 +9,7 @@ license=('GPL-3.0-or-later')
|
|||||||
depends=('owlry-core')
|
depends=('owlry-core')
|
||||||
makedepends=('cargo')
|
makedepends=('cargo')
|
||||||
source=("$pkgname-$pkgver.tar.gz::https://somegit.dev/Owlibou/owlry/archive/owlry-rune-v$pkgver.tar.gz")
|
source=("$pkgname-$pkgver.tar.gz::https://somegit.dev/Owlibou/owlry/archive/owlry-rune-v$pkgver.tar.gz")
|
||||||
b2sums=('d4b200446a31301b1240fd8eede6e10764d7bbc551f2e5549bfdbdcc0fa4a717677c3c2c69778d2dfa336711ac5b74d4987e46082ea589fed961c9d2ff95af76')
|
b2sums=('a0e1fa032db8dda8e6bc24457f3c04948129d3f14c1d3e61b8e080340b24f560d43294beb133ad4b1c6eb7942d401108ea91c367b074eaeeefa284e9b2a9dbc8')
|
||||||
|
|
||||||
_cratename=owlry-rune
|
_cratename=owlry-rune
|
||||||
|
|
||||||
|
|||||||
@@ -202,25 +202,6 @@ impl ProviderManager {
|
|||||||
manager
|
manager
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Get type IDs of built-in providers (for conflict detection with native plugins)
|
|
||||||
fn builtin_type_ids(&self) -> std::collections::HashSet<String> {
|
|
||||||
let mut ids: std::collections::HashSet<String> = self
|
|
||||||
.builtin_dynamic
|
|
||||||
.iter()
|
|
||||||
.filter_map(|p| match p.provider_type() {
|
|
||||||
ProviderType::Plugin(id) => Some(id),
|
|
||||||
_ => None,
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
// Also include built-in static providers that use Plugin type
|
|
||||||
for p in &self.providers {
|
|
||||||
if let ProviderType::Plugin(id) = p.provider_type() {
|
|
||||||
ids.insert(id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ids
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Create a self-contained ProviderManager from config.
|
/// Create a self-contained ProviderManager from config.
|
||||||
///
|
///
|
||||||
/// Loads native plugins, creates core providers (Application + Command),
|
/// Loads native plugins, creates core providers (Application + Command),
|
||||||
@@ -1236,23 +1217,4 @@ mod tests {
|
|||||||
assert_eq!(results[0].0.name, "Firefox");
|
assert_eq!(results[0].0.name, "Firefox");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_builtin_type_ids_includes_dynamic_and_static() {
|
|
||||||
use super::calculator::CalculatorProvider;
|
|
||||||
use super::converter::ConverterProvider;
|
|
||||||
use super::system::SystemProvider;
|
|
||||||
|
|
||||||
let mut pm = ProviderManager::new(
|
|
||||||
vec![Box::new(SystemProvider::new())],
|
|
||||||
vec![],
|
|
||||||
);
|
|
||||||
pm.builtin_dynamic = vec![
|
|
||||||
Box::new(CalculatorProvider),
|
|
||||||
Box::new(ConverterProvider::new()),
|
|
||||||
];
|
|
||||||
let ids = pm.builtin_type_ids();
|
|
||||||
assert!(ids.contains("calc"));
|
|
||||||
assert!(ids.contains("conv"));
|
|
||||||
assert!(ids.contains("sys"));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "owlry-lua"
|
name = "owlry-lua"
|
||||||
version = "1.1.0"
|
version = "1.1.1"
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
rust-version.workspace = true
|
rust-version.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "owlry-rune"
|
name = "owlry-rune"
|
||||||
version = "1.1.0"
|
version = "1.1.1"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
rust-version = "1.90"
|
rust-version = "1.90"
|
||||||
description = "Rune scripting runtime for owlry plugins"
|
description = "Rune scripting runtime for owlry plugins"
|
||||||
|
|||||||
Reference in New Issue
Block a user