summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cmds/comp/workspace_sheet.rs7
-rw-r--r--src/legacy_json_output.rs7
-rw-r--r--src/legacy_json_output/accounts.rs15
-rw-r--r--src/legacy_json_output/align.rs17
-rw-r--r--src/legacy_json_output/analyzer_result.rs35
-rw-r--r--src/legacy_json_output/here.rs21
-rw-r--r--src/legacy_json_output/info.rs24
-rw-r--r--src/legacy_json_output/share.rs32
-rw-r--r--src/legacy_json_output/sheets.rs16
-rw-r--r--src/lib.rs3
10 files changed, 4 insertions, 173 deletions
diff --git a/src/cmds/comp/workspace_sheet.rs b/src/cmds/comp/workspace_sheet.rs
index 985fe43..89cd259 100644
--- a/src/cmds/comp/workspace_sheet.rs
+++ b/src/cmds/comp/workspace_sheet.rs
@@ -9,9 +9,10 @@ pub fn comp(ctx: CompletionContext) -> Option<Vec<String>> {
if (ctx.all_words.contains(&"--list-all".to_string())
|| ctx.all_words.contains(&"-A".to_string()))
- && ctx.all_words.len() > 4 {
- return None;
- }
+ && ctx.all_words.len() > 4
+ {
+ return None;
+ }
if ctx.current_word.starts_with('-') {
return Some(string_vec![
diff --git a/src/legacy_json_output.rs b/src/legacy_json_output.rs
deleted file mode 100644
index 88802a4..0000000
--- a/src/legacy_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/legacy_json_output/accounts.rs b/src/legacy_json_output/accounts.rs
deleted file mode 100644
index 705f4ea..0000000
--- a/src/legacy_json_output/accounts.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use just_enough_vcs::lib::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<MemberId, AccountItem>,
-}
-
-#[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
deleted file mode 100644
index 31f8aed..0000000
--- a/src/legacy_json_output/align.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use std::{collections::HashMap, path::PathBuf};
-
-use just_enough_vcs::lib::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<AlignTaskName, AlignTaskMapping>,
-}
-
-#[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
deleted file mode 100644
index bb6af56..0000000
--- a/src/legacy_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<PathBuf>,
- pub lost: Vec<PathBuf>,
- pub erased: Vec<PathBuf>,
- pub moved: Vec<MovedItem>,
- pub modified: Vec<ModifiedItem>,
-}
-
-#[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
deleted file mode 100644
index 8925d32..0000000
--- a/src/legacy_json_output/here.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use just_enough_vcs::lib::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<HereJsonResultItem>,
-}
-
-#[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
deleted file mode 100644
index ccc46cb..0000000
--- a/src/legacy_json_output/info.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use just_enough_vcs::lib::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<InfoHistory>,
-}
-
-#[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
deleted file mode 100644
index 8528842..0000000
--- a/src/legacy_json_output/share.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use std::collections::HashMap;
-
-use just_enough_vcs::lib::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<ShareItem>,
-}
-
-#[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<SheetPathBuf, SheetMappingMetadata>,
-}
diff --git a/src/legacy_json_output/sheets.rs b/src/legacy_json_output/sheets.rs
deleted file mode 100644
index f5743f3..0000000
--- a/src/legacy_json_output/sheets.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use just_enough_vcs::lib::data::member::MemberId;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Default, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub struct SheetListJsonResult {
- pub my_sheets: Vec<SheetItem>,
- pub reference_sheets: Vec<SheetItem>,
- pub other_sheets: Vec<SheetItem>,
-}
-#[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 13629ce..52881ff 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,9 +5,6 @@ rust_i18n::i18n!("resources/locales/jvn", fallback = "en");
/// Data
pub mod data;
-/// Json Format
-pub mod legacy_json_output;
-
/// Systems
pub mod systems;