From aee17b68b2b213553cd06406a3a5713ec91f374d Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Fri, 23 Jan 2026 06:01:58 +0800 Subject: Fix typo in legacy_json_output module name --- src/bin/jv.rs | 2 +- src/leegacy_json_output.rs | 7 ------ src/leegacy_json_output/accounts.rs | 15 ------------- src/leegacy_json_output/align.rs | 17 --------------- src/leegacy_json_output/analyzer_result.rs | 35 ------------------------------ src/leegacy_json_output/here.rs | 21 ------------------ src/leegacy_json_output/info.rs | 24 -------------------- src/leegacy_json_output/share.rs | 32 --------------------------- src/leegacy_json_output/sheets.rs | 16 -------------- src/legacy_json_output.rs | 7 ++++++ src/legacy_json_output/accounts.rs | 15 +++++++++++++ src/legacy_json_output/align.rs | 17 +++++++++++++++ src/legacy_json_output/analyzer_result.rs | 35 ++++++++++++++++++++++++++++++ src/legacy_json_output/here.rs | 21 ++++++++++++++++++ src/legacy_json_output/info.rs | 24 ++++++++++++++++++++ src/legacy_json_output/share.rs | 32 +++++++++++++++++++++++++++ src/legacy_json_output/sheets.rs | 16 ++++++++++++++ src/lib.rs | 2 +- 18 files changed, 169 insertions(+), 169 deletions(-) delete mode 100644 src/leegacy_json_output.rs delete mode 100644 src/leegacy_json_output/accounts.rs delete mode 100644 src/leegacy_json_output/align.rs delete mode 100644 src/leegacy_json_output/analyzer_result.rs delete mode 100644 src/leegacy_json_output/here.rs delete mode 100644 src/leegacy_json_output/info.rs delete mode 100644 src/leegacy_json_output/share.rs delete mode 100644 src/leegacy_json_output/sheets.rs create mode 100644 src/legacy_json_output.rs create mode 100644 src/legacy_json_output/accounts.rs create mode 100644 src/legacy_json_output/align.rs create mode 100644 src/legacy_json_output/analyzer_result.rs create mode 100644 src/legacy_json_output/here.rs create mode 100644 src/legacy_json_output/info.rs create mode 100644 src/legacy_json_output/share.rs create mode 100644 src/legacy_json_output/sheets.rs diff --git a/src/bin/jv.rs b/src/bin/jv.rs index 5089273..a0de5a8 100644 --- a/src/bin/jv.rs +++ b/src/bin/jv.rs @@ -98,7 +98,7 @@ use just_enough_vcs_cli::{ compile_info::CompileInfo, ipaddress_history::{get_recent_ip_address, insert_recent_ip_address}, }, - leegacy_json_output::{ + legacy_json_output::{ accounts::{AccountItem, AccountListJsonResult}, align::{AlignJsonResult, AlignTaskMapping}, analyzer_result::{AnalyzerJsonResult, ModifiedItem, ModifiedType, MovedItem}, diff --git a/src/leegacy_json_output.rs b/src/leegacy_json_output.rs deleted file mode 100644 index 88802a4..0000000 --- a/src/leegacy_json_output.rs +++ /dev/null @@ -1,7 +0,0 @@ -pub mod accounts; -pub mod align; -pub mod analyzer_result; -pub mod here; -pub mod info; -pub mod share; -pub mod sheets; diff --git a/src/leegacy_json_output/accounts.rs b/src/leegacy_json_output/accounts.rs deleted file mode 100644 index d29539a..0000000 --- a/src/leegacy_json_output/accounts.rs +++ /dev/null @@ -1,15 +0,0 @@ -use just_enough_vcs::vcs::data::member::MemberId; -use serde::{Deserialize, Serialize}; -use std::collections::HashMap; - -#[derive(Debug, Default, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct AccountListJsonResult { - pub result: HashMap, -} - -#[derive(Debug, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct AccountItem { - pub has_private_key: bool, -} diff --git a/src/leegacy_json_output/align.rs b/src/leegacy_json_output/align.rs deleted file mode 100644 index 2c6bfc4..0000000 --- a/src/leegacy_json_output/align.rs +++ /dev/null @@ -1,17 +0,0 @@ -use std::{collections::HashMap, path::PathBuf}; - -use just_enough_vcs::vcs::data::local::align_tasks::AlignTaskName; -use serde::{Deserialize, Serialize}; - -#[derive(Debug, Default, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct AlignJsonResult { - pub align_tasks: HashMap, -} - -#[derive(Debug, Default, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct AlignTaskMapping { - pub local_mapping: PathBuf, - pub remote_mapping: PathBuf, -} diff --git a/src/leegacy_json_output/analyzer_result.rs b/src/leegacy_json_output/analyzer_result.rs deleted file mode 100644 index bb6af56..0000000 --- a/src/leegacy_json_output/analyzer_result.rs +++ /dev/null @@ -1,35 +0,0 @@ -use std::path::PathBuf; - -use serde::{Deserialize, Serialize}; - -#[derive(Debug, Default, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct AnalyzerJsonResult { - pub created: Vec, - pub lost: Vec, - pub erased: Vec, - pub moved: Vec, - pub modified: Vec, -} - -#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Hash)] -#[serde(rename_all = "PascalCase")] -pub enum ModifiedType { - Modified, - ModifiedButBaseVersionMismatch, - ModifiedButNotHeld, -} - -#[derive(Debug, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct MovedItem { - pub from: PathBuf, - pub to: PathBuf, -} - -#[derive(Debug, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct ModifiedItem { - pub path: PathBuf, - pub modification_type: ModifiedType, -} diff --git a/src/leegacy_json_output/here.rs b/src/leegacy_json_output/here.rs deleted file mode 100644 index 178a467..0000000 --- a/src/leegacy_json_output/here.rs +++ /dev/null @@ -1,21 +0,0 @@ -use just_enough_vcs::vcs::data::{member::MemberId, vault::virtual_file::VirtualFileVersion}; -use serde::{Deserialize, Serialize}; - -#[derive(Debug, Default, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct HereJsonResult { - pub items: Vec, -} - -#[derive(Debug, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct HereJsonResultItem { - pub mapping: String, - pub name: String, - pub current_version: VirtualFileVersion, - pub size: usize, - pub is_dir: bool, - pub exist: bool, - pub modified: bool, - pub holder: MemberId, -} diff --git a/src/leegacy_json_output/info.rs b/src/leegacy_json_output/info.rs deleted file mode 100644 index 8948980..0000000 --- a/src/leegacy_json_output/info.rs +++ /dev/null @@ -1,24 +0,0 @@ -use just_enough_vcs::vcs::data::{ - member::MemberId, - vault::virtual_file::{VirtualFileId, VirtualFileVersion}, -}; -use serde::{Deserialize, Serialize}; - -#[derive(Debug, Default, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct InfoJsonResult { - pub mapping: String, - pub in_ref: String, - pub vfid: VirtualFileId, - pub histories: Vec, -} - -#[derive(Debug, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct InfoHistory { - pub version: VirtualFileVersion, - pub version_creator: MemberId, - pub version_description: String, - pub is_current_version: bool, - pub is_ref_version: bool, -} diff --git a/src/leegacy_json_output/share.rs b/src/leegacy_json_output/share.rs deleted file mode 100644 index 53282ea..0000000 --- a/src/leegacy_json_output/share.rs +++ /dev/null @@ -1,32 +0,0 @@ -use std::collections::HashMap; - -use just_enough_vcs::vcs::data::{ - member::MemberId, - sheet::{SheetMappingMetadata, SheetPathBuf}, - vault::mapping_share::SheetShareId, -}; -use serde::{Deserialize, Serialize}; - -#[derive(Debug, Default, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct ShareListResult { - pub share_list: Vec, -} - -#[derive(Debug, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct ShareItem { - pub share_id: SheetShareId, - pub sharer: MemberId, - pub description: String, - pub file_count: usize, -} - -#[derive(Debug, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct SeeShareResult { - pub share_id: SheetShareId, - pub sharer: MemberId, - pub description: String, - pub mappings: HashMap, -} diff --git a/src/leegacy_json_output/sheets.rs b/src/leegacy_json_output/sheets.rs deleted file mode 100644 index 2dc0c81..0000000 --- a/src/leegacy_json_output/sheets.rs +++ /dev/null @@ -1,16 +0,0 @@ -use just_enough_vcs::vcs::data::member::MemberId; -use serde::{Deserialize, Serialize}; - -#[derive(Debug, Default, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct SheetListJsonResult { - pub my_sheets: Vec, - pub reference_sheets: Vec, - pub other_sheets: Vec, -} -#[derive(Debug, Serialize, Deserialize)] -#[serde(rename_all = "PascalCase")] -pub struct SheetItem { - pub name: String, - pub holder: MemberId, -} diff --git a/src/legacy_json_output.rs b/src/legacy_json_output.rs new file mode 100644 index 0000000..88802a4 --- /dev/null +++ b/src/legacy_json_output.rs @@ -0,0 +1,7 @@ +pub mod accounts; +pub mod align; +pub mod analyzer_result; +pub mod here; +pub mod info; +pub mod share; +pub mod sheets; diff --git a/src/legacy_json_output/accounts.rs b/src/legacy_json_output/accounts.rs new file mode 100644 index 0000000..d29539a --- /dev/null +++ b/src/legacy_json_output/accounts.rs @@ -0,0 +1,15 @@ +use just_enough_vcs::vcs::data::member::MemberId; +use serde::{Deserialize, Serialize}; +use std::collections::HashMap; + +#[derive(Debug, Default, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct AccountListJsonResult { + pub result: HashMap, +} + +#[derive(Debug, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct AccountItem { + pub has_private_key: bool, +} diff --git a/src/legacy_json_output/align.rs b/src/legacy_json_output/align.rs new file mode 100644 index 0000000..2c6bfc4 --- /dev/null +++ b/src/legacy_json_output/align.rs @@ -0,0 +1,17 @@ +use std::{collections::HashMap, path::PathBuf}; + +use just_enough_vcs::vcs::data::local::align_tasks::AlignTaskName; +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Default, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct AlignJsonResult { + pub align_tasks: HashMap, +} + +#[derive(Debug, Default, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct AlignTaskMapping { + pub local_mapping: PathBuf, + pub remote_mapping: PathBuf, +} diff --git a/src/legacy_json_output/analyzer_result.rs b/src/legacy_json_output/analyzer_result.rs new file mode 100644 index 0000000..bb6af56 --- /dev/null +++ b/src/legacy_json_output/analyzer_result.rs @@ -0,0 +1,35 @@ +use std::path::PathBuf; + +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Default, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct AnalyzerJsonResult { + pub created: Vec, + pub lost: Vec, + pub erased: Vec, + pub moved: Vec, + pub modified: Vec, +} + +#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Hash)] +#[serde(rename_all = "PascalCase")] +pub enum ModifiedType { + Modified, + ModifiedButBaseVersionMismatch, + ModifiedButNotHeld, +} + +#[derive(Debug, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct MovedItem { + pub from: PathBuf, + pub to: PathBuf, +} + +#[derive(Debug, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct ModifiedItem { + pub path: PathBuf, + pub modification_type: ModifiedType, +} diff --git a/src/legacy_json_output/here.rs b/src/legacy_json_output/here.rs new file mode 100644 index 0000000..178a467 --- /dev/null +++ b/src/legacy_json_output/here.rs @@ -0,0 +1,21 @@ +use just_enough_vcs::vcs::data::{member::MemberId, vault::virtual_file::VirtualFileVersion}; +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Default, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct HereJsonResult { + pub items: Vec, +} + +#[derive(Debug, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct HereJsonResultItem { + pub mapping: String, + pub name: String, + pub current_version: VirtualFileVersion, + pub size: usize, + pub is_dir: bool, + pub exist: bool, + pub modified: bool, + pub holder: MemberId, +} diff --git a/src/legacy_json_output/info.rs b/src/legacy_json_output/info.rs new file mode 100644 index 0000000..8948980 --- /dev/null +++ b/src/legacy_json_output/info.rs @@ -0,0 +1,24 @@ +use just_enough_vcs::vcs::data::{ + member::MemberId, + vault::virtual_file::{VirtualFileId, VirtualFileVersion}, +}; +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Default, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct InfoJsonResult { + pub mapping: String, + pub in_ref: String, + pub vfid: VirtualFileId, + pub histories: Vec, +} + +#[derive(Debug, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct InfoHistory { + pub version: VirtualFileVersion, + pub version_creator: MemberId, + pub version_description: String, + pub is_current_version: bool, + pub is_ref_version: bool, +} diff --git a/src/legacy_json_output/share.rs b/src/legacy_json_output/share.rs new file mode 100644 index 0000000..53282ea --- /dev/null +++ b/src/legacy_json_output/share.rs @@ -0,0 +1,32 @@ +use std::collections::HashMap; + +use just_enough_vcs::vcs::data::{ + member::MemberId, + sheet::{SheetMappingMetadata, SheetPathBuf}, + vault::mapping_share::SheetShareId, +}; +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Default, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct ShareListResult { + pub share_list: Vec, +} + +#[derive(Debug, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct ShareItem { + pub share_id: SheetShareId, + pub sharer: MemberId, + pub description: String, + pub file_count: usize, +} + +#[derive(Debug, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct SeeShareResult { + pub share_id: SheetShareId, + pub sharer: MemberId, + pub description: String, + pub mappings: HashMap, +} diff --git a/src/legacy_json_output/sheets.rs b/src/legacy_json_output/sheets.rs new file mode 100644 index 0000000..2dc0c81 --- /dev/null +++ b/src/legacy_json_output/sheets.rs @@ -0,0 +1,16 @@ +use just_enough_vcs::vcs::data::member::MemberId; +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Default, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct SheetListJsonResult { + pub my_sheets: Vec, + pub reference_sheets: Vec, + pub other_sheets: Vec, +} +#[derive(Debug, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct SheetItem { + pub name: String, + pub holder: MemberId, +} diff --git a/src/lib.rs b/src/lib.rs index bc86288..2e44cbe 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,7 +7,7 @@ pub mod utils; pub mod data; /// Json Format -pub mod leegacy_json_output; +pub mod legacy_json_output; /// Systems pub mod systems; -- cgit