vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-06-23 20:37:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

[yabridgectl] Allow skipping hash checks

Browse Source
This commit is contained in:
Robbert van der Helm
2020-12-24 11:54:45 +01:00
parent e19cbca5d1
commit 68c95e9527
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/yabridgectl/src/actions.rs
+11 -10
View File
@@ -223,7 +223,7 @@ pub fn do_sync(config: &mut Config, options: &SyncOptions) -> Result<()> {
options.force, options.force,
config.method, config.method,
&files.libyabridge_vst2, &files.libyabridge_vst2,
libyabridge_vst2_hash, Some(libyabridge_vst2_hash),
&target_path, &target_path,
)? { )? {
num_new += 1; num_new += 1;
@@ -248,7 +248,7 @@ pub fn do_sync(config: &mut Config, options: &SyncOptions) -> Result<()> {
true, true,
InstallationMethod::Symlink, InstallationMethod::Symlink,
&module.original_module_path(), &module.original_module_path(),
0, None,
&windows_module_path, &windows_module_path,
)?; )?;
@@ -258,7 +258,7 @@ pub fn do_sync(config: &mut Config, options: &SyncOptions) -> Result<()> {
options.force, options.force,
config.method, config.method,
files.libyabridge_vst3.as_ref().unwrap(), files.libyabridge_vst3.as_ref().unwrap(),
libyabridge_vst3_hash, Some(libyabridge_vst3_hash),
&native_module_path, &native_module_path,
)? { )? {
num_new += 1; num_new += 1;
@@ -343,7 +343,7 @@ fn install_file(
force: bool, force: bool,
method: InstallationMethod, method: InstallationMethod,
from: &Path, from: &Path,
from_hash: i64, from_hash: Option<i64>,
to: &Path, to: &Path,
) -> Result<bool> { ) -> Result<bool> {
// We'll only recreate existing files when updating yabridge, when switching between the symlink // We'll only recreate existing files when updating yabridge, when switching between the symlink
@@ -354,16 +354,17 @@ fn install_file(
if let Ok(metadata) = fs::symlink_metadata(&to) { if let Ok(metadata) = fs::symlink_metadata(&to) {
match (force, &method) { match (force, &method) {
(false, InstallationMethod::Copy) => { (false, InstallationMethod::Copy) => {
// If the target file is already a real file (not a symlink) and its hash is // If the target file is already a real file (not a symlink) and its hash is the
// the same as the `libyabridge-vst2.so` file we're trying to copy there, // same as that of the `from` file we're trying to copy there, then we don't have to
// then we don't have to do anything // do anything
if metadata.file_type().is_file() && utils::hash_file(to)? == from_hash { if let Some(hash) = from_hash {
if metadata.file_type().is_file() && utils::hash_file(to)? == hash {
return Ok(false); return Ok(false);
} }
} }
}
(false, InstallationMethod::Symlink) => { (false, InstallationMethod::Symlink) => {
// If the target file is already a symlink to `libyabridge-vst2.so`, then we // If the target file is already a symlink to `from`, then we can skip this file
// can skip this file
if metadata.file_type().is_symlink() && to.read_link()? == from { if metadata.file_type().is_symlink() && to.read_link()? == from {
return Ok(false); return Ok(false);
} }