Skip to content

Commit a764875

Browse files
pavelzwpavelzw
committed
wip
1 parent 5a7d1f3 commit a764875

File tree

1 file changed

+81
-82
lines changed

1 file changed

+81
-82
lines changed

‎src/lib.rs

+81-82
Original file line numberDiff line numberDiff line change
@@ -87,58 +87,58 @@ pub fn fetch_license_infos(lockfile_or_prefix: LockfileOrPrefix) -> Result<Licen
8787
const IGNORE_PYPI_DEFAULT: bool = false;
8888

8989
fn get_lockfile_or_prefix(
90-
lockfile: Vec<PathBuf>,
91-
prefix: Vec<PathBuf>,
92-
platforms: Option<Vec<Platform>>,
93-
environments: Option<Vec<String>>,
94-
ignore_pypi: Option<bool>,
90+
cli_config: CondaDenyCliConfig,
91+
toml_config: CondaDenyTomlConfig,
9592
) -> Result<LockfileOrPrefix> {
96-
if lockfile.is_empty() && prefix.is_empty() {
97-
// test if pixi.lock exists next to config file, otherwise error
98-
let default_lockfile_path = env::current_dir()?.join("pixi.lock");
99-
if !default_lockfile_path.is_file() {
100-
Err(anyhow::anyhow!("No lockfiles or conda prefixes provided"))
101-
} else {
102-
Ok(LockfileOrPrefix::Lockfile(LockfileSpec {
103-
lockfiles: vec![default_lockfile_path],
104-
platforms,
105-
environments,
106-
ignore_pypi: ignore_pypi.unwrap_or(IGNORE_PYPI_DEFAULT),
107-
}))
108-
}
109-
} else if !lockfile.is_empty() && !prefix.is_empty() {
110-
// TODO: Specified prefixes override lockfiles
111-
Err(anyhow::anyhow!(
112-
"Both lockfiles and conda prefixes provided. Please only provide either or."
113-
))
114-
} else if !lockfile.is_empty() {
115-
Ok(LockfileOrPrefix::Lockfile(LockfileSpec {
116-
lockfiles: lockfile.iter().map(|s| s.into()).collect(),
117-
platforms,
118-
environments,
119-
ignore_pypi: ignore_pypi.unwrap_or(IGNORE_PYPI_DEFAULT),
120-
}))
121-
} else {
122-
assert!(!prefix.is_empty());
93+
// cli overrides toml configuration
12394

124-
if platforms.is_some() {
125-
Err(anyhow::anyhow!(
126-
"Cannot specify platforms and conda prefixes at the same time"
127-
))
128-
} else if environments.is_some() {
129-
Err(anyhow::anyhow!(
130-
"Cannot specify pixi environments and conda prefixes at the same time"
131-
))
132-
} else if ignore_pypi.is_some() {
133-
Err(anyhow::anyhow!(
134-
"Cannot specify ignore-pypi and conda prefixes at the same time"
135-
))
136-
} else {
137-
Ok(LockfileOrPrefix::Prefix(
138-
prefix.iter().map(|s| s.into()).collect(),
139-
))
140-
}
141-
}
95+
Ok(LockfileOrPrefix::Prefix(vec!["adwd".into()]))
96+
// if lockfile.is_empty() && prefix.is_empty() {
97+
// // test if pixi.lock exists next to config file, otherwise error
98+
// let default_lockfile_path = env::current_dir()?.join("pixi.lock");
99+
// if !default_lockfile_path.is_file() {
100+
// Err(anyhow::anyhow!("No lockfiles or conda prefixes provided"))
101+
// } else {
102+
// Ok(LockfileOrPrefix::Lockfile(LockfileSpec {
103+
// lockfiles: vec![default_lockfile_path],
104+
// platforms,
105+
// environments,
106+
// ignore_pypi: ignore_pypi.unwrap_or(IGNORE_PYPI_DEFAULT),
107+
// }))
108+
// }
109+
// } else if !lockfile.is_empty() && !prefix.is_empty() {
110+
// // TODO: Specified prefixes override lockfiles
111+
// Err(anyhow::anyhow!(
112+
// "Both lockfiles and conda prefixes provided. Please only provide either or."
113+
// ))
114+
// } else if !lockfile.is_empty() {
115+
// Ok(LockfileOrPrefix::Lockfile(LockfileSpec {
116+
// lockfiles: lockfile.iter().map(|s| s.into()).collect(),
117+
// platforms,
118+
// environments,
119+
// ignore_pypi: ignore_pypi.unwrap_or(IGNORE_PYPI_DEFAULT),
120+
// }))
121+
// } else {
122+
// assert!(!prefix.is_empty());
123+
124+
// if platforms.is_some() {
125+
// Err(anyhow::anyhow!(
126+
// "Cannot specify platforms and conda prefixes at the same time"
127+
// ))
128+
// } else if environments.is_some() {
129+
// Err(anyhow::anyhow!(
130+
// "Cannot specify pixi environments and conda prefixes at the same time"
131+
// ))
132+
// } else if ignore_pypi.is_some() {
133+
// Err(anyhow::anyhow!(
134+
// "Cannot specify ignore-pypi and conda prefixes at the same time"
135+
// ))
136+
// } else {
137+
// Ok(LockfileOrPrefix::Prefix(
138+
// prefix.iter().map(|s| s.into()).collect(),
139+
// ))
140+
// }
141+
// }
142142
}
143143

