Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bundle rework #1121

Closed
wants to merge 67 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
f84252d
Rewrote CachingBundle as a universal wrapper
rm-dr Nov 4, 2023
7f24467
Added http retries & sleep
rm-dr Nov 4, 2023
2f5e1e5
Minor cleanup
rm-dr Nov 4, 2023
52c1ba2
Minor fixes
rm-dr Nov 4, 2023
6d4b25a
Fixed reader
rm-dr Nov 5, 2023
eea0a85
Added index to cache
rm-dr Nov 5, 2023
827febb
Minor cleanup
rm-dr Nov 5, 2023
96027f4
Fixed all_files()
rm-dr Nov 5, 2023
c59d394
Fixed print order
rm-dr Nov 5, 2023
e95371a
Minor edit
rm-dr Nov 5, 2023
6a29531
Cleaned up `bundle search`
rm-dr Nov 25, 2023
4fdf435
Rearranged printing
rm-dr Nov 25, 2023
f9f373c
Converted zip bundle to new format
rm-dr Nov 25, 2023
020a6a9
Improved bundle type detection
rm-dr Nov 25, 2023
6b17609
Merge new commits from 'master'
rm-dr Nov 25, 2023
ca1ad16
Minor edits
rm-dr Nov 25, 2023
ed329f4
Improved search method
rm-dr Dec 1, 2023
3219374
Cleaned up cache dir code
rm-dr Dec 2, 2023
cebcce9
Minor cleanup
rm-dr Dec 3, 2023
b938dba
Improved bundle detection
rm-dr Dec 3, 2023
6a99e50
Documentation
rm-dr Dec 3, 2023
bc4c46c
Minor fix
rm-dr Dec 3, 2023
5c952f5
Reverted zip bundle changes
rm-dr Dec 3, 2023
707927a
Minor fix
rm-dr Dec 3, 2023
cb25f8b
Added ttbv1 bundles
rm-dr Dec 3, 2023
0e4f272
Added fill_index_external
rm-dr Dec 3, 2023
78262fe
Added file size check
rm-dr Dec 8, 2023
9adccff
moved get_digest impl for dir and zip
rm-dr Dec 8, 2023
a58a3cb
Reworked bundle caching
rm-dr Dec 9, 2023
ed339e9
Removed resolve_url
rm-dr Dec 9, 2023
a759d31
Removed statusbackend where it isn't needed
rm-dr Dec 10, 2023
fd5f8b8
More minor cleanup
rm-dr Dec 10, 2023
be27209
Cleanup: cache paths
rm-dr Dec 10, 2023
d730a5e
Typo
rm-dr Dec 10, 2023
2498fd9
Cleanup, added download log
rm-dr Dec 10, 2023
4489de4
Minor cleanup
rm-dr Dec 11, 2023
5e7b153
Added retries and real_len
rm-dr Dec 11, 2023
8e49106
Added support for configurable search orders
rm-dr Dec 11, 2023
e18574f
Cleanup
rm-dr Dec 11, 2023
dcfa379
Minor cleanup
rm-dr Dec 11, 2023
bab87db
Minor cleanup
rm-dr Dec 11, 2023
ca5c2ac
Minor cleanup
rm-dr Dec 11, 2023
2cc7a51
Docs
rm-dr Dec 11, 2023
5d51068
Minor fix
rm-dr Dec 11, 2023
a738bcb
Handle absolute paths
rm-dr Dec 11, 2023
e93bf9a
Minor fixes
rm-dr Dec 11, 2023
bdd92cc
Fixed itar caching
rm-dr Dec 11, 2023
df7b451
Minor cleanup
rm-dr Dec 15, 2023
fcbda56
Comment
rm-dr Dec 15, 2023
31bc4be
Fixed links for autodetect function
rm-dr Dec 15, 2023
8de7864
Merged latest changes from "master"
rm-dr Dec 15, 2023
ba56a6c
Added default url redirect resolution
rm-dr Dec 19, 2023
7e60f3f
Harfbuzz bump
rm-dr Feb 10, 2024
80a09fa
Merge branch 'master' into betterbundle
rm-dr Feb 10, 2024
df80e8e
Clippy
rm-dr Feb 10, 2024
cf09067
Renames for process safety
rm-dr Feb 10, 2024
be1647a
Minor edits
rm-dr Feb 10, 2024
0f9721c
Fixed tests
rm-dr Feb 10, 2024
742d2f7
Clippy
rm-dr Feb 10, 2024
8818b60
Clippy
rm-dr Feb 11, 2024
4ed3b22
Merge branch 'master' into betterbundle
rm-dr Feb 21, 2024
d2a3490
Merge branch 'master' into betterbundle
rm-dr Feb 28, 2024
d11a8cf
Argument edits
rm-dr Feb 29, 2024
5625602
Better errors & minor cleanup
rm-dr Feb 29, 2024
2dfa321
Bundle path tweaks
rm-dr Feb 29, 2024
53828f5
Clippy
rm-dr Feb 29, 2024
4d3f8b6
Merge branch 'master' into betterbundle
rm-dr Feb 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 5 additions & 17 deletions crates/bridge_core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,26 +106,14 @@
/// argument specifies the cryptographic digest of the data that were
/// written. Note that this function takes ownership of the name and
/// digest.
fn event_output_closed(
&mut self,
_name: String,
_digest: DigestData,
_status: &mut dyn StatusBackend,
) {
}
fn event_output_closed(&mut self, _name: String, _digest: DigestData) {}

/// This function is called when an input file is closed. The "digest"
/// argument specifies the cryptographic digest of the data that were
/// read, if available. This digest is not always available, if the engine
/// used seeks while reading the file. Note that this function takes
/// ownership of the name and digest.
fn event_input_closed(
&mut self,
_name: String,
_digest: Option<DigestData>,
_status: &mut dyn StatusBackend,
) {
}
fn event_input_closed(&mut self, _name: String, _digest: Option<DigestData>) {}

/// The engine is requesting a "shell escape" evaluation.
///
Expand Down Expand Up @@ -469,7 +457,7 @@
// Clean up.

let (name, digest_opt) = ih.into_name_digest();
self.hooks.event_input_closed(name, digest_opt, self.status);
self.hooks.event_input_closed(name, digest_opt);

Check warning on line 460 in crates/bridge_core/src/lib.rs

View check run for this annotation

Codecov / codecov/patch

crates/bridge_core/src/lib.rs#L460

Added line #L460 was not covered by tests

if !error_occurred {
let result = hash.finalize();
Expand Down Expand Up @@ -560,7 +548,7 @@
rv = true;
}
let (name, digest) = oh.into_name_digest();
self.hooks.event_output_closed(name, digest, self.status);
self.hooks.event_output_closed(name, digest);
break;
}
}
Expand Down Expand Up @@ -676,7 +664,7 @@
}

let (name, digest_opt) = ih.into_name_digest();
self.hooks.event_input_closed(name, digest_opt, self.status);
self.hooks.event_input_closed(name, digest_opt);
return rv;
}
}
Expand Down
3 changes: 2 additions & 1 deletion crates/bundles/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

[package]
name = "tectonic_bundles"
version = "0.0.0-dev.0" # assigned with cranko (see README)
version = "0.0.0-dev.0" # assigned with cranko (see README)
authors = ["Peter Williams <[email protected]>"]
description = """
Tectonic "bundle" (support file collection) implementations.
Expand All @@ -25,6 +25,7 @@ tectonic_geturl = { path = "../geturl", version = "0.0.0-dev.0", default-feature
tectonic_io_base = { path = "../io_base", version = "0.0.0-dev.0" }
tectonic_status_base = { path = "../status_base", version = "0.0.0-dev.0" }
zip = { version = "^0.6", default-features = false, features = ["deflate"] }
url = "^2.0"

[features]
default = ["geturl-reqwest"]
Expand Down
Loading
Loading