Update jv.rs

2 files changed, 13 insertions, 18 deletions

diff --git a/src/bin/jv.rs b/src/bin/jv.rs
index 742c774..be0ec2d 100644
--- a/src/bin/jv.rs
+++ b/src/bin/jv.rs
@@ -31,17 +31,12 @@ use just_enough_vcs::{
             CLIENT_FILE_TODOLIST, CLIENT_FILE_WORKSPACE, CLIENT_FOLDER_WORKSPACE_ROOT_NAME,
             CLIENT_PATH_WORKSPACE_ROOT, PORT, REF_SHEET_NAME,
         },
-        current::{correct_current_dir, current_doc_dir, current_local_path},
+        current::{correct_current_dir, current_local_path},
         data::{
             local::{
-                LocalWorkspace,
-                align::AlignTasks,
-                cached_sheet::CachedSheet,
-                config::LocalConfig,
-                file_status::AnalyzeResult,
-                latest_file_data::LatestFileData,
-                latest_info::LatestInfo,
-                local_files::{RelativeFiles, get_relative_paths},
+                LocalWorkspace, align::AlignTasks, cached_sheet::CachedSheet, config::LocalConfig,
+                file_status::AnalyzeResult, latest_file_data::LatestFileData,
+                latest_info::LatestInfo, local_files::get_relative_paths,
                 vault_modified::check_vault_modified,
             },
             member::{Member, MemberId},
@@ -685,7 +680,7 @@ async fn main() {
             };
 
             // Check if account list is not empty
-            let Some(dir) = UserDirectory::current_doc_dir() else {
+            let Some(dir) = UserDirectory::current_cfg_dir() else {
                 return;
             };
 
@@ -816,7 +811,7 @@ async fn main() {
         }
 
         JustEnoughVcsWorkspaceCommand::Account(account_manage) => {
-            let user_dir = match UserDirectory::current_doc_dir() {
+            let user_dir = match UserDirectory::current_cfg_dir() {
                 Some(dir) => dir,
                 None => {
                     eprintln!("{}", t!("jv.fail.account.no_user_dir"));
@@ -1003,7 +998,7 @@ async fn main() {
             .await
         }
         JustEnoughVcsWorkspaceCommand::Accounts => {
-            let user_dir = match UserDirectory::current_doc_dir() {
+            let user_dir = match UserDirectory::current_cfg_dir() {
                 Some(dir) => dir,
                 None => {
                     eprintln!("{}", t!("jv.fail.account.no_user_dir"));
@@ -1023,7 +1018,7 @@ async fn main() {
             jv_sheet_align(sheet_align_args).await
         }
         JustEnoughVcsWorkspaceCommand::As(args) => {
-            let user_dir = match UserDirectory::current_doc_dir() {
+            let user_dir = match UserDirectory::current_cfg_dir() {
                 Some(dir) => dir,
                 None => {
                     eprintln!("{}", t!("jv.fail.account.no_user_dir"));
@@ -1053,7 +1048,7 @@ async fn main() {
                 confirm_hint_or(t!("common.confirm"), || exit(1)).await;
             }
 
-            let user_dir = match UserDirectory::current_doc_dir() {
+            let user_dir = match UserDirectory::current_cfg_dir() {
                 Some(dir) => dir,
                 None => {
                     eprintln!("{}", t!("jv.fail.account.no_user_dir"));
@@ -1087,7 +1082,7 @@ async fn main() {
                 let _ = fs::remove_file(local_dir.join(CLIENT_FILE_TODOLIST)).await;
             };
         }
-        JustEnoughVcsWorkspaceCommand::HistoryIpAddress => {
+        JustEnoughVcsWorkspaceCommand::GetHistoryIpAddress => {
             get_recent_ip_address()
                 .await
                 .iter()
diff --git a/src/data/ipaddress_history.rs b/src/data/ipaddress_history.rs
index 3d2bb5b..2787c36 100644
--- a/src/data/ipaddress_history.rs
+++ b/src/data/ipaddress_history.rs
@@ -1,4 +1,4 @@
-use just_enough_vcs::vcs::current::current_doc_dir;
+use just_enough_vcs::vcs::current::current_cfg_dir;
 
 const IP_HISTORY_NAME: &str = "ip_history.txt";
 
@@ -7,7 +7,7 @@ pub struct IpAddressHistory {
 }
 
 pub async fn get_recent_ip_address() -> Vec<String> {
-    if let Some(local) = current_doc_dir() {
+    if let Some(local) = current_cfg_dir() {
         let path = local.join(IP_HISTORY_NAME);
         match tokio::fs::read_to_string(path).await {
             Ok(content) => content.lines().map(String::from).collect(),
@@ -20,7 +20,7 @@ pub async fn get_recent_ip_address() -> Vec<String> {
 
 pub async fn insert_recent_ip_address(ip: impl Into<String>) {
     let ip = ip.into();
-    if let Some(local) = current_doc_dir() {
+    if let Some(local) = current_cfg_dir() {
         let path = local.join(IP_HISTORY_NAME);
         let mut recent_ips = get_recent_ip_address().await;
         recent_ips.retain(|existing_ip| existing_ip != &ip);