folkslinux
/
mamba
mirror of https://github.com/mamba-org/mamba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No M (#3137)

This commit is contained in:
Antoine Prouvost 2024-01-18 08:44:23 +01:00 committed by GitHub
parent a29f500d17
commit 0324bd74b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 94 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmamba/include/mamba/core/pool.hpp
View File

@ -22,7 +22,7 @@ namespace mamba
class ChannelContext; class ChannelContext;
class Context; class Context;
class PrefixData; class PrefixData;
class MSubdirData; class SubdirData;
namespace fs namespace fs
{ {
@ -146,7 +146,7 @@ namespace mamba
}; };
// TODO machinery functions in separate files // TODO machinery functions in separate files
auto load_subdir_in_pool(const Context& ctx, MPool& pool, const MSubdirData& subdir) auto load_subdir_in_pool(const Context& ctx, MPool& pool, const SubdirData& subdir)
-> expected_t<solver::libsolv::RepoInfo>; -> expected_t<solver::libsolv::RepoInfo>;
auto load_installed_packages_in_pool(const Context& ctx, MPool& pool, const PrefixData& prefix) auto load_installed_packages_in_pool(const Context& ctx, MPool& pool, const PrefixData& prefix)

32
libmamba/include/mamba/core/subdirdata.hpp
View File

@ -29,7 +29,7 @@ namespace mamba
class ChannelContext; class ChannelContext;
class DownloadMonitor; class DownloadMonitor;
class MSubdirMetadata class SubdirMetadata
{ {
public: public:
@ -41,7 +41,7 @@ namespace mamba
std::string cache_control; std::string cache_control;
}; };
using expected_subdir_metadata = tl::expected<MSubdirMetadata, mamba_error>; using expected_subdir_metadata = tl::expected<SubdirMetadata, mamba_error>;
static expected_subdir_metadata read(const fs::u8path& file); static expected_subdir_metadata read(const fs::u8path& file);
void write(const fs::u8path& file); void write(const fs::u8path& file);
@ -87,8 +87,8 @@ namespace mamba
friend void to_json(nlohmann::json& j, const CheckedAt& ca); friend void to_json(nlohmann::json& j, const CheckedAt& ca);
friend void from_json(const nlohmann::json& j, CheckedAt& ca); friend void from_json(const nlohmann::json& j, CheckedAt& ca);
friend void to_json(nlohmann::json& j, const MSubdirMetadata& data); friend void to_json(nlohmann::json& j, const SubdirMetadata& data);
friend void from_json(const nlohmann::json& j, MSubdirMetadata& data); friend void from_json(const nlohmann::json& j, SubdirMetadata& data);
}; };
/** /**
@ -96,11 +96,11 @@ namespace mamba
* packages index. Handles downloading of the index * packages index. Handles downloading of the index
* from the server and cache generation as well. * from the server and cache generation as well.
*/ */
class MSubdirData class SubdirData
{ {
public: public:
static expected_t<MSubdirData> create( static expected_t<SubdirData> create(
Context& ctx, Context& ctx,
ChannelContext& channel_context, ChannelContext& channel_context,
const specs::Channel& channel, const specs::Channel& channel,
@ -110,13 +110,13 @@ namespace mamba
const std::string& repodata_fn = "repodata.json" const std::string& repodata_fn = "repodata.json"
); );
~MSubdirData() = default; ~SubdirData() = default;
MSubdirData(const MSubdirData&) = delete; SubdirData(const SubdirData&) = delete;
MSubdirData& operator=(const MSubdirData&) = delete; SubdirData& operator=(const SubdirData&) = delete;
MSubdirData(MSubdirData&&) = default; SubdirData(SubdirData&&) = default;
MSubdirData& operator=(MSubdirData&&) = default; SubdirData& operator=(SubdirData&&) = default;
bool is_noarch() const; bool is_noarch() const;
bool is_loaded() const; bool is_loaded() const;
@ -124,7 +124,7 @@ namespace mamba
const std::string& name() const; const std::string& name() const;
const MSubdirMetadata& metadata() const; const SubdirMetadata& metadata() const;
expected_t<fs::u8path> valid_solv_cache() const; expected_t<fs::u8path> valid_solv_cache() const;
fs::u8path writable_solv_cache() const; fs::u8path writable_solv_cache() const;
@ -134,7 +134,7 @@ namespace mamba
expected_t<std::string> cache_path() const; expected_t<std::string> cache_path() const;
static expected_t<void> download_indexes( static expected_t<void> download_indexes(
std::vector<MSubdirData>& subdirs, std::vector<SubdirData>& subdirs,
const Context& context, const Context& context,
DownloadMonitor* check_monitor = nullptr, DownloadMonitor* check_monitor = nullptr,
DownloadMonitor* download_monitor = nullptr DownloadMonitor* download_monitor = nullptr
@ -142,7 +142,7 @@ namespace mamba
private: private:
MSubdirData( SubdirData(
Context& ctx, Context& ctx,
ChannelContext& channel_context, ChannelContext& channel_context,
const specs::Channel& channel, const specs::Channel& channel,
@ -161,7 +161,7 @@ namespace mamba
DownloadRequest build_index_request(); DownloadRequest build_index_request();
expected_t<void> use_existing_cache(); expected_t<void> use_existing_cache();
expected_t<void> finalize_transfer(MSubdirMetadata::HttpMetadata http_data); expected_t<void> finalize_transfer(SubdirMetadata::HttpMetadata http_data);
void refresh_last_write_time(const fs::u8path& json_file, const fs::u8path& solv_file); void refresh_last_write_time(const fs::u8path& json_file, const fs::u8path& solv_file);
bool m_loaded = false; bool m_loaded = false;
@ -178,7 +178,7 @@ namespace mamba
std::string m_solv_fn; std::string m_solv_fn;
bool m_is_noarch; bool m_is_noarch;
MSubdirMetadata m_metadata; SubdirMetadata m_metadata;
std::unique_ptr<TemporaryFile> m_temp_file; std::unique_ptr<TemporaryFile> m_temp_file;
const Context* p_context; const Context* p_context;
}; };

10
libmamba/src/api/channel_loader.cpp
View File

@ -48,7 +48,7 @@ namespace mamba
ChannelContext& channel_context, ChannelContext& channel_context,
const specs::Channel& channel, const specs::Channel& channel,
MultiPackageCache& package_caches, MultiPackageCache& package_caches,
std::vector<MSubdirData>& subdirs, std::vector<SubdirData>& subdirs,
std::vector<mamba_error>& error_list, std::vector<mamba_error>& error_list,
std::vector<solver::libsolv::Priorities>& priorities, std::vector<solver::libsolv::Priorities>& priorities,
int& max_prio, int& max_prio,
@ -57,7 +57,7 @@ namespace mamba
{ {
for (const auto& platform : channel.platforms()) for (const auto& platform : channel.platforms())
{ {
auto sdires = MSubdirData::create( auto sdires = SubdirData::create(
ctx, ctx,
channel_context, channel_context,
channel, channel,
@ -96,7 +96,7 @@ namespace mamba
{ {
int RETRY_SUBDIR_FETCH = 1 << 0; int RETRY_SUBDIR_FETCH = 1 << 0;
std::vector<MSubdirData> subdirs; std::vector<SubdirData> subdirs;
std::vector<solver::libsolv::Priorities> priorities; std::vector<solver::libsolv::Priorities> priorities;
int max_prio = static_cast<int>(ctx.channels.size()); int max_prio = static_cast<int>(ctx.channels.size());
@ -151,11 +151,11 @@ namespace mamba
{ {
SubdirDataMonitor check_monitor({ true, true }); SubdirDataMonitor check_monitor({ true, true });
SubdirDataMonitor index_monitor; SubdirDataMonitor index_monitor;
download_res = MSubdirData::download_indexes(subdirs, ctx, &check_monitor, &index_monitor); download_res = SubdirData::download_indexes(subdirs, ctx, &check_monitor, &index_monitor);
} }
else else
{ {
download_res = MSubdirData::download_indexes(subdirs, ctx); download_res = SubdirData::download_indexes(subdirs, ctx);
} }
if (!download_res) if (!download_res)

2
libmamba/src/core/pool.cpp
View File

@ -457,7 +457,7 @@ namespace mamba
} }
// TODO machinery functions in separate files // TODO machinery functions in separate files
auto load_subdir_in_pool(const Context& ctx, MPool& pool, const MSubdirData& subdir) auto load_subdir_in_pool(const Context& ctx, MPool& pool, const SubdirData& subdir)
-> expected_t<solver::libsolv::RepoInfo> -> expected_t<solver::libsolv::RepoInfo>
{ {
const auto expected_cache_origin = solver::libsolv::RepodataOrigin{ const auto expected_cache_origin = solver::libsolv::RepodataOrigin{

102
libmamba/src/core/subdirdata.cpp
View File

@ -118,20 +118,20 @@ namespace mamba
* MSubdirMetadata * * MSubdirMetadata *
*******************/ *******************/
void to_json(nlohmann::json& j, const MSubdirMetadata::CheckedAt& ca) void to_json(nlohmann::json& j, const SubdirMetadata::CheckedAt& ca)
{ {
j["value"] = ca.value; j["value"] = ca.value;
j["last_checked"] = timestamp(ca.last_checked); j["last_checked"] = timestamp(ca.last_checked);
} }
void from_json(const nlohmann::json& j, MSubdirMetadata::CheckedAt& ca) void from_json(const nlohmann::json& j, SubdirMetadata::CheckedAt& ca)
{ {
int err_code = 0; int err_code = 0;
ca.value = j["value"].get<bool>(); ca.value = j["value"].get<bool>();
ca.last_checked = parse_utc_timestamp(j["last_checked"].get<std::string>(), err_code); ca.last_checked = parse_utc_timestamp(j["last_checked"].get<std::string>(), err_code);
} }
void to_json(nlohmann::json& j, const MSubdirMetadata& data) void to_json(nlohmann::json& j, const SubdirMetadata& data)
{ {
j["url"] = data.m_http.url; j["url"] = data.m_http.url;
j["etag"] = data.m_http.etag; j["etag"] = data.m_http.etag;
@ -146,7 +146,7 @@ namespace mamba
j["has_zst"] = data.m_has_zst; j["has_zst"] = data.m_has_zst;
} }
void from_json(const nlohmann::json& j, MSubdirMetadata& data) void from_json(const nlohmann::json& j, SubdirMetadata& data)
{ {
data.m_http.url = j["url"].get<std::string>(); data.m_http.url = j["url"].get<std::string>();
data.m_http.etag = j["etag"].get<std::string>(); data.m_http.etag = j["etag"].get<std::string>();
@ -161,7 +161,7 @@ namespace mamba
util::deserialize_maybe_missing(j, "has_zst", data.m_has_zst); util::deserialize_maybe_missing(j, "has_zst", data.m_has_zst);
} }
auto MSubdirMetadata::read(const fs::u8path& file) -> expected_subdir_metadata auto SubdirMetadata::read(const fs::u8path& file) -> expected_subdir_metadata
{ {
fs::u8path state_file = file; fs::u8path state_file = file;
state_file.replace_extension(".state.json"); state_file.replace_extension(".state.json");
@ -175,14 +175,14 @@ namespace mamba
} }
} }
void MSubdirMetadata::write(const fs::u8path& file) void SubdirMetadata::write(const fs::u8path& file)
{ {
nlohmann::json j = *this; nlohmann::json j = *this;
std::ofstream out = open_ofstream(file); std::ofstream out = open_ofstream(file);
out << j.dump(4); out << j.dump(4);
} }
bool MSubdirMetadata::check_valid_metadata(const fs::u8path& file) bool SubdirMetadata::check_valid_metadata(const fs::u8path& file)
{ {
if (const auto new_size = fs::file_size(file); new_size != m_stored_file_size) if (const auto new_size = fs::file_size(file); new_size != m_stored_file_size)
{ {
@ -202,37 +202,37 @@ namespace mamba
return last_write_time_valid; return last_write_time_valid;
} }
const std::string& MSubdirMetadata::url() const const std::string& SubdirMetadata::url() const
{ {
return m_http.url; return m_http.url;
} }
const std::string& MSubdirMetadata::etag() const const std::string& SubdirMetadata::etag() const
{ {
return m_http.etag; return m_http.etag;
} }
const std::string& MSubdirMetadata::last_modified() const const std::string& SubdirMetadata::last_modified() const
{ {
return m_http.last_modified; return m_http.last_modified;
} }
const std::string& MSubdirMetadata::cache_control() const const std::string& SubdirMetadata::cache_control() const
{ {
return m_http.cache_control; return m_http.cache_control;
} }
bool MSubdirMetadata::has_zst() const bool SubdirMetadata::has_zst() const
{ {
return m_has_zst.has_value() && m_has_zst.value().value && !m_has_zst.value().has_expired(); return m_has_zst.has_value() && m_has_zst.value().value && !m_has_zst.value().has_expired();
} }
void MSubdirMetadata::store_http_metadata(HttpMetadata data) void SubdirMetadata::store_http_metadata(HttpMetadata data)
{ {
m_http = std::move(data); m_http = std::move(data);
} }
void MSubdirMetadata::store_file_metadata(const fs::u8path& file) void SubdirMetadata::store_file_metadata(const fs::u8path& file)
{ {
#ifndef _WIN32 #ifndef _WIN32
m_stored_mtime = fs::last_write_time(file); m_stored_mtime = fs::last_write_time(file);
@ -243,21 +243,21 @@ namespace mamba
m_stored_file_size = fs::file_size(file); m_stored_file_size = fs::file_size(file);
} }
void MSubdirMetadata::set_zst(bool value) void SubdirMetadata::set_zst(bool value)
{ {
m_has_zst = { value, std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()) }; m_has_zst = { value, std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()) };
} }
auto auto
MSubdirMetadata::from_state_file(const fs::u8path& state_file, const fs::u8path& repodata_file) SubdirMetadata::from_state_file(const fs::u8path& state_file, const fs::u8path& repodata_file)
-> expected_subdir_metadata -> expected_subdir_metadata
{ {
std::ifstream infile = open_ifstream(state_file); std::ifstream infile = open_ifstream(state_file);
nlohmann::json j = nlohmann::json::parse(infile); nlohmann::json j = nlohmann::json::parse(infile);
MSubdirMetadata m; SubdirMetadata m;
try try
{ {
m = j.get<MSubdirMetadata>(); m = j.get<SubdirMetadata>();
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
@ -285,7 +285,7 @@ namespace mamba
return m; return m;
} }
auto MSubdirMetadata::from_repodata_file(const fs::u8path& repodata_file) auto SubdirMetadata::from_repodata_file(const fs::u8path& repodata_file)
-> expected_subdir_metadata -> expected_subdir_metadata
{ {
const std::string json = [](const fs::u8path& file) -> std::string const std::string json = [](const fs::u8path& file) -> std::string
@ -298,7 +298,7 @@ namespace mamba
try try
{ {
nlohmann::json result = nlohmann::json::parse(json); nlohmann::json result = nlohmann::json::parse(json);
MSubdirMetadata m; SubdirMetadata m;
m.m_http.url = result.value("_url", ""); m.m_http.url = result.value("_url", "");
m.m_http.etag = result.value("_etag", ""); m.m_http.etag = result.value("_etag", "");
m.m_http.last_modified = result.value("_mod", ""); m.m_http.last_modified = result.value("_mod", "");
@ -315,7 +315,7 @@ namespace mamba
} }
} }
bool MSubdirMetadata::CheckedAt::has_expired() const bool SubdirMetadata::CheckedAt::has_expired() const
{ {
// difference in seconds, check every 14 days // difference in seconds, check every 14 days
constexpr double expiration = 60 * 60 * 24 * 14; constexpr double expiration = 60 * 60 * 24 * 14;
@ -400,7 +400,7 @@ namespace mamba
} }
} }
expected_t<MSubdirData> MSubdirData::create( expected_t<SubdirData> SubdirData::create(
Context& ctx, Context& ctx,
ChannelContext& channel_context, ChannelContext& channel_context,
const specs::Channel& channel, const specs::Channel& channel,
@ -412,7 +412,7 @@ namespace mamba
{ {
try try
{ {
return MSubdirData(ctx, channel_context, channel, platform, url, caches, repodata_fn); return SubdirData(ctx, channel_context, channel, platform, url, caches, repodata_fn);
} }
catch (std::exception& e) catch (std::exception& e)
{ {
@ -427,17 +427,17 @@ namespace mamba
} }
} }
bool MSubdirData::is_noarch() const bool SubdirData::is_noarch() const
{ {
return m_is_noarch; return m_is_noarch;
} }
bool MSubdirData::is_loaded() const bool SubdirData::is_loaded() const
{ {
return m_loaded; return m_loaded;
} }
void MSubdirData::clear_cache() void SubdirData::clear_cache()
{ {
if (fs::is_regular_file(m_json_fn)) if (fs::is_regular_file(m_json_fn))
{ {
@ -449,17 +449,17 @@ namespace mamba
} }
} }
const std::string& MSubdirData::name() const const std::string& SubdirData::name() const
{ {
return m_name; return m_name;
} }
const MSubdirMetadata& MSubdirData::metadata() const const SubdirMetadata& SubdirData::metadata() const
{ {
return m_metadata; return m_metadata;
} }
expected_t<fs::u8path> MSubdirData::valid_solv_cache() const expected_t<fs::u8path> SubdirData::valid_solv_cache() const
{ {
if (m_json_cache_valid && m_solv_cache_valid) if (m_json_cache_valid && m_solv_cache_valid)
{ {
@ -468,12 +468,12 @@ namespace mamba
return make_unexpected("Cache not loaded", mamba_error_code::cache_not_loaded); return make_unexpected("Cache not loaded", mamba_error_code::cache_not_loaded);
} }
fs::u8path MSubdirData::writable_solv_cache() const fs::u8path SubdirData::writable_solv_cache() const
{ {
return m_writable_pkgs_dir / "cache" / m_solv_fn; return m_writable_pkgs_dir / "cache" / m_solv_fn;
} }
expected_t<fs::u8path> MSubdirData::valid_json_cache() const expected_t<fs::u8path> SubdirData::valid_json_cache() const
{ {
if (m_json_cache_valid) if (m_json_cache_valid)
{ {
@ -482,7 +482,7 @@ namespace mamba
return make_unexpected("Cache not loaded", mamba_error_code::cache_not_loaded); return make_unexpected("Cache not loaded", mamba_error_code::cache_not_loaded);
} }
expected_t<std::string> MSubdirData::cache_path() const expected_t<std::string> SubdirData::cache_path() const
{ {
// TODO invalidate solv cache on version updates!! // TODO invalidate solv cache on version updates!!
if (m_json_cache_valid && m_solv_cache_valid) if (m_json_cache_valid && m_solv_cache_valid)
@ -496,8 +496,8 @@ namespace mamba
return make_unexpected("Cache not loaded", mamba_error_code::cache_not_loaded); return make_unexpected("Cache not loaded", mamba_error_code::cache_not_loaded);
} }
expected_t<void> MSubdirData::download_indexes( expected_t<void> SubdirData::download_indexes(
std::vector<MSubdirData>& subdirs, std::vector<SubdirData>& subdirs,
const Context& context, const Context& context,
DownloadMonitor* check_monitor, DownloadMonitor* check_monitor,
DownloadMonitor* download_monitor DownloadMonitor* download_monitor
@ -544,7 +544,7 @@ namespace mamba
return expected_t<void>(); return expected_t<void>();
} }
MSubdirData::MSubdirData( SubdirData::SubdirData(
Context& ctx, Context& ctx,
ChannelContext& channel_context, ChannelContext& channel_context,
const specs::Channel& channel, const specs::Channel& channel,
@ -566,11 +566,8 @@ namespace mamba
load(caches, channel_context, channel); load(caches, channel_context, channel);
} }
void MSubdirData::load( void
MultiPackageCache& caches, SubdirData::load(MultiPackageCache& caches, ChannelContext& channel_context, const specs::Channel& channel)
ChannelContext& channel_context,
const specs::Channel& channel
)
{ {
if (!forbid_cache(m_repodata_url)) if (!forbid_cache(m_repodata_url))
{ {
@ -593,7 +590,7 @@ namespace mamba
} }
} }
void MSubdirData::load_cache(MultiPackageCache& caches) void SubdirData::load_cache(MultiPackageCache& caches)
{ {
LOG_INFO << "Searching index cache file for repo '" << m_repodata_url << "'"; LOG_INFO << "Searching index cache file for repo '" << m_repodata_url << "'";
file_time_point now = fs::file_time_type::clock::now(); file_time_point now = fs::file_time_type::clock::now();
@ -617,7 +614,7 @@ namespace mamba
continue; continue;
} }
auto metadata_temp = MSubdirMetadata::read(json_file); auto metadata_temp = SubdirMetadata::read(json_file);
if (!metadata_temp.has_value()) if (!metadata_temp.has_value())
{ {
LOG_INFO << "Invalid json cache found, ignoring"; LOG_INFO << "Invalid json cache found, ignoring";
@ -674,7 +671,7 @@ namespace mamba
} }
void void
MSubdirData::update_metadata_zst(ChannelContext& channel_context, const specs::Channel& channel) SubdirData::update_metadata_zst(ChannelContext& channel_context, const specs::Channel& channel)
{ {
const Context& context = *p_context; const Context& context = *p_context;
if (!context.offline || forbid_cache(m_repodata_url)) if (!context.offline || forbid_cache(m_repodata_url))
@ -683,7 +680,7 @@ namespace mamba
} }
} }
MultiDownloadRequest MSubdirData::build_check_requests() MultiDownloadRequest SubdirData::build_check_requests()
{ {
MultiDownloadRequest request; MultiDownloadRequest request;
@ -723,7 +720,7 @@ namespace mamba
return request; return request;
} }
DownloadRequest MSubdirData::build_index_request() DownloadRequest SubdirData::build_index_request()
{ {
fs::u8path writable_cache_dir = create_cache_dir(m_writable_pkgs_dir); fs::u8path writable_cache_dir = create_cache_dir(m_writable_pkgs_dir);
auto lock = LockFile(writable_cache_dir); auto lock = LockFile(writable_cache_dir);
@ -749,10 +746,10 @@ namespace mamba
} }
else else
{ {
return finalize_transfer(MSubdirMetadata::HttpMetadata{ success.transfer.effective_url, return finalize_transfer(SubdirMetadata::HttpMetadata{ success.transfer.effective_url,
success.etag, success.etag,
success.last_modified, success.last_modified,
success.cache_control }); success.cache_control });
} }
}; };
@ -777,7 +774,7 @@ namespace mamba
return request; return request;
} }
expected_t<void> MSubdirData::use_existing_cache() expected_t<void> SubdirData::use_existing_cache()
{ {
LOG_INFO << "Cache is still valid"; LOG_INFO << "Cache is still valid";
@ -825,7 +822,7 @@ namespace mamba
return expected_t<void>(); return expected_t<void>();
} }
expected_t<void> MSubdirData::finalize_transfer(MSubdirMetadata::HttpMetadata http_data) expected_t<void> SubdirData::finalize_transfer(SubdirMetadata::HttpMetadata http_data)
{ {
if (m_writable_pkgs_dir.empty()) if (m_writable_pkgs_dir.empty())
{ {
@ -871,8 +868,7 @@ namespace mamba
return expected_t<void>(); return expected_t<void>();
} }
void void SubdirData::refresh_last_write_time(const fs::u8path& json_file, const fs::u8path& solv_file)
MSubdirData::refresh_last_write_time(const fs::u8path& json_file, const fs::u8path& solv_file)
{ {
const auto now = fs::file_time_type::clock::now(); const auto now = fs::file_time_type::clock::now();

14
libmamba/tests/src/core/test_cpp.cpp
View File

@ -352,7 +352,7 @@ namespace mamba
TEST_CASE("parse_last_modified_etag") TEST_CASE("parse_last_modified_etag")
{ {
fs::u8path cache_folder = fs::u8path{ mambatests::test_data_dir / "repodata_json_cache" }; fs::u8path cache_folder = fs::u8path{ mambatests::test_data_dir / "repodata_json_cache" };
auto mq = MSubdirMetadata::read(cache_folder / "test_1.json"); auto mq = SubdirMetadata::read(cache_folder / "test_1.json");
CHECK(mq.has_value()); CHECK(mq.has_value());
auto j = mq.value(); auto j = mq.value();
CHECK_EQ(j.last_modified(), "Fri, 11 Feb 2022 13:52:44 GMT"); CHECK_EQ(j.last_modified(), "Fri, 11 Feb 2022 13:52:44 GMT");
@ -361,21 +361,21 @@ namespace mamba
"file:///Users/wolfvollprecht/Programs/mamba/mamba/tests/channel_a/linux-64/repodata.json" "file:///Users/wolfvollprecht/Programs/mamba/mamba/tests/channel_a/linux-64/repodata.json"
); );
j = MSubdirMetadata::read(cache_folder / "test_2.json").value(); j = SubdirMetadata::read(cache_folder / "test_2.json").value();
CHECK_EQ(j.last_modified(), "Fri, 11 Feb 2022 13:52:44 GMT"); CHECK_EQ(j.last_modified(), "Fri, 11 Feb 2022 13:52:44 GMT");
CHECK_EQ( CHECK_EQ(
j.url(), j.url(),
"file:///Users/wolfvollprecht/Programs/mamba/mamba/tests/channel_a/linux-64/repodata.json" "file:///Users/wolfvollprecht/Programs/mamba/mamba/tests/channel_a/linux-64/repodata.json"
); );
j = MSubdirMetadata::read(cache_folder / "test_5.json").value(); j = SubdirMetadata::read(cache_folder / "test_5.json").value();
CHECK_EQ(j.last_modified(), "Fri, 11 Feb 2022 13:52:44 GMT"); CHECK_EQ(j.last_modified(), "Fri, 11 Feb 2022 13:52:44 GMT");
CHECK_EQ( CHECK_EQ(
j.url(), j.url(),
"file:///Users/wolfvollprecht/Programs/mamba/mamba/tests/channel_a/linux-64/repodata.json" "file:///Users/wolfvollprecht/Programs/mamba/mamba/tests/channel_a/linux-64/repodata.json"
); );
j = MSubdirMetadata::read(cache_folder / "test_4.json").value(); j = SubdirMetadata::read(cache_folder / "test_4.json").value();
CHECK_EQ(j.cache_control(), "{{}}\",,,\""); CHECK_EQ(j.cache_control(), "{{}}\",,,\"");
CHECK_EQ(j.etag(), "\n\n\"\"randome ecx,,ssd\n,,\""); CHECK_EQ(j.etag(), "\n\n\"\"randome ecx,,ssd\n,,\"");
CHECK_EQ(j.last_modified(), "Fri, 11 Feb 2022 13:52:44 GMT"); CHECK_EQ(j.last_modified(), "Fri, 11 Feb 2022 13:52:44 GMT");
@ -384,10 +384,10 @@ namespace mamba
"file:///Users/wolfvollprecht/Programs/mamba/mamba/tests/channel_a/linux-64/repodata.json" "file:///Users/wolfvollprecht/Programs/mamba/mamba/tests/channel_a/linux-64/repodata.json"
); );
mq = MSubdirMetadata::read(cache_folder / "test_3.json"); mq = SubdirMetadata::read(cache_folder / "test_3.json");
CHECK(mq.has_value() == false); CHECK(mq.has_value() == false);
j = MSubdirMetadata::read(cache_folder / "test_6.json").value(); j = SubdirMetadata::read(cache_folder / "test_6.json").value();
CHECK_EQ(j.last_modified(), "Thu, 02 Apr 2020 20:21:27 GMT"); CHECK_EQ(j.last_modified(), "Thu, 02 Apr 2020 20:21:27 GMT");
CHECK_EQ(j.url(), "https://conda.anaconda.org/intake/osx-arm64"); CHECK_EQ(j.url(), "https://conda.anaconda.org/intake/osx-arm64");
@ -420,7 +420,7 @@ namespace mamba
ofs << jstate.dump(4); ofs << jstate.dump(4);
} }
j = MSubdirMetadata::read(cache_folder / "test_7.json").value(); j = SubdirMetadata::read(cache_folder / "test_7.json").value();
CHECK_EQ(j.cache_control(), "something"); CHECK_EQ(j.cache_control(), "something");
CHECK_EQ(j.etag(), "something else"); CHECK_EQ(j.etag(), "something else");
CHECK_EQ(j.last_modified(), "Fri, 11 Feb 2022 13:52:44 GMT"); CHECK_EQ(j.last_modified(), "Fri, 11 Feb 2022 13:52:44 GMT");

6
libmamba/tests/src/core/test_satisfiability_error.cpp
View File

@ -337,14 +337,14 @@ namespace
auto auto
load_channels(Context& ctx, MPool& pool, MultiPackageCache& cache, std::vector<std::string>&& channels) load_channels(Context& ctx, MPool& pool, MultiPackageCache& cache, std::vector<std::string>&& channels)
{ {
auto sub_dirs = std::vector<MSubdirData>(); auto sub_dirs = std::vector<SubdirData>();
for (const auto& location : channels) for (const auto& location : channels)
{ {
for (const auto& chan : pool.channel_context().make_channel(location)) for (const auto& chan : pool.channel_context().make_channel(location))
{ {
for (const auto& platform : chan.platforms()) for (const auto& platform : chan.platforms())
{ {
auto sub_dir = expected_value_or_throw(MSubdirData::create( auto sub_dir = expected_value_or_throw(SubdirData::create(
ctx, ctx,
pool.channel_context(), pool.channel_context(),
chan, chan,
@ -357,7 +357,7 @@ namespace
} }
} }
MSubdirData::download_indexes(sub_dirs, mambatests::context()); SubdirData::download_indexes(sub_dirs, mambatests::context());
for (auto& sub_dir : sub_dirs) for (auto& sub_dir : sub_dirs)
{ {

27
libmambapy/src/libmambapy/bindings/legacy.cpp
View File

@ -176,7 +176,7 @@ namespace mambapy
struct Entry struct Entry
{ {
mamba::MSubdirData* p_subdirdata = nullptr; mamba::SubdirData* p_subdirdata = nullptr;
std::string m_platform = ""; std::string m_platform = "";
const mamba::specs::Channel* p_channel = nullptr; const mamba::specs::Channel* p_channel = nullptr;
std::string m_url = ""; std::string m_url = "";
@ -198,7 +198,7 @@ namespace mambapy
{ {
using namespace mamba; using namespace mamba;
m_subdirs.push_back(extract( m_subdirs.push_back(extract(
MSubdirData::create(ctx, channel_context, channel, platform, full_url, caches, repodata_fn) SubdirData::create(ctx, channel_context, channel, platform, full_url, caches, repodata_fn)
)); ));
m_entries.push_back({ nullptr, platform, &channel, url }); m_entries.push_back({ nullptr, platform, &channel, url });
for (size_t i = 0; i < m_subdirs.size(); ++i) for (size_t i = 0; i < m_subdirs.size(); ++i)
@ -218,16 +218,11 @@ namespace mambapy
{ {
SubdirDataMonitor check_monitor({ true, true }); SubdirDataMonitor check_monitor({ true, true });
SubdirDataMonitor index_monitor; SubdirDataMonitor index_monitor;
download_res = MSubdirData::download_indexes( download_res = SubdirData::download_indexes(m_subdirs, ctx, &check_monitor, &index_monitor);
m_subdirs,
ctx,
&check_monitor,
&index_monitor
);
} }
else else
{ {
download_res = MSubdirData::download_indexes(m_subdirs, ctx); download_res = SubdirData::download_indexes(m_subdirs, ctx);
} }
return download_res.has_value(); return download_res.has_value();
} }
@ -254,7 +249,7 @@ namespace mambapy
private: private:
std::vector<mamba::MSubdirData> m_subdirs; std::vector<mamba::SubdirData> m_subdirs;
entry_list m_entries; entry_list m_entries;
}; };
} }
@ -697,20 +692,20 @@ bind_submodule_impl(pybind11::module_ m)
} }
); );
py::class_<MSubdirData>(m, "SubdirData") py::class_<SubdirData>(m, "SubdirData")
.def( .def(
"create_repo", "create_repo",
[](MSubdirData& subdir, MPool& pool) -> solver::libsolv::RepoInfo [](SubdirData& subdir, MPool& pool) -> solver::libsolv::RepoInfo
{ {
deprecated("Use `load_subdir_in_pool` instead", "2.0"); deprecated("Use `load_subdir_in_pool` instead", "2.0");
return extract(load_subdir_in_pool(mambapy::singletons.context(), pool, subdir)); return extract(load_subdir_in_pool(mambapy::singletons.context(), pool, subdir));
} }
) )
.def("loaded", &MSubdirData::is_loaded) .def("loaded", &SubdirData::is_loaded)
.def( .def(
"valid_solv_cache", "valid_solv_cache",
// TODO make a proper well tested type caster for expected types. // TODO make a proper well tested type caster for expected types.
[](const MSubdirData& self) -> std::optional<fs::u8path> [](const SubdirData& self) -> std::optional<fs::u8path>
{ {
if (auto f = self.valid_solv_cache()) if (auto f = self.valid_solv_cache())
{ {
@ -721,7 +716,7 @@ bind_submodule_impl(pybind11::module_ m)
) )
.def( .def(
"valid_json_cache", "valid_json_cache",
[](const MSubdirData& self) -> std::optional<fs::u8path> [](const SubdirData& self) -> std::optional<fs::u8path>
{ {
if (auto f = self.valid_json_cache()) if (auto f = self.valid_json_cache())
{ {
@ -732,7 +727,7 @@ bind_submodule_impl(pybind11::module_ m)
) )
.def( .def(
"cache_path", "cache_path",
[](const MSubdirData& self) -> std::string [](const SubdirData& self) -> std::string
{ {
deprecated( deprecated(
"Use `SubdirData.valid_solv_path` or `SubdirData.valid_json` path instead", "Use `SubdirData.valid_solv_path` or `SubdirData.valid_json` path instead",