PeachCloud/peach-workspace
3
2
Fork 1
Code Issues 17 Pull Requests 1 Projects Releases Wiki Activity

working version with yunohost

Browse Source
This commit is contained in:
notplants 2025-05-21 18:07:38 -04:00
parent 1439bb942f
commit 8501296ea1
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
peach-lib/src/sbot.rs
View File

@ -270,11 +270,11 @@ pub async fn init_sbot() -> Result<TildeClient, PeachError> {
}; };
debug!("Initialising an sbot client with configuration parameters"); debug!("Initialising an sbot client with configuration parameters");
let database_path = format!("{}/db.sqlite", config_manager::get_config_value("TILDE_SBOT_DATADIR")?);
let sbot_client = TildeClient { let sbot_client = TildeClient {
port: sbot_config.ssb_port, port: sbot_config.ssb_port,
tilde_binary_path: config_manager::get_config_value("TILDE_BINARY_PATH")?, tilde_binary_path: config_manager::get_config_value("TILDE_BINARY_PATH")?,
tilde_wrapper_path: config_manager::get_config_value("TILDE_WRAPPER_PATH")?, tilde_database_path: database_path,
tilde_config_path: config_manager::get_config_value("TILDE_CONFIG_PATH")?,
}; };
Ok(sbot_client) Ok(sbot_client)
} }

11
run-tilde-sbot.sh
View File

@ -5,14 +5,12 @@ set -e
# Usage check # Usage check
if [ "$#" -lt 2 ]; then if [ "$#" -lt 2 ]; then
echo "Usage: $0 <CONFIG_FILE> <TILDEFRIENDS_PATH> <ADDITIONAL ARGUMENTS>" echo "Usage: $0 <CONFIG_FILE> <TILDEFRIENDS_PATH>"
exit 1 exit 1
fi fi
CONFIG_FILE="$1" CONFIG_FILE="$1"
TILDEFRIENDS_PATH="$2" TILDEFRIENDS_PATH="$2"
shift 2
EXTRA_ARGS=("$@")
# Extract network_key (if it exists) # Extract network_key (if it exists)
@ -33,16 +31,11 @@ echo "ARGS: $ARGS"
[ -n "$NETWORK_KEY" ] && echo "NETWORK_KEY: $NETWORK_KEY" [ -n "$NETWORK_KEY" ] && echo "NETWORK_KEY: $NETWORK_KEY"
[ -n "$DATABASE_DIRECTORY" ] && echo "DATABASE_DIRECTORY: $DATABASE_DIRECTORY" [ -n "$DATABASE_DIRECTORY" ] && echo "DATABASE_DIRECTORY: $DATABASE_DIRECTORY"
CMD="\"$TILDEFRIENDS_PATH\"" CMD="\"$TILDEFRIENDS_PATH\" run"
[ -n "$ARGS" ] && CMD="$CMD -a \"$ARGS\"" [ -n "$ARGS" ] && CMD="$CMD -a \"$ARGS\""
[ -n "$NETWORK_KEY" ] && CMD="$CMD -k \"$NETWORK_KEY\"" [ -n "$NETWORK_KEY" ] && CMD="$CMD -k \"$NETWORK_KEY\""
[ -n "$DATABASE_DIRECTORY" ] && CMD="$CMD -d \"$DATABASE_DIRECTORY/db.sqlite\"" [ -n "$DATABASE_DIRECTORY" ] && CMD="$CMD -d \"$DATABASE_DIRECTORY/db.sqlite\""
# Append extra arguments
for ARG in "${EXTRA_ARGS[@]}"; do
CMD="$CMD \"$ARG\""
done
echo "Running command:" echo "Running command:"
echo "$CMD" echo "$CMD"

12
tilde-client/src/lib.rs
View File

@ -11,8 +11,7 @@ mod error;
pub struct TildeClient { pub struct TildeClient {
pub port: String, pub port: String,
pub tilde_binary_path: String, pub tilde_binary_path: String,
pub tilde_wrapper_path: String, pub tilde_database_path: String,
pub tilde_config_path: String,
} }
pub fn init_sbot() { pub fn init_sbot() {
println!("++ init sbot!"); println!("++ init sbot!");
@ -21,11 +20,10 @@ pub fn init_sbot() {
impl TildeClient { impl TildeClient {
pub fn run_tilde_command(&self, args: Vec<&str>) -> Result<String, TildeError> { pub fn run_tilde_command(&self, args: Vec<&str>) -> Result<String, TildeError> {
let mut command = Command::new(&self.tilde_wrapper_path); let mut command = Command::new(&self.tilde_binary_path);
// wrapper config_file binary_path <additional args let mut full_args = args.clone();
let mut full_args = vec![self.tilde_config_path.as_str(), self.tilde_binary_path.as_str()]; full_args.push("-d");
full_args.extend(args); full_args.push(self.tilde_database_path.as_str());
command.args(full_args); command.args(full_args);
let output = command let output = command
.output().map_err(|e| TildeError { .output().map_err(|e| TildeError {