144144
pub fn get_config_options(
@@ -183,43 +183,42 @@ pub fn get_config_options(
183183
debug!("Parsed TOML config: {:?}", toml_config);
184184

185185
// cli overrides toml configuration
186-
let lockfile = cli_config
187-
.lockfile()
188-
.unwrap_or(toml_config.get_lockfile_spec());
189-
let prefix = cli_config.prefix().unwrap_or_default();
186+
// let lockfile = cli_config
187+
// .lockfile()
188+
// .unwrap_or(toml_config.get_lockfile_spec());
189+
// let prefix = cli_config.prefix().unwrap_or_default();
190190

191-
let platforms = if cli_config.platform().is_some() {
192-
cli_config.platform()
193-
} else {
194-
toml_config.get_platform_spec()
195-
};
196-
if platforms.is_some() && !prefix.is_empty() {
197-
return Err(anyhow::anyhow!(
198-
"Cannot specify platforms and conda prefixes at the same time"
199-
));
200-
}
191+
// let platforms = if cli_config.platform().is_some() {
192+
// cli_config.platform()
193+
// } else {
194+
// toml_config.get_platform_spec()
195+
// };
196+
// if platforms.is_some() && !prefix.is_empty() {
197+
// return Err(anyhow::anyhow!(
198+
// "Cannot specify platforms and conda prefixes at the same time"
199+
// ));
200+
// }
201201

202-
let environments = if cli_config.environment().is_some() {
203-
cli_config.environment()
204-
} else {
205-
toml_config.get_environment_spec()
206-
};
207-
if environments.is_some() && !prefix.is_empty() {
208-
return Err(anyhow::anyhow!(
209-
"Cannot specify environments and conda prefixes at the same time"
210-
));
211-
}
202+
// let environments = if cli_config.environment().is_some() {
203+
// cli_config.environment()
204+
// } else {
205+
// toml_config.get_environment_spec()
206+
// };
207+
// if environments.is_some() && !prefix.is_empty() {
208+
// return Err(anyhow::anyhow!(
209+
// "Cannot specify environments and conda prefixes at the same time"
210+
// ));
211+
// }
212212

213-
let ignore_pypi = if cli_config.ignore_pypi().is_some() {
214-
cli_config.ignore_pypi()
215-
} else {
216-
toml_config.get_ignore_pypi()
217-
};
213+
// let ignore_pypi = if cli_config.ignore_pypi().is_some() {
214+
// cli_config.ignore_pypi()
215+
// } else {
216+
// toml_config.get_ignore_pypi()
217+
// };
218218

219-
let output_format = cli_config.output_format().unwrap_or_default();
219+
// let output_format = cli_config.output_format().unwrap_or_default();
220220

221-
let lockfile_or_prefix =
222-
get_lockfile_or_prefix(lockfile, prefix, platforms, environments, ignore_pypi)?;
221+
let lockfile_or_prefix = get_lockfile_or_prefix(cli_config, toml_config)?;
223222

224223
let config = match cli_config {
225224
CondaDenyCliConfig::Check { osi, .. } => {

0 commit comments

Comments
 (0)