1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
use crate::{
application::operations::install_operation::InstallOperation,
models::upstream::PackageReference,
providers::provider_manager::ProviderManager,
services::{
packaging::{PackageInstaller, PackageRemover, PackageUpgrader},
storage::package_storage::PackageStorage,
},
utils::static_paths::UpstreamPaths,
};
use anyhow::{Context, Result, anyhow};
use console::style;
use serde::Deserialize;
use std::{fs, path::Path};
// ---------------------------------------------------------------------------
// Manifest (mirrors ExportManifest but only needs Deserialize)
// ---------------------------------------------------------------------------
#[derive(Deserialize)]
pub struct ImportManifest {
pub version: u32,
pub packages: Vec<PackageReference>,
}
// ---------------------------------------------------------------------------
// Detection
// ---------------------------------------------------------------------------
/// Returns true if the path looks like a tarball we produced.
fn is_snapshot(path: &Path) -> bool {
let name = path.file_name().unwrap_or_default().to_string_lossy();
name.ends_with(".tar.gz") || name.ends_with(".tgz")
}
// ---------------------------------------------------------------------------
// Operation
// ---------------------------------------------------------------------------
pub struct ImportOperation<'a> {
provider_manager: &'a ProviderManager,
package_storage: &'a mut PackageStorage,
paths: &'a UpstreamPaths,
}
impl<'a> ImportOperation<'a> {
pub fn new(
provider_manager: &'a ProviderManager,
package_storage: &'a mut PackageStorage,
paths: &'a UpstreamPaths,
) -> Self {
Self {
provider_manager,
package_storage,
paths,
}
}
/// Entry point — dispatches to manifest or snapshot based on the file.
pub async fn import<F, G, H>(
&mut self,
path: &Path,
skip_failed: bool,
download_progress_callback: &mut Option<F>,
overall_progress_callback: &mut Option<G>,
message_callback: &mut Option<H>,
) -> Result<()>
where
F: FnMut(u64, u64),
G: FnMut(u32, u32),
H: FnMut(&str),
{
if is_snapshot(path) {
if skip_failed {
message!(
message_callback,
"{}",
style("Note: --skip-failed has no effect for snapshot imports").yellow()
);
}
self.import_snapshot(path, message_callback)
} else {
self.import_manifest(
path,
skip_failed,
download_progress_callback,
overall_progress_callback,
message_callback,
)
.await
}
}
// -----------------------------------------------------------------------
// Light import (manifest)
// -----------------------------------------------------------------------
async fn import_manifest<F, G, H>(
&mut self,
path: &Path,
skip_failed: bool,
download_progress_callback: &mut Option<F>,
overall_progress_callback: &mut Option<G>,
message_callback: &mut Option<H>,
) -> Result<()>
where
F: FnMut(u64, u64),
G: FnMut(u32, u32),
H: FnMut(&str),
{
let content = fs::read_to_string(path)
.context(format!("Failed to read manifest from '{}'", path.display()))?;
let manifest: ImportManifest =
serde_json::from_str(&content).context("Failed to parse manifest")?;
if manifest.version != 1 {
return Err(anyhow!(
"Unsupported manifest version {}. Upgrade upstream and try again.",
manifest.version
));
}
// Split into packages that need installing vs upgrading (force).
let installed_names: std::collections::HashSet<&str> = self
.package_storage
.get_all_packages()
.iter()
.filter(|p| p.install_path.is_some())
.map(|p| p.name.as_str())
.collect();
let mut to_install = Vec::new();
let mut to_upgrade = Vec::new();
let mut failures = 0_u32;
for reference in &manifest.packages {
if installed_names.contains(reference.name.as_str()) {
to_upgrade.push(reference.clone());
} else {
to_install.push(reference.clone());
}
}
// --- Upgrade already-installed packages (force) ---
if !to_upgrade.is_empty() {
message!(
message_callback,
"{}",
style(format!(
"{} package(s) already installed — forcing upgrade",
to_upgrade.len()
))
.yellow()
);
let installer = PackageInstaller::new(self.provider_manager, self.paths)?;
let remover = PackageRemover::new(self.paths);
let upgrader =
PackageUpgrader::new(self.provider_manager, installer, remover, self.paths);
for reference in &to_upgrade {
let Some(package) = self
.package_storage
.get_package_by_name(&reference.name)
.cloned()
else {
if skip_failed {
failures += 1;
message!(
message_callback,
"{} Package '{}' missing from storage; skipping",
style("Upgrade failed:").red(),
reference.name
);
continue;
}
return Err(anyhow!("Package '{}' not found in storage", reference.name));
};
message!(message_callback, "Upgrading '{}' ...", reference.name);
match upgrader
.upgrade(
&package,
true,
false,
download_progress_callback,
message_callback,
)
.await
{
Ok(Some(updated)) => {
self.package_storage.add_or_update_package(updated)?;
message!(
message_callback,
"{}",
style(format!("'{}' upgraded", reference.name)).green()
);
}
Ok(None) => {
// Shouldn't happen with force=true, but harmless
message!(message_callback, "'{}' already up to date", reference.name);
}
Err(e) => {
if skip_failed {
failures += 1;
message!(message_callback, "{} {}", style("Upgrade failed:").red(), e);
} else {
return Err(e).context(format!(
"Failed to upgrade package '{}'",
reference.name
));
}
}
}
}
}
// --- Install new packages via existing bulk path ---
if !to_install.is_empty() {
message!(
message_callback,
"Installing {} new package(s) ...",
to_install.len()
);
let packages: Vec<_> = to_install.into_iter().map(|r| r.into_package()).collect();
let mut install_op =
InstallOperation::new(self.provider_manager, self.package_storage, self.paths)?;
let total = packages.len() as u32;
let mut completed = 0_u32;
for package in packages {
let package_name = package.name.clone();
let use_icon = package.icon_path.is_some();
message!(message_callback, "Installing '{}' ...", package_name);
let install_result = install_op
.install_single(
package,
&None,
&use_icon,
false,
download_progress_callback,
message_callback,
)
.await
.context(format!("Failed to install package '{}'", package_name));
match install_result {
Ok(_) => {
message!(
message_callback,
"{}",
style(format!("'{}' installed", package_name)).green()
);
}
Err(err) => {
if skip_failed {
failures += 1;
message!(
message_callback,
"{} {}",
style("Install failed:").red(),
err
);
} else {
return Err(err);
}
}
}
completed += 1;
if let Some(cb) = overall_progress_callback.as_mut() {
cb(completed, total);
}
}
}
if skip_failed && failures > 0 {
message!(
message_callback,
"{} package(s) failed during import but were skipped",
failures
);
}
Ok(())
}
// -----------------------------------------------------------------------
// Full import (snapshot)
// -----------------------------------------------------------------------
fn import_snapshot<H>(&mut self, path: &Path, message_callback: &mut Option<H>) -> Result<()>
where
H: FnMut(&str),
{
let upstream_dir = &self.paths.dirs.data_dir;
if upstream_dir.exists() {
message!(
message_callback,
"{}",
style("Warning: replacing existing upstream directory").yellow()
);
fs::remove_dir_all(upstream_dir).context(format!(
"Failed to remove existing upstream directory '{}'",
upstream_dir.display()
))?;
}
message!(message_callback, "Extracting snapshot ...");
// Use a temp dir next to the target so rename is atomic (same filesystem).
let temp_dir = upstream_dir
.parent()
.ok_or_else(|| anyhow!("upstream dir has no parent"))?
.join(format!(".upstream-import-{}", std::process::id()));
fs::create_dir_all(&temp_dir)?;
// Decompress the tarball into temp_dir. The archive contains an
// "upstream/" top-level dir, so after extraction we move that into place.
let extracted =
crate::services::integration::compression_handler::decompress(path, &temp_dir)
.context("Failed to extract snapshot")?;
// The extracted path should be temp_dir/upstream (the top-level dir we
// created during export). Rename it directly to .upstream/.
let source = if extracted.join("upstream").is_dir() {
extracted.join("upstream")
} else {
// Flattened by decompress — the contents are already in extracted.
extracted.clone()
};
fs::rename(&source, upstream_dir).context(format!(
"Failed to move extracted snapshot to '{}'",
upstream_dir.display()
))?;
// Clean up temp dir (may already be gone if source == extracted).
let _ = fs::remove_dir_all(&temp_dir);
// Reload storage from the restored files.
self.package_storage.load_packages().context(
"Snapshot restored but failed to reload package storage — check the files manually",
)?;
message!(
message_callback,
"{}",
style("Snapshot restored successfully").green()
);
Ok(())
}
}
macro_rules! message {
($cb:expr, $($arg:tt)*) => {{
if let Some(cb) = $cb.as_mut() {
cb(&format!($($arg)*));
}
}};
}
use message;
#[cfg(test)]
#[path = "../../../tests/application/operations/import_operation.rs"]
mod tests;