GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-11-06 12:47:11 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

port 23263caea

Browse source
This commit is contained in:
llama 2025-10-31 21:38:54 +08:00
parent 3edfc0b459
commit 8193845763
No known key found for this signature in database
GPG key ID: 0B7543854B9413C3
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qt/launcher-gui/src-tauri/build.rs
View file

@ -13,6 +13,10 @@ fn main() -> Result<()> {
let pool = DescriptorPool::decode(std::fs::read(descriptors_path)?.as_ref())?; let pool = DescriptorPool::decode(std::fs::read(descriptors_path)?.as_ref())?;
rust_interface::write_rust_interface(&pool)?; rust_interface::write_rust_interface(&pool)?;
println!("cargo:rerun-if-changed=../../../out/buildhash");
let buildhash = std::fs::read_to_string("../../../out/buildhash").unwrap_or_default();
println!("cargo:rustc-env=BUILDHASH={buildhash}");
tauri_build::build(); tauri_build::build();
Ok(()) Ok(())

17
qt/launcher-gui/src-tauri/src/uv.rs
View file

@ -804,6 +804,20 @@ pub fn build_python_command(state: &Paths, args: &[String]) -> Result<Command> {
Ok(cmd) Ok(cmd)
} }
fn diff_launcher_was_installed(state: &Paths) -> Result<bool> {
let launcher_version = option_env!("BUILDHASH").unwrap_or("dev").trim();
let launcher_version_path = state.uv_install_root.join("launcher-version");
if let Ok(content) = read_file(&launcher_version_path) {
if let Ok(version_str) = String::from_utf8(content) {
if version_str.trim() == launcher_version {
return Ok(false);
}
}
}
write_file(launcher_version_path, launcher_version)?;
Ok(true)
}
impl State { impl State {
pub fn init() -> Result<Self> { pub fn init() -> Result<Self> {
let uv_install_root = if let Ok(custom_root) = std::env::var("ANKI_LAUNCHER_VENV_ROOT") { let uv_install_root = if let Ok(custom_root) = std::env::var("ANKI_LAUNCHER_VENV_ROOT") {
@ -855,11 +869,12 @@ impl State {
let sync_time = file_timestamp_secs(&paths.sync_complete_marker); let sync_time = file_timestamp_secs(&paths.sync_complete_marker);
paths.pyproject_modified_by_user = pyproject_time > sync_time; paths.pyproject_modified_by_user = pyproject_time > sync_time;
let pyproject_has_changed = paths.pyproject_modified_by_user; let pyproject_has_changed = paths.pyproject_modified_by_user;
let different_launcher = diff_launcher_was_installed(&paths)?;
// TODO: remove // TODO: remove
let debug = cfg!(debug_assertions) && std::env::var("ANKI_LAUNCHER_SKIP").is_err(); let debug = cfg!(debug_assertions) && std::env::var("ANKI_LAUNCHER_SKIP").is_err();
if !launcher_requested && !pyproject_has_changed && !debug { if !launcher_requested && !pyproject_has_changed && !different_launcher && !debug {
return Ok(Self::LaunchAnki(paths.into())); return Ok(Self::LaunchAnki(paths.into()));
} }