re-add community marketplace and handle missing dependency (#2110)

* re-add community marketplace and handle missing dependency

* feat: Add in the community to migration

* chore: Add in the community marketplace_url update

* change var name to hidden

* chore: Add in the down

Co-authored-by: BluJ <mogulslayer@gmail.com>
This commit is contained in:
Matt Hill
2023-01-16 17:02:57 -07:00
committed by Aiden McClelland
parent 06cf83b901
commit 730a55e721
8 changed files with 142 additions and 39 deletions

View File

@@ -18,6 +18,7 @@ mod v0_3_1_2;
mod v0_3_2;
mod v0_3_2_1;
mod v0_3_3;
mod v0_3_3_1;
pub type Current = v0_3_3::Version;
@@ -34,6 +35,7 @@ enum Version {
V0_3_2(Wrapper<v0_3_2::Version>),
V0_3_2_1(Wrapper<v0_3_2_1::Version>),
V0_3_3(Wrapper<v0_3_3::Version>),
V0_3_3_1(Wrapper<v0_3_3_1::Version>),
Other(emver::Version),
}
@@ -59,6 +61,7 @@ impl Version {
Version::V0_3_2(Wrapper(x)) => x.semver(),
Version::V0_3_2_1(Wrapper(x)) => x.semver(),
Version::V0_3_3(Wrapper(x)) => x.semver(),
Version::V0_3_3_1(Wrapper(x)) => x.semver(),
Version::Other(x) => x.clone(),
}
}
@@ -195,6 +198,7 @@ pub async fn init<Db: DbHandle>(
Version::V0_3_2(v) => v.0.migrate_to(&Current::new(), db, receipts).await?,
Version::V0_3_2_1(v) => v.0.migrate_to(&Current::new(), db, receipts).await?,
Version::V0_3_3(v) => v.0.migrate_to(&Current::new(), db, receipts).await?,
Version::V0_3_3_1(v) => v.0.migrate_to(&Current::new(), db, receipts).await?,
Version::Other(_) => {
return Err(Error::new(
eyre!("Cannot downgrade"),
@@ -237,6 +241,7 @@ mod tests {
Just(Version::V0_3_2(Wrapper(v0_3_2::Version::new()))),
Just(Version::V0_3_2_1(Wrapper(v0_3_2_1::Version::new()))),
Just(Version::V0_3_3(Wrapper(v0_3_3::Version::new()))),
Just(Version::V0_3_3_1(Wrapper(v0_3_3_1::Version::new()))),
em_version().prop_map(Version::Other),
]
}

View File

@@ -0,0 +1,94 @@
use async_trait::async_trait;
use emver::VersionRange;
use serde_json::json;
use super::v0_3_0::V0_3_0_COMPAT;
use super::*;
const V0_3_3_1: emver::Version = emver::Version::new(0, 3, 3, 1);
const COMMUNITY_URL: &str = "https://community-registry.start9.com/";
const MAIN_REGISTRY: &str = "https://registry.start9.com/";
const COMMUNITY_SERVICES: &[&str] = &[
"ipfs",
"agora",
"lightning-jet",
"balanceofsatoshis",
"mastodon",
"lndg",
"robosats",
"thunderhub",
"syncthing",
"sphinx-relay",
];
#[derive(Clone, Debug)]
pub struct Version;
#[async_trait]
impl VersionT for Version {
type Previous = v0_3_3::Version;
fn new() -> Self {
Version
}
fn semver(&self) -> emver::Version {
V0_3_3_1
}
fn compat(&self) -> &'static VersionRange {
&*V0_3_0_COMPAT
}
async fn up<Db: DbHandle>(&self, db: &mut Db) -> Result<(), Error> {
let parsed_url = Some(COMMUNITY_URL.parse().unwrap());
let mut ui = crate::db::DatabaseModel::new().ui().get_mut(db).await?;
ui["marketplace"]["known-hosts"][COMMUNITY_URL] = json!({});
for package_id in crate::db::DatabaseModel::new()
.package_data()
.keys(db)
.await?
{
if !COMMUNITY_SERVICES.contains(&&*package_id.to_string()) {
continue;
}
crate::db::DatabaseModel::new()
.package_data()
.idx_model(&package_id)
.expect(db)
.await?
.installed()
.expect(db)
.await?
.marketplace_url()
.put(db, &parsed_url)
.await?;
}
Ok(())
}
async fn down<Db: DbHandle>(&self, db: &mut Db) -> Result<(), Error> {
let mut ui = crate::db::DatabaseModel::new().ui().get_mut(db).await?;
let parsed_url = Some(MAIN_REGISTRY.parse().unwrap());
for package_id in crate::db::DatabaseModel::new()
.package_data()
.keys(db)
.await?
{
if !COMMUNITY_SERVICES.contains(&&*package_id.to_string()) {
continue;
}
crate::db::DatabaseModel::new()
.package_data()
.idx_model(&package_id)
.expect(db)
.await?
.installed()
.expect(db)
.await?
.marketplace_url()
.put(db, &parsed_url)
.await?;
}
ui["marketplace"]["known-hosts"][COMMUNITY_URL].take();
ui.save(db).await?;
Ok(())
}
}