From 3a29113e965a94bdef06655f1583cc6e86edd606 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Thu, 21 Dec 2023 23:57:42 +0100 Subject: rework import system pt. 1 --- base/Cargo.toml | 1 + base/src/database.rs | 3 +++ base/src/federation.rs | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ base/src/lib.rs | 2 ++ 4 files changed, 67 insertions(+) create mode 100644 base/src/federation.rs (limited to 'base') diff --git a/base/Cargo.toml b/base/Cargo.toml index ac6989c..8109998 100644 --- a/base/Cargo.toml +++ b/base/Cargo.toml @@ -5,6 +5,7 @@ edition = "2021" [dependencies] jellycommon = { path = "../common" } +jellyclient = { path = "../client" } serde = { version = "1.0.193", features = ["derive"] } serde_yaml = "0.9.27" log = { workspace = true } diff --git a/base/src/database.rs b/base/src/database.rs index f46f0fb..3f81cca 100644 --- a/base/src/database.rs +++ b/base/src/database.rs @@ -22,6 +22,8 @@ pub struct Database { pub user_node: Tree<(String, String), NodeUserData>, pub invite: Tree, pub node: Tree, + + pub node_import: Tree, Node)>>, } impl Database { @@ -34,6 +36,7 @@ impl Database { invite: Tree::open(&db, "invite"), node: Tree::open(&db, "node"), user_node: Tree::open(&db, "user_node"), + node_import: Tree::open(&db, "node_import"), db, }); info!("ready"); diff --git a/base/src/federation.rs b/base/src/federation.rs new file mode 100644 index 0000000..509b87c --- /dev/null +++ b/base/src/federation.rs @@ -0,0 +1,61 @@ +/* + This file is part of jellything (https://codeberg.org/metamuffin/jellything) + which is licensed under the GNU Affero General Public License (version 3); see /COPYING. + Copyright (C) 2023 metamuffin +*/ +use anyhow::anyhow; +use crate::CONF; +use jellyclient::{Instance, LoginDetails, Session}; +use std::{collections::HashMap, sync::Arc}; +use tokio::sync::RwLock; + +pub struct Federation { + instances: HashMap, + sessions: RwLock>>, +} + +impl Federation { + pub fn initialize() -> Self { + let instances = CONF + .remote_credentials + .iter() + .map(|(k, (_, _, tls))| (k.to_owned(), Instance::new(k.to_owned(), *tls))) + .collect::>(); + + Self { + instances, + sessions: Default::default(), + } + } + + pub fn get_instance(&self, host: &String) -> anyhow::Result<&Instance> { + Ok(self + .instances + .get(host) + .ok_or(anyhow!("unknown instance"))?) + } + pub async fn get_session(&self, host: &String) -> anyhow::Result> { + let mut w = self.sessions.write().await; + if let Some(s) = w.get(host) { + Ok(s.to_owned()) + } else { + let (username, password, _) = CONF + .remote_credentials + .get(host) + .ok_or(anyhow!("no credentials of the remote server"))?; + let s = Arc::new( + self.get_instance(host)? + .to_owned() + .login(LoginDetails { + username: username.to_owned(), + password: password.to_owned(), + expire: None, + drop_permissions: None, + }) + .await?, + ); + w.insert(host.to_owned(), s.clone()); + Ok(s) + } + } +} diff --git a/base/src/lib.rs b/base/src/lib.rs index cfc5a11..a7b15c5 100644 --- a/base/src/lib.rs +++ b/base/src/lib.rs @@ -6,6 +6,7 @@ #![feature(lazy_cell)] pub mod cache; pub mod database; +pub mod federation; pub mod permission; pub mod temp; @@ -34,6 +35,7 @@ impl AssetLocationExt for AssetLocation { AssetLocation::Cache(p) => CONF.cache_path.join(p), AssetLocation::Library(p) => CONF.library_path.join(p), AssetLocation::Temp(p) => CONF.temp_path.join(p), + AssetLocation::Media(p) => CONF.media_path.join(p), } } } -- cgit v1.2.3-70-g09d2