qwjyh/xdbm
1
1
Fork 0
mirror of https://github.com/qwjyh/xdbm synced 2025-06-26 17:59:20 +09:00
Code Issues Projects Releases 1 Packages Wiki Activity

implement sync subcommand (#21)

Browse source 
* new(sync): implement sync subcommand (WIP)

TODO
- update CHANGELOG
- refactor sync func

* fix(sync): add pull (only fast forward)

* update(test): use sync command

The first sync from 2nd device didn't work, maybe due to that it is the
first push.

* refactor: separate push and pull to funcs

* refactor: change merge analysis match order

* refactor: add logs

* update: CHANGELOG

* fix: CHANGELOG was wrong
This commit is contained in:
qwjyh 2025-02-27 02:56:39 +09:00 • committed by GitHub
parent 47b3a5e69d
commit bd8e2019fe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 340 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

62
tests/cli.rs
View file

@ -2,6 +2,7 @@ mod integrated_test {
use std::{
fs::{self, DirBuilder, File},
io::{self, BufWriter, Write},
path,
};
use anyhow::{anyhow, Context, Ok, Result};
@ -72,6 +73,16 @@ mod integrated_test {
Ok(())
}
fn run_sync_cmd(config_dir: &path::Path) -> Result<()> {
Command::cargo_bin("xdbm")?
.arg("-c")
.arg(config_dir)
.args(["sync", "-vvvv"])
.assert()
.success();
Ok(())
}
#[test]
fn single_device() -> Result<()> {
let config_dir = assert_fs::TempDir::new()?;
@ -313,15 +324,14 @@ mod integrated_test {
assert!(config_dir_2.join("backups").join("second.yml").exists());
// sync
std::process::Command::new("git")
.arg("push")
.current_dir(&config_dir_2)
Command::cargo_bin("xdbm")?
.arg("-c")
.arg(config_dir_2.path())
.arg("sync")
.arg("-vvvv")
.assert()
.success();
// let repo_2 = Repository::open(config_dir_2)?;
// // return Err(anyhow!("{:?}", repo_2.remotes()?.iter().collect::<Vec<_>>()));
// let mut repo_2_remote = repo_2.find_remote(repo_2.remotes()?.get(0).unwrap())?;
// repo_2_remote.push(&[] as &[&str], None)?;
.success()
.stderr(predicate::str::contains("successfully pushed"));
std::process::Command::new("git")
.arg("pull")
.current_dir(&config_dir_1)
@ -381,16 +391,8 @@ mod integrated_test {
std::fs::read_to_string(config_dir_1.join("storages.yml"))?.contains("parent: gdrive1")
);
std::process::Command::new("git")
.arg("push")
.current_dir(&config_dir_1)
.assert()
.success();
std::process::Command::new("git")
.arg("pull")
.current_dir(&config_dir_2)
.assert()
.success();
run_sync_cmd(&config_dir_1)?;
run_sync_cmd(&config_dir_2)?;
// bind
//
@ -604,16 +606,8 @@ mod integrated_test {
.and(predicate::str::contains("foodoc").not()),
);
std::process::Command::new("git")
.arg("push")
.current_dir(&config_dir_2)
.assert()
.success();
std::process::Command::new("git")
.arg("pull")
.current_dir(&config_dir_1)
.assert()
.success();
run_sync_cmd(&config_dir_2)?;
run_sync_cmd(&config_dir_1)?;
// bind
//
@ -728,16 +722,8 @@ mod integrated_test {
.assert()
.success();
std::process::Command::new("git")
.arg("push")
.current_dir(&config_dir_1)
.assert()
.success();
std::process::Command::new("git")
.arg("pull")
.current_dir(&config_dir_2)
.assert()
.success();
run_sync_cmd(&config_dir_1)?;
run_sync_cmd(&config_dir_2)?;
// backup add
//