caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-07-27 06:17:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

first attempt

Browse Source
This commit is contained in:
Neven Villani 2025-06-11 22:32:10 +02:00 committed by Neven Villani
parent 7089a79b1e
commit 407b006dc6
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
crates/typst-kit/src/package.rs
View File

@ -87,13 +87,9 @@ impl PackageStorage {
) -> PackageResult<PathBuf> { ) -> PackageResult<PathBuf> {
let subdir = format!("{}/{}/{}", spec.namespace, spec.name, spec.version); let subdir = format!("{}/{}/{}", spec.namespace, spec.name, spec.version);
if let Some(packages_dir) = &self.package_path { // QUESTION: is it sometimes the case that both package_path
let dir = packages_dir.join(&subdir); // and package_cache_path are Some? Is it a problem if we change
if dir.exists() { // this order?
return Ok(dir);
}
}
if let Some(cache_dir) = &self.package_cache_path { if let Some(cache_dir) = &self.package_cache_path {
let dir = cache_dir.join(&subdir); let dir = cache_dir.join(&subdir);
if dir.exists() { if dir.exists() {
@ -102,14 +98,39 @@ impl PackageStorage {
// Download from network if it doesn't exist yet. // Download from network if it doesn't exist yet.
if spec.namespace == DEFAULT_NAMESPACE { if spec.namespace == DEFAULT_NAMESPACE {
self.download_package(spec, cache_dir, progress)?; return self.download_package(spec, cache_dir, progress);
if dir.exists() {
return Ok(dir);
}
} }
} }
Err(PackageError::NotFound(spec.clone())) // In all paths from now, we either succeed or fail with a NotFound.
let not_found = |msg| Err(PackageError::NotFound(spec.clone(), msg));
let Some(packages_dir) = &self.package_path else {
// QUESTION: when is this code path hit?
return not_found(None);
};
// We try the fast path
let dir = packages_dir.join(&subdir);
if dir.exists() {
return Ok(dir);
}
// Fast path failed. Instead we try to diagnose the issue by going
// down the subdirectories of the expected path one at a time.
let namespace_dir = packages_dir.join(format!("{}", spec.namespace));
if !namespace_dir.exists() {
return not_found(Some(eco_format!("did not find namespace '{}' while searching at {} for", spec.namespace, namespace_dir.display())));
}
let package_dir = namespace_dir.join(format!("{}", spec.name));
if !package_dir.exists() {
return not_found(Some(eco_format!("did not find package '{}' while searching at {} for", spec.name, package_dir.display())));
}
let version_dir = package_dir.join(format!("{}", spec.version));
if !version_dir.exists() {
return not_found(Some(eco_format!("did not find version {} while searching at {} for", spec.version, version_dir.display())));
}
// We'll never hit this path as long as subdir is indeed namespace/name/version.
// What's Typst's policy on `unreachable`?
unreachable!()
} }
/// Tries to determine the latest version of a package. /// Tries to determine the latest version of a package.
@ -171,7 +192,7 @@ impl PackageStorage {
spec: &PackageSpec, spec: &PackageSpec,
cache_dir: &Path, cache_dir: &Path,
progress: &mut dyn Progress, progress: &mut dyn Progress,
) -> PackageResult<()> { ) -> PackageResult<PathBuf> {
assert_eq!(spec.namespace, DEFAULT_NAMESPACE); assert_eq!(spec.namespace, DEFAULT_NAMESPACE);
let url = format!( let url = format!(
@ -235,8 +256,8 @@ impl PackageStorage {
// broken packages still occur even with the rename safeguard, we might // broken packages still occur even with the rename safeguard, we might
// consider more complex solutions like file locking or checksums. // consider more complex solutions like file locking or checksums.
match fs::rename(&tempdir, &package_dir) { match fs::rename(&tempdir, &package_dir) {
Ok(()) => Ok(()), Ok(()) => Ok(package_dir),
Err(err) if err.kind() == io::ErrorKind::DirectoryNotEmpty => Ok(()), Err(err) if err.kind() == io::ErrorKind::DirectoryNotEmpty => Ok(package_dir),
Err(err) => Err(error("failed to move downloaded package directory", err)), Err(err) => Err(error("failed to move downloaded package directory", err)),
} }
} }