@devaloop/devalang 0.0.1-beta.2 → 0.0.1-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.toml +84 -81
- package/README.md +3 -2
- package/docs/CHANGELOG.md +41 -0
- package/docs/ROADMAP.md +3 -3
- package/examples/chain.deva +19 -0
- package/examples/plugin.deva +10 -10
- package/examples/routing.deva +23 -0
- package/out-tsc/bin/project-version.json +6 -0
- package/out-tsc/pkg/devalang_core_bg.wasm.d.ts +8 -8
- package/out-tsc/scripts/version/copy-to-binary.d.ts +1 -0
- package/out-tsc/scripts/version/copy-to-binary.js +79 -0
- package/package.json +23 -10
- package/project-version.json +3 -3
- package/rust/bindings/Cargo.toml +9 -0
- package/rust/bindings/src/lib.rs +86 -0
- package/rust/cli/addon/commands.rs +35 -0
- package/rust/cli/addon/download.rs +234 -0
- package/rust/cli/addon/install.rs +33 -0
- package/rust/cli/addon/list.rs +224 -0
- package/rust/cli/addon/metadata.rs +124 -0
- package/rust/cli/addon/mod.rs +8 -0
- package/rust/cli/addon/remove.rs +271 -0
- package/rust/cli/addon/update.rs +305 -0
- package/rust/cli/{install/addon.rs → addon/utils.rs} +109 -118
- package/rust/cli/build/commands.rs +153 -153
- package/rust/cli/build/process.rs +165 -165
- package/rust/cli/check/mod.rs +208 -208
- package/rust/cli/discover/commands.rs +275 -253
- package/rust/cli/discover/config.rs +109 -111
- package/rust/cli/discover/fs.rs +19 -19
- package/rust/cli/discover/install.rs +214 -103
- package/rust/cli/discover/metadata.rs +48 -48
- package/rust/cli/discover/mod.rs +5 -5
- package/rust/cli/me/commands.rs +52 -0
- package/rust/cli/me/mod.rs +1 -0
- package/rust/cli/mod.rs +12 -12
- package/rust/cli/parser.rs +30 -69
- package/rust/cli/play/commands.rs +375 -375
- package/rust/cli/play/process.rs +159 -159
- package/rust/core/audio/engine/driver.rs +19 -2
- package/rust/core/audio/engine/export.rs +169 -169
- package/rust/core/audio/engine/mod.rs +56 -56
- package/rust/core/audio/engine/notes/dsp.rs +88 -85
- package/rust/core/audio/engine/notes/mod.rs +53 -44
- package/rust/core/audio/engine/notes/params.rs +294 -294
- package/rust/core/audio/engine/sample/insert.rs +148 -47
- package/rust/core/audio/engine/sample/mod.rs +40 -40
- package/rust/core/audio/engine/sample/padding.rs +170 -170
- package/rust/core/audio/evaluator/condition.rs +61 -61
- package/rust/core/audio/evaluator/numeric.rs +152 -152
- package/rust/core/audio/evaluator/rhs.rs +16 -16
- package/rust/core/audio/evaluator/string_expr.rs +94 -94
- package/rust/core/audio/interpreter/driver.rs +574 -574
- package/rust/core/audio/interpreter/mod.rs +2 -2
- package/rust/core/audio/interpreter/statements/arrow_call/interprete.rs +9 -5
- package/rust/core/audio/interpreter/statements/arrow_call/methods/chord.rs +398 -384
- package/rust/core/audio/interpreter/statements/arrow_call/methods/effects.rs +323 -0
- package/rust/core/audio/interpreter/statements/arrow_call/methods/mod.rs +1 -0
- package/rust/core/audio/interpreter/statements/arrow_call/methods/note.rs +66 -11
- package/rust/core/audio/interpreter/statements/arrow_call/mod.rs +3 -3
- package/rust/core/audio/interpreter/statements/arrow_call/types/arp.rs +192 -192
- package/rust/core/audio/interpreter/statements/arrow_call/types/mod.rs +24 -24
- package/rust/core/audio/interpreter/statements/arrow_call/types/pad.rs +116 -116
- package/rust/core/audio/interpreter/statements/arrow_call/types/pluck.rs +97 -97
- package/rust/core/audio/interpreter/statements/arrow_call/types/sub.rs +100 -100
- package/rust/core/audio/interpreter/statements/automate.rs +16 -16
- package/rust/core/audio/interpreter/statements/call.rs +31 -1
- package/rust/core/audio/interpreter/statements/condition.rs +72 -72
- package/rust/core/audio/interpreter/statements/function.rs +24 -24
- package/rust/core/audio/interpreter/statements/let_.rs +36 -36
- package/rust/core/audio/interpreter/statements/load.rs +17 -17
- package/rust/core/audio/interpreter/statements/loop_.rs +115 -115
- package/rust/core/audio/interpreter/statements/spawn.rs +51 -2
- package/rust/core/audio/interpreter/statements/trigger.rs +242 -239
- package/rust/core/audio/loader/trigger.rs +98 -98
- package/rust/core/audio/player.rs +70 -70
- package/rust/core/audio/special/mod.rs +9 -9
- package/rust/core/builder/mod.rs +129 -129
- package/rust/core/debugger/lexer.rs +27 -27
- package/rust/core/debugger/logs.rs +52 -52
- package/rust/core/debugger/preprocessor.rs +27 -27
- package/rust/core/debugger/store.rs +38 -38
- package/rust/core/lexer/driver.rs +59 -59
- package/rust/core/lexer/handler/arrow.rs +82 -82
- package/rust/core/lexer/handler/at.rs +21 -21
- package/rust/core/lexer/handler/brace.rs +41 -41
- package/rust/core/lexer/handler/colon.rs +21 -21
- package/rust/core/lexer/handler/comment.rs +30 -30
- package/rust/core/lexer/handler/dot.rs +21 -21
- package/rust/core/lexer/handler/driver.rs +337 -337
- package/rust/core/lexer/handler/identifier.rs +47 -47
- package/rust/core/lexer/handler/indent.rs +66 -66
- package/rust/core/lexer/handler/mod.rs +15 -15
- package/rust/core/lexer/handler/newline.rs +23 -23
- package/rust/core/lexer/handler/number.rs +31 -31
- package/rust/core/lexer/handler/operator.rs +46 -46
- package/rust/core/lexer/handler/parenthesis.rs +41 -41
- package/rust/core/lexer/handler/slash.rs +21 -21
- package/rust/core/lexer/handler/string.rs +63 -63
- package/rust/core/lexer/mod.rs +3 -3
- package/rust/core/mod.rs +9 -9
- package/rust/core/parser/driver/block.rs +111 -111
- package/rust/core/parser/driver/cursor.rs +82 -82
- package/rust/core/parser/driver/driver_impl.rs +21 -1
- package/rust/core/parser/driver/mod.rs +6 -6
- package/rust/core/parser/driver/parse_array.rs +120 -120
- package/rust/core/parser/driver/parse_map.rs +247 -223
- package/rust/core/parser/driver/parser.rs +160 -160
- package/rust/core/parser/handler/arrow_call.rs +65 -14
- package/rust/core/parser/handler/identifier/synth.rs +171 -135
- package/rust/core/parser/handler/mod.rs +9 -9
- package/rust/core/parser/handler/pattern.rs +24 -1
- package/rust/core/plugin/loader.rs +137 -137
- package/rust/core/plugin/mod.rs +2 -2
- package/rust/core/plugin/runner/non_wasm.rs +481 -297
- package/rust/core/plugin/runner/wasm32.rs +1 -0
- package/rust/core/preprocessor/loader/inject.rs +313 -278
- package/rust/core/preprocessor/loader/loader_helpers.rs +110 -110
- package/rust/core/preprocessor/loader/mod.rs +235 -235
- package/rust/core/preprocessor/module.rs +55 -55
- package/rust/core/preprocessor/processor/handlers.rs +107 -107
- package/rust/core/preprocessor/resolver/bank.rs +49 -49
- package/rust/core/preprocessor/resolver/call.rs +124 -124
- package/rust/core/preprocessor/resolver/condition.rs +95 -95
- package/rust/core/preprocessor/resolver/driver.rs +324 -324
- package/rust/core/preprocessor/resolver/function.rs +69 -69
- package/rust/core/preprocessor/resolver/group.rs +122 -122
- package/rust/core/preprocessor/resolver/let_.rs +32 -32
- package/rust/core/preprocessor/resolver/loop_.rs +318 -318
- package/rust/core/preprocessor/resolver/mod.rs +16 -16
- package/rust/core/preprocessor/resolver/pattern.rs +95 -83
- package/rust/core/preprocessor/resolver/spawn.rs +99 -99
- package/rust/core/preprocessor/resolver/synth.rs +54 -54
- package/rust/core/preprocessor/resolver/tempo.rs +48 -48
- package/rust/core/preprocessor/resolver/trigger.rs +116 -116
- package/rust/core/preprocessor/resolver/value.rs +176 -176
- package/rust/core/store/global.rs +57 -57
- package/rust/lib.rs +323 -323
- package/rust/macros/Cargo.toml +14 -0
- package/rust/macros/src/lib.rs +52 -0
- package/rust/main.rs +311 -142
- package/rust/types/Cargo.toml +1 -1
- package/rust/types/src/addons.rs +3 -1
- package/rust/types/src/config.rs +1 -3
- package/rust/utils/Cargo.toml +5 -2
- package/rust/utils/src/file.rs +397 -14
- package/rust/utils/src/path.rs +31 -2
- package/rust/utils/src/version.rs +38 -7
- package/rust/web/auth.rs +5 -0
- package/rust/web/forge.rs +5 -0
- package/rust/web/mod.rs +5 -3
- package/typescript/scripts/version/copy-to-binary.ts +82 -0
- package/rust/cli/bank/api.rs +0 -122
- package/rust/cli/bank/commands.rs +0 -306
- package/rust/cli/bank/mod.rs +0 -29
- package/rust/cli/install/bank.rs +0 -72
- package/rust/cli/install/commands.rs +0 -35
- package/rust/cli/install/mod.rs +0 -4
- package/rust/cli/install/plugin.rs +0 -80
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
use crate::cli::addon::{
|
|
2
|
+
install::install_addon, list::list_addons, remove::remove_addon, update::update_addon,
|
|
3
|
+
};
|
|
4
|
+
|
|
5
|
+
pub async fn handle_install_addon_command(name: String, no_clear_tmp: bool) -> Result<(), String> {
|
|
6
|
+
if let Err(e) = install_addon(name, no_clear_tmp).await {
|
|
7
|
+
return Err(format!("Failed to install addon: {}", e));
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
Ok(())
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
pub async fn handle_list_addon_command() -> Result<(), String> {
|
|
14
|
+
if let Err(e) = list_addons().await {
|
|
15
|
+
return Err(format!("Failed to list addons: {}", e));
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
Ok(())
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
pub async fn handle_remove_addon_command(name: String) -> Result<(), String> {
|
|
22
|
+
if let Err(e) = remove_addon(name).await {
|
|
23
|
+
return Err(format!("Failed to remove addon: {}", e));
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
Ok(())
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
pub async fn handle_update_addon_command(name: String) -> Result<(), String> {
|
|
30
|
+
if let Err(e) = update_addon(name).await {
|
|
31
|
+
return Err(format!("Failed to update addon: {}", e));
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
Ok(())
|
|
35
|
+
}
|
|
@@ -0,0 +1,234 @@
|
|
|
1
|
+
use crate::{
|
|
2
|
+
cli::addon::{metadata::AddonToDownloadMetadata, utils::ask_api_for_signed_url},
|
|
3
|
+
config::ops::load_config,
|
|
4
|
+
web::cdn::download_from_cdn,
|
|
5
|
+
};
|
|
6
|
+
use devalang_core::config::driver::{ProjectConfig, ProjectConfigExt};
|
|
7
|
+
use devalang_types::{AddonType, ProjectConfigBankEntry, ProjectConfigPluginEntry};
|
|
8
|
+
use devalang_utils::{
|
|
9
|
+
file::extract_zip_safely,
|
|
10
|
+
logger::{LogLevel, Logger},
|
|
11
|
+
spinner::start_spinner,
|
|
12
|
+
};
|
|
13
|
+
use std::fs;
|
|
14
|
+
|
|
15
|
+
pub async fn download_addon(
|
|
16
|
+
slug: &str,
|
|
17
|
+
addon_metadata: &AddonToDownloadMetadata,
|
|
18
|
+
) -> Result<(), String> {
|
|
19
|
+
let logger = Logger::new();
|
|
20
|
+
let deva_dir = devalang_utils::path::ensure_deva_dir()?;
|
|
21
|
+
|
|
22
|
+
let target_dir = match addon_metadata.addon_type {
|
|
23
|
+
AddonType::Bank => deva_dir.join("banks"),
|
|
24
|
+
AddonType::Plugin => deva_dir.join("plugins"),
|
|
25
|
+
AddonType::Preset => deva_dir.join("presets"),
|
|
26
|
+
AddonType::Template => deva_dir.join("templates"),
|
|
27
|
+
};
|
|
28
|
+
|
|
29
|
+
if !target_dir.exists() {
|
|
30
|
+
fs::create_dir_all(&target_dir).map_err(|e| {
|
|
31
|
+
format!(
|
|
32
|
+
"Failed to create target dir '{}': {}",
|
|
33
|
+
target_dir.display(),
|
|
34
|
+
e
|
|
35
|
+
)
|
|
36
|
+
})?;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
let user_provided_publisher = slug.contains('.');
|
|
40
|
+
let display_name = if user_provided_publisher {
|
|
41
|
+
format!("{}.{}", addon_metadata.publisher, addon_metadata.name)
|
|
42
|
+
} else {
|
|
43
|
+
addon_metadata.name.clone()
|
|
44
|
+
};
|
|
45
|
+
|
|
46
|
+
let archive_path = {
|
|
47
|
+
let tmp_root = deva_dir.join("tmp");
|
|
48
|
+
if !tmp_root.exists() {
|
|
49
|
+
fs::create_dir_all(&tmp_root)
|
|
50
|
+
.map_err(|e| format!("Failed to create tmp dir '{}': {}", tmp_root.display(), e))?;
|
|
51
|
+
}
|
|
52
|
+
tmp_root.join(&display_name).with_extension("tar.gz")
|
|
53
|
+
};
|
|
54
|
+
|
|
55
|
+
if let Some(parent) = archive_path.parent() {
|
|
56
|
+
if !parent.exists() {
|
|
57
|
+
fs::create_dir_all(parent)
|
|
58
|
+
.map_err(|e| format!("Failed to prepare tmp dir '{}': {}", parent.display(), e))?;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
let extract_path = target_dir
|
|
63
|
+
.join(&addon_metadata.publisher)
|
|
64
|
+
.join(&addon_metadata.name);
|
|
65
|
+
|
|
66
|
+
let signed_url = {
|
|
67
|
+
let spinner =
|
|
68
|
+
start_spinner(format!("Requesting download link for {}", display_name).as_str());
|
|
69
|
+
let request = if user_provided_publisher {
|
|
70
|
+
ask_api_for_signed_url(
|
|
71
|
+
addon_metadata.addon_type.clone(),
|
|
72
|
+
addon_metadata.publisher.clone(),
|
|
73
|
+
&addon_metadata.name,
|
|
74
|
+
)
|
|
75
|
+
} else {
|
|
76
|
+
ask_api_for_signed_url(
|
|
77
|
+
addon_metadata.addon_type.clone(),
|
|
78
|
+
String::new(),
|
|
79
|
+
&addon_metadata.name,
|
|
80
|
+
)
|
|
81
|
+
};
|
|
82
|
+
|
|
83
|
+
match request.await {
|
|
84
|
+
Ok(url) => url,
|
|
85
|
+
Err(err) => {
|
|
86
|
+
let message = format!("Failed to obtain download link: {}", err);
|
|
87
|
+
println!("{}", message);
|
|
88
|
+
return Err(message);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
};
|
|
92
|
+
|
|
93
|
+
let config_path = devalang_utils::path::get_devalang_config_path()?;
|
|
94
|
+
let mut config = load_config(Some(&config_path))
|
|
95
|
+
.ok_or_else(|| format!("Failed to load config from '{}'", config_path.display()))?;
|
|
96
|
+
|
|
97
|
+
if extract_path.exists() {
|
|
98
|
+
logger.log_message(
|
|
99
|
+
LogLevel::Info,
|
|
100
|
+
format!(
|
|
101
|
+
"Addon '{}' already present at {}",
|
|
102
|
+
display_name.as_str(),
|
|
103
|
+
extract_path.display()
|
|
104
|
+
)
|
|
105
|
+
.as_str(),
|
|
106
|
+
);
|
|
107
|
+
|
|
108
|
+
if ensure_config_entry(&mut config, addon_metadata) {
|
|
109
|
+
if let Err(err) = config.write_config(&config) {
|
|
110
|
+
logger.log_message(
|
|
111
|
+
LogLevel::Error,
|
|
112
|
+
format!("Failed to write config: {}", err).as_str(),
|
|
113
|
+
);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
if matches!(
|
|
118
|
+
addon_metadata.addon_type,
|
|
119
|
+
AddonType::Preset | AddonType::Template
|
|
120
|
+
) {
|
|
121
|
+
logger.log_message(
|
|
122
|
+
LogLevel::Info,
|
|
123
|
+
"Presets and templates are not tracked in project config yet.",
|
|
124
|
+
);
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
return Ok(());
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
let download_spinner = start_spinner("Downloading archive...");
|
|
131
|
+
match download_from_cdn(&signed_url, &archive_path).await {
|
|
132
|
+
Ok(_) => println!("Downloaded archive to {}", archive_path.display()),
|
|
133
|
+
Err(err) => {
|
|
134
|
+
let message = format!("Failed to download archive: {}", err);
|
|
135
|
+
println!("{}", message);
|
|
136
|
+
return Err(message);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
let extract_spinner = start_spinner("Extracting archive");
|
|
141
|
+
match extract_zip_safely(&archive_path, &extract_path) {
|
|
142
|
+
Ok(_) => println!("Installed at {}", extract_path.display()),
|
|
143
|
+
Err(err) => {
|
|
144
|
+
println!("Failed to extract archive: {}", err);
|
|
145
|
+
return Err(err);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
let mut config_updated = false;
|
|
150
|
+
if ensure_config_entry(&mut config, addon_metadata) {
|
|
151
|
+
match config.write_config(&config) {
|
|
152
|
+
Ok(_) => {
|
|
153
|
+
config_updated = true;
|
|
154
|
+
}
|
|
155
|
+
Err(err) => {
|
|
156
|
+
logger.log_message(
|
|
157
|
+
LogLevel::Error,
|
|
158
|
+
format!("Failed to write config: {}", err).as_str(),
|
|
159
|
+
);
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
logger.log_message(
|
|
165
|
+
LogLevel::Info,
|
|
166
|
+
format!(
|
|
167
|
+
"Addon '{}' installed at {}",
|
|
168
|
+
display_name,
|
|
169
|
+
extract_path.display()
|
|
170
|
+
)
|
|
171
|
+
.as_str(),
|
|
172
|
+
);
|
|
173
|
+
|
|
174
|
+
if config_updated {
|
|
175
|
+
logger.log_message(LogLevel::Info, "Project config updated");
|
|
176
|
+
} else if matches!(
|
|
177
|
+
addon_metadata.addon_type,
|
|
178
|
+
AddonType::Preset | AddonType::Template
|
|
179
|
+
) {
|
|
180
|
+
logger.log_message(
|
|
181
|
+
LogLevel::Info,
|
|
182
|
+
"Presets and templates are not tracked in project config yet.",
|
|
183
|
+
);
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
// Cleanup temporary files used during download/install
|
|
187
|
+
if let Err(err) = devalang_utils::file::clear_tmp_folder() {
|
|
188
|
+
logger.log_message(
|
|
189
|
+
LogLevel::Warning,
|
|
190
|
+
format!("Failed to clear tmp folder: {}", err).as_str(),
|
|
191
|
+
);
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
Ok(())
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
fn ensure_config_entry(
|
|
198
|
+
config: &mut ProjectConfig,
|
|
199
|
+
addon_metadata: &AddonToDownloadMetadata,
|
|
200
|
+
) -> bool {
|
|
201
|
+
match addon_metadata.addon_type {
|
|
202
|
+
AddonType::Bank => {
|
|
203
|
+
let dependency_path = format!(
|
|
204
|
+
"devalang://bank/{}/{}",
|
|
205
|
+
addon_metadata.publisher, addon_metadata.name
|
|
206
|
+
);
|
|
207
|
+
let banks = config.banks.get_or_insert_with(Vec::new);
|
|
208
|
+
if banks.iter().any(|entry| entry.path == dependency_path) {
|
|
209
|
+
false
|
|
210
|
+
} else {
|
|
211
|
+
banks.push(ProjectConfigBankEntry {
|
|
212
|
+
path: dependency_path,
|
|
213
|
+
});
|
|
214
|
+
true
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
AddonType::Plugin => {
|
|
218
|
+
let dependency_path = format!(
|
|
219
|
+
"devalang://plugin/{}/{}",
|
|
220
|
+
addon_metadata.publisher, addon_metadata.name
|
|
221
|
+
);
|
|
222
|
+
let plugins = config.plugins.get_or_insert_with(Vec::new);
|
|
223
|
+
if plugins.iter().any(|entry| entry.path == dependency_path) {
|
|
224
|
+
false
|
|
225
|
+
} else {
|
|
226
|
+
plugins.push(ProjectConfigPluginEntry {
|
|
227
|
+
path: dependency_path,
|
|
228
|
+
});
|
|
229
|
+
true
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
AddonType::Preset | AddonType::Template => false,
|
|
233
|
+
}
|
|
234
|
+
}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
use devalang_utils::logger::Logger;
|
|
2
|
+
|
|
3
|
+
use crate::cli::addon::{download::download_addon, metadata::get_addon_from_api};
|
|
4
|
+
|
|
5
|
+
pub async fn install_addon(slug: String, no_clear_tmp: bool) -> Result<(), String> {
|
|
6
|
+
let addon_metadata = get_addon_from_api(&slug).await?;
|
|
7
|
+
|
|
8
|
+
if let Err(e) = download_addon(&slug, &addon_metadata).await {
|
|
9
|
+
eprintln!("Failed to download addon '{}': {}", slug, e);
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
let logger = Logger::new();
|
|
13
|
+
logger.log_message(
|
|
14
|
+
devalang_utils::logger::LogLevel::Success,
|
|
15
|
+
&format!(
|
|
16
|
+
"Successfully installed addon '{}.{}' ({})",
|
|
17
|
+
addon_metadata.publisher,
|
|
18
|
+
addon_metadata.name,
|
|
19
|
+
match addon_metadata.addon_type {
|
|
20
|
+
devalang_types::AddonType::Bank => "bank",
|
|
21
|
+
devalang_types::AddonType::Plugin => "plugin",
|
|
22
|
+
devalang_types::AddonType::Preset => "preset",
|
|
23
|
+
devalang_types::AddonType::Template => "template",
|
|
24
|
+
}
|
|
25
|
+
),
|
|
26
|
+
);
|
|
27
|
+
|
|
28
|
+
if !no_clear_tmp {
|
|
29
|
+
let _ = devalang_utils::file::clear_tmp_folder();
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
Ok(())
|
|
33
|
+
}
|
|
@@ -0,0 +1,224 @@
|
|
|
1
|
+
use devalang_utils::logger::{LogLevel, Logger};
|
|
2
|
+
|
|
3
|
+
#[derive(Clone)]
|
|
4
|
+
struct InstalledAddon {
|
|
5
|
+
name: String,
|
|
6
|
+
addon_type: String,
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
pub async fn list_addons() -> Result<(), String> {
|
|
10
|
+
let deva_dir = devalang_utils::path::ensure_deva_dir()?;
|
|
11
|
+
let banks_dir = deva_dir.join("banks");
|
|
12
|
+
let plugins_dir = deva_dir.join("plugins");
|
|
13
|
+
let presets_dir = deva_dir.join("presets");
|
|
14
|
+
let templates_dir = deva_dir.join("templates");
|
|
15
|
+
|
|
16
|
+
let mut installed_addons = Vec::new();
|
|
17
|
+
|
|
18
|
+
if banks_dir.exists() {
|
|
19
|
+
if let Ok(entries) = std::fs::read_dir(&banks_dir) {
|
|
20
|
+
for entry in entries.flatten() {
|
|
21
|
+
if let Ok(file_type) = entry.file_type() {
|
|
22
|
+
if file_type.is_dir() {
|
|
23
|
+
if let Some(name) = entry.file_name().to_str() {
|
|
24
|
+
installed_addons.push(InstalledAddon {
|
|
25
|
+
name: name.to_string(),
|
|
26
|
+
addon_type: "bank".to_string(),
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
if plugins_dir.exists() {
|
|
36
|
+
if let Ok(entries) = std::fs::read_dir(&plugins_dir) {
|
|
37
|
+
for entry in entries.flatten() {
|
|
38
|
+
if let Ok(file_type) = entry.file_type() {
|
|
39
|
+
if file_type.is_dir() {
|
|
40
|
+
if let Some(name) = entry.file_name().to_str() {
|
|
41
|
+
installed_addons.push(InstalledAddon {
|
|
42
|
+
name: name.to_string(),
|
|
43
|
+
addon_type: "plugin".to_string(),
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
if presets_dir.exists() {
|
|
53
|
+
if let Ok(entries) = std::fs::read_dir(&presets_dir) {
|
|
54
|
+
for entry in entries.flatten() {
|
|
55
|
+
if let Ok(file_type) = entry.file_type() {
|
|
56
|
+
if file_type.is_dir() {
|
|
57
|
+
if let Some(name) = entry.file_name().to_str() {
|
|
58
|
+
installed_addons.push(InstalledAddon {
|
|
59
|
+
name: name.to_string(),
|
|
60
|
+
addon_type: "preset".to_string(),
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
if templates_dir.exists() {
|
|
70
|
+
if let Ok(entries) = std::fs::read_dir(&templates_dir) {
|
|
71
|
+
for entry in entries.flatten() {
|
|
72
|
+
if let Ok(file_type) = entry.file_type() {
|
|
73
|
+
if file_type.is_dir() {
|
|
74
|
+
if let Some(name) = entry.file_name().to_str() {
|
|
75
|
+
installed_addons.push(InstalledAddon {
|
|
76
|
+
name: name.to_string(),
|
|
77
|
+
addon_type: "template".to_string(),
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
let logger = Logger::new();
|
|
87
|
+
|
|
88
|
+
if installed_addons.is_empty() {
|
|
89
|
+
logger.log_message(LogLevel::Info, "No addon installed.");
|
|
90
|
+
} else {
|
|
91
|
+
let installed_banks = installed_addons.iter().filter(|a| a.addon_type == "bank");
|
|
92
|
+
|
|
93
|
+
let installed_plugins = installed_addons.iter().filter(|a| a.addon_type == "plugin");
|
|
94
|
+
|
|
95
|
+
let installed_presets = installed_addons.iter().filter(|a| a.addon_type == "preset");
|
|
96
|
+
|
|
97
|
+
let installed_templates = installed_addons
|
|
98
|
+
.iter()
|
|
99
|
+
.filter(|a| a.addon_type == "template");
|
|
100
|
+
|
|
101
|
+
if installed_banks.clone().count() > 0 {
|
|
102
|
+
let trace: Vec<String> = installed_addons
|
|
103
|
+
.iter()
|
|
104
|
+
.map(|a| format!("{}", a.name))
|
|
105
|
+
.collect();
|
|
106
|
+
let trace: Vec<&str> = trace.iter().map(|s| s.as_str()).collect();
|
|
107
|
+
|
|
108
|
+
logger.log_message_with_trace(LogLevel::Info, "Installed banks :", trace);
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
if installed_plugins.clone().count() > 0 {
|
|
112
|
+
let trace: Vec<String> = installed_addons
|
|
113
|
+
.iter()
|
|
114
|
+
.map(|a| format!("{}", a.name))
|
|
115
|
+
.collect();
|
|
116
|
+
let trace: Vec<&str> = trace.iter().map(|s| s.as_str()).collect();
|
|
117
|
+
|
|
118
|
+
logger.log_message_with_trace(LogLevel::Info, "Installed plugins :", trace);
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
if installed_presets.clone().count() > 0 {
|
|
122
|
+
let trace: Vec<String> = installed_addons
|
|
123
|
+
.iter()
|
|
124
|
+
.map(|a| format!("{}", a.name))
|
|
125
|
+
.collect();
|
|
126
|
+
let trace: Vec<&str> = trace.iter().map(|s| s.as_str()).collect();
|
|
127
|
+
|
|
128
|
+
logger.log_message_with_trace(LogLevel::Info, "Installed presets :", trace);
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
if installed_templates.clone().count() > 0 {
|
|
132
|
+
let trace: Vec<String> = installed_addons
|
|
133
|
+
.iter()
|
|
134
|
+
.map(|a| format!("{}", a.name))
|
|
135
|
+
.collect();
|
|
136
|
+
let trace: Vec<&str> = trace.iter().map(|s| s.as_str()).collect();
|
|
137
|
+
|
|
138
|
+
logger.log_message_with_trace(LogLevel::Info, "Installed templates :", trace);
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
if let Some(addon_not_in_config) = find_unused_addons(installed_addons.clone()) {
|
|
142
|
+
let trace: Vec<String> = addon_not_in_config
|
|
143
|
+
.iter()
|
|
144
|
+
.map(|a| format!("{} ({})", a.name, a.addon_type))
|
|
145
|
+
.collect();
|
|
146
|
+
let trace: Vec<&str> = trace.iter().map(|s| s.as_str()).collect();
|
|
147
|
+
|
|
148
|
+
logger.log_message_with_trace(
|
|
149
|
+
LogLevel::Warning,
|
|
150
|
+
"Some addons are installed but not referenced in the .devalang configuration file :",
|
|
151
|
+
trace,
|
|
152
|
+
);
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
logger.log_message(
|
|
156
|
+
LogLevel::Success,
|
|
157
|
+
format!("Found {} installed addon(s).", installed_addons.len()).as_str(),
|
|
158
|
+
);
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
Ok(())
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
fn find_unused_addons(addons: Vec<InstalledAddon>) -> Option<Vec<InstalledAddon>> {
|
|
165
|
+
let mut unused_addons = Vec::new();
|
|
166
|
+
|
|
167
|
+
let config_path = match devalang_utils::path::get_devalang_config_path() {
|
|
168
|
+
Ok(path) => path,
|
|
169
|
+
Err(_) => return None,
|
|
170
|
+
};
|
|
171
|
+
|
|
172
|
+
let config = match crate::config::ops::load_config(Some(&config_path)) {
|
|
173
|
+
Some(cfg) => cfg,
|
|
174
|
+
None => return None,
|
|
175
|
+
};
|
|
176
|
+
|
|
177
|
+
let mut referenced_addons = Vec::new();
|
|
178
|
+
|
|
179
|
+
if let Some(banks) = config.banks {
|
|
180
|
+
for bank in banks {
|
|
181
|
+
if let Some(name) = bank.path.strip_prefix("devalang://bank/") {
|
|
182
|
+
referenced_addons.push((name.to_string(), "bank".to_string()));
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
if let Some(plugins) = config.plugins {
|
|
188
|
+
for plugin in plugins {
|
|
189
|
+
if let Some(name) = plugin.path.strip_prefix("devalang://plugin/") {
|
|
190
|
+
referenced_addons.push((name.to_string(), "plugin".to_string()));
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
// TODO: Enable when presets and templates are supported in config
|
|
196
|
+
// if let Some(presets) = config.presets {
|
|
197
|
+
// for preset in presets {
|
|
198
|
+
// if let Some(name) = preset.path.strip_prefix("devalang://preset/") {
|
|
199
|
+
// referenced_addons.push((name.to_string(), "preset".to_string()));
|
|
200
|
+
// }
|
|
201
|
+
// }
|
|
202
|
+
// }
|
|
203
|
+
|
|
204
|
+
// TODO: Enable when presets and templates are supported in config
|
|
205
|
+
// if let Some(templates) = config.templates {
|
|
206
|
+
// for template in templates {
|
|
207
|
+
// if let Some(name) = template.path.strip_prefix("devalang://template/") {
|
|
208
|
+
// referenced_addons.push((name.to_string(), "template".to_string()));
|
|
209
|
+
// }
|
|
210
|
+
// }
|
|
211
|
+
// }
|
|
212
|
+
|
|
213
|
+
for addon in addons {
|
|
214
|
+
if !referenced_addons.contains(&(addon.name.clone(), addon.addon_type.clone())) {
|
|
215
|
+
unused_addons.push(addon);
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
if unused_addons.is_empty() {
|
|
220
|
+
None
|
|
221
|
+
} else {
|
|
222
|
+
Some(unused_addons)
|
|
223
|
+
}
|
|
224
|
+
}
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
use crate::web::api::get_api_url;
|
|
2
|
+
|
|
3
|
+
#[derive(Debug, Clone)]
|
|
4
|
+
pub struct AddonToDownloadMetadata {
|
|
5
|
+
pub name: String,
|
|
6
|
+
pub publisher: String,
|
|
7
|
+
pub addon_type: devalang_types::AddonType,
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
pub async fn get_addon_publisher_from_api(slug: &str) -> Result<String, String> {
|
|
11
|
+
let api_url = get_api_url();
|
|
12
|
+
|
|
13
|
+
let request_url = format!("{}/v1/products/getBySlug/{}", api_url, slug);
|
|
14
|
+
|
|
15
|
+
let client: reqwest::Client = reqwest::Client::builder()
|
|
16
|
+
.build()
|
|
17
|
+
.map_err(|_| "Failed to build HTTP client".to_string())?;
|
|
18
|
+
|
|
19
|
+
let resp = client
|
|
20
|
+
.get(&request_url)
|
|
21
|
+
.send()
|
|
22
|
+
.await
|
|
23
|
+
.map_err(|e| format!("Failed to receive response: {}", e))?;
|
|
24
|
+
|
|
25
|
+
let status = resp.status();
|
|
26
|
+
let body_text = resp
|
|
27
|
+
.text()
|
|
28
|
+
.await
|
|
29
|
+
.map_err(|e| format!("Failed to read response body: {}", e))?;
|
|
30
|
+
|
|
31
|
+
let json: serde_json::Value = match serde_json::from_str(&body_text) {
|
|
32
|
+
Ok(v) => v,
|
|
33
|
+
Err(_) => {
|
|
34
|
+
return Err(format!(
|
|
35
|
+
"Invalid JSON response (status {}): {}",
|
|
36
|
+
status, body_text
|
|
37
|
+
));
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
let payload = json.get("payload");
|
|
42
|
+
let publisher = payload
|
|
43
|
+
.unwrap_or(&serde_json::Value::Null)
|
|
44
|
+
.get("publisher")
|
|
45
|
+
.and_then(|v| v.get("name"))
|
|
46
|
+
.and_then(|v| v.as_str())
|
|
47
|
+
.unwrap_or("unknown")
|
|
48
|
+
.to_string();
|
|
49
|
+
|
|
50
|
+
Ok(publisher)
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
pub async fn get_addon_from_api(slug: &str) -> Result<AddonToDownloadMetadata, String> {
|
|
54
|
+
let api_url = get_api_url();
|
|
55
|
+
|
|
56
|
+
let request_url = format!("{}/v1/products/getBySlug/{}", api_url, slug);
|
|
57
|
+
|
|
58
|
+
let client: reqwest::Client = reqwest::Client::builder()
|
|
59
|
+
.build()
|
|
60
|
+
.map_err(|_| "Failed to build HTTP client".to_string())?;
|
|
61
|
+
|
|
62
|
+
let resp = client
|
|
63
|
+
.get(&request_url)
|
|
64
|
+
.send()
|
|
65
|
+
.await
|
|
66
|
+
.map_err(|e| format!("Failed to receive response: {}", e))?;
|
|
67
|
+
|
|
68
|
+
let status = resp.status();
|
|
69
|
+
let body_text = resp
|
|
70
|
+
.text()
|
|
71
|
+
.await
|
|
72
|
+
.map_err(|e| format!("Failed to read response body: {}", e))?;
|
|
73
|
+
|
|
74
|
+
let json: serde_json::Value = match serde_json::from_str(&body_text) {
|
|
75
|
+
Ok(v) => v,
|
|
76
|
+
Err(_) => {
|
|
77
|
+
return Err(format!(
|
|
78
|
+
"Invalid JSON response (status {}): {}",
|
|
79
|
+
status, body_text
|
|
80
|
+
));
|
|
81
|
+
}
|
|
82
|
+
};
|
|
83
|
+
|
|
84
|
+
let payload = json.get("payload");
|
|
85
|
+
let addon_type = payload
|
|
86
|
+
.unwrap_or(&serde_json::Value::Null)
|
|
87
|
+
.get("addon")
|
|
88
|
+
.unwrap_or(&serde_json::Value::Null)
|
|
89
|
+
.get("addon_type")
|
|
90
|
+
.and_then(|v| v.as_str())
|
|
91
|
+
.unwrap_or("unknown");
|
|
92
|
+
|
|
93
|
+
let addon_type_enum = match addon_type {
|
|
94
|
+
"bank" => devalang_types::AddonType::Bank,
|
|
95
|
+
"plugin" => devalang_types::AddonType::Plugin,
|
|
96
|
+
"preset" => devalang_types::AddonType::Preset,
|
|
97
|
+
"template" => devalang_types::AddonType::Template,
|
|
98
|
+
_ => {
|
|
99
|
+
return Err(format!("Unknown addon type: {}", addon_type));
|
|
100
|
+
}
|
|
101
|
+
};
|
|
102
|
+
|
|
103
|
+
let addon_metadata = AddonToDownloadMetadata {
|
|
104
|
+
name: payload
|
|
105
|
+
.unwrap_or(&serde_json::Value::Null)
|
|
106
|
+
.get("addon")
|
|
107
|
+
.unwrap_or(&serde_json::Value::Null)
|
|
108
|
+
.get("name")
|
|
109
|
+
.and_then(|v| v.as_str())
|
|
110
|
+
.unwrap_or("unknown")
|
|
111
|
+
.to_string(),
|
|
112
|
+
publisher: payload
|
|
113
|
+
.unwrap_or(&serde_json::Value::Null)
|
|
114
|
+
.get("publisher")
|
|
115
|
+
.unwrap_or(&serde_json::Value::Null)
|
|
116
|
+
.get("name")
|
|
117
|
+
.and_then(|v| v.as_str())
|
|
118
|
+
.unwrap_or("unknown")
|
|
119
|
+
.to_string(),
|
|
120
|
+
addon_type: addon_type_enum,
|
|
121
|
+
};
|
|
122
|
+
|
|
123
|
+
Ok(addon_metadata)
|
|
124
|
+
}
|