@@ -28,13 +28,10 @@ pub enum Language {
2828#[ derive( Debug ) ]
2929pub struct Config {
3030 pub work_dir : String ,
31- pub repo_dir : String ,
32- pub cache_dir : String ,
3331 pub parser_dir : String ,
3432 pub api_type : String ,
3533 pub maas_model_name : String ,
3634 pub mass_http_url : String ,
37- pub tools_dir : String ,
3835
3936 pub coze_api_token : Option < String > ,
4037 pub coze_bot_id : Option < String > ,
@@ -46,23 +43,7 @@ pub struct Config {
4643}
4744
4845fn default_work_dir ( ) -> String {
49- std:: env:: current_dir ( )
50- . unwrap ( )
51- . to_str ( )
52- . unwrap ( )
53- . to_string ( )
54- }
55-
56- fn default_repo_dir ( ) -> String {
57- "tmp_repos" . to_string ( )
58- }
59-
60- fn default_tools_dir ( ) -> String {
61- "tools" . to_string ( )
62- }
63-
64- fn default_cache_dir ( ) -> String {
65- "tmp_caches" . to_string ( )
46+ "tmp_abcoder" . to_string ( )
6647}
6748
6849fn default_parser_dir ( ) -> String {
@@ -81,11 +62,8 @@ impl Config {
8162 pub fn new ( ) -> Self {
8263 Self {
8364 work_dir : default_work_dir ( ) ,
84- repo_dir : default_repo_dir ( ) ,
85- cache_dir : default_cache_dir ( ) ,
8665 parser_dir : default_parser_dir ( ) ,
8766 api_type : default_api_type ( ) ,
88- tools_dir : default_tools_dir ( ) ,
8967 maas_model_name : default_maas_model_name ( ) ,
9068 mass_http_url : "" . to_string ( ) ,
9169 coze_api_token : None ,
@@ -97,13 +75,10 @@ impl Config {
9775 }
9876
9977 pub fn parse_from_env ( ) -> Self {
100- let mut s = Self {
78+ let s = Self {
10179 work_dir : std:: env:: var ( "WORK_DIR" ) . unwrap_or_else ( |_| default_work_dir ( ) ) ,
102- repo_dir : std:: env:: var ( "REPO_DIR" ) . unwrap_or_else ( |_| default_repo_dir ( ) ) ,
103- cache_dir : std:: env:: var ( "CACHE_DIR" ) . unwrap_or_else ( |_| default_cache_dir ( ) ) ,
10480 parser_dir : std:: env:: var ( "PARSER_DIR" ) . unwrap_or_else ( |_| default_parser_dir ( ) ) ,
10581 api_type : std:: env:: var ( "API_TYPE" ) . unwrap_or_else ( |_| default_api_type ( ) ) ,
106- tools_dir : std:: env:: var ( "TOOLS_DIR" ) . unwrap_or_else ( |_| default_tools_dir ( ) ) ,
10782 maas_model_name : std:: env:: var ( "MAAS_MODEL_NAME" )
10883 . unwrap_or_else ( |_| default_maas_model_name ( ) ) ,
10984 mass_http_url : std:: env:: var ( "MASS_HTTP_URL" ) . unwrap_or_else ( |_| "" . to_string ( ) ) ,
@@ -121,35 +96,6 @@ impl Config {
12196 } )
12297 . unwrap_or ( Language :: Chinese ) ,
12398 } ;
124-
125- if !s. repo_dir . starts_with ( "/" ) {
126- s. repo_dir = Path :: new ( & s. work_dir )
127- . join ( s. repo_dir )
128- . to_str ( )
129- . unwrap ( )
130- . to_string ( ) ;
131- }
132- if !s. cache_dir . starts_with ( "/" ) {
133- s. cache_dir = Path :: new ( & s. work_dir )
134- . join ( s. cache_dir )
135- . to_str ( )
136- . unwrap ( )
137- . to_string ( ) ;
138- }
139- if !s. parser_dir . starts_with ( "/" ) {
140- s. parser_dir = Path :: new ( & s. work_dir )
141- . join ( s. parser_dir )
142- . to_str ( )
143- . unwrap ( )
144- . to_string ( ) ;
145- }
146- if !s. tools_dir . starts_with ( "/" ) {
147- s. tools_dir = Path :: new ( & s. work_dir )
148- . join ( s. tools_dir )
149- . to_str ( )
150- . unwrap ( )
151- . to_string ( ) ;
152- }
15399 s
154100 }
155101}
@@ -161,18 +107,8 @@ lazy_static! {
161107 } ;
162108}
163109
164- pub fn go_ast_path ( ) -> String {
165- Path :: new ( & CONFIG . tools_dir )
166- . join ( "parser" )
167- . join ( "go_ast" )
168- . to_str ( )
169- . unwrap ( )
170- . to_string ( )
171- }
172-
173- pub fn rust_ast_path ( ) -> String {
174- Path :: new ( & CONFIG . tools_dir )
175- . join ( "parser" )
110+ pub fn parser_path ( ) -> String {
111+ Path :: new ( & CONFIG . parser_dir )
176112 . join ( "lang" )
177113 . to_str ( )
178114 . unwrap ( )
@@ -223,7 +159,8 @@ pub fn parser_and_args<'a>(
223159 opts : & parse:: CompressOptions ,
224160) -> ( String , Vec < String > ) {
225161 let lang = decide_language ( repo_path) ;
226- let path = rust_ast_path ( ) ;
162+ let path = parser_path ( ) ;
163+ println ! ( "parser path: {:?}" , path) ;
227164 let mut args = vec ! [
228165 "collect" . to_string( ) ,
229166 lang. to_string( ) ,
0 commit comments