Skip to content

Commit eb37309

Browse files
DataEraserCDataEraserC
committed
snapshot
1 parent 04de1cc commit eb37309

29 files changed

Lines changed: 143 additions & 148 deletions

‎file_classification_cli/src/bin/create_file_group.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
use file_classification_core::model::models::FileGroupDTO;
12
use file_classification_core::service::file_group::create_file_group;
23
use file_classification_core::utils::database::establish_connection;
34
use std::io::{stdin, stdout, Write};
4-
use file_classification_core::model::models::FileGroupDTO;
55

66
fn main() {
77
let connection = &mut establish_connection();
@@ -19,7 +19,7 @@ fn main() {
1919
stdin().read_line(&mut group_id_input).unwrap();
2020
let group_id: i32 = group_id_input.trim().parse().expect("Invalid Group ID");
2121

22-
let result = create_file_group(connection, FileGroupDTO{ file_id, group_id});
22+
let result = create_file_group(connection, FileGroupDTO { file_id, group_id });
2323
match result {
2424
Ok(new_file_group) => {
2525
println!("FileGroup created successfully!(NewFileGroup<{:?}>)", new_file_group)

‎file_classification_cli/src/bin/create_group_tag.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
use file_classification_core::model::models::GroupTagDTO;
12
use file_classification_core::service::group_tag::create_group_tag;
23
use file_classification_core::utils::database::establish_connection;
34
use std::io::{stdin, stdout, Write};
4-
use file_classification_core::model::models::GroupTagDTO;
55

66
fn main() {
77
let connection = &mut establish_connection();
@@ -19,7 +19,7 @@ fn main() {
1919
stdin().read_line(&mut tag_id_input).unwrap();
2020
let tag_id: i32 = tag_id_input.trim().parse().expect("Invalid Tag ID");
2121

22-
let result = create_group_tag(connection, GroupTagDTO{group_id, tag_id});
22+
let result = create_group_tag(connection, GroupTagDTO { group_id, tag_id });
2323
match result {
2424
Ok(new_group_tag) => {
2525
println!("GroupTag created successfully!(GroupTag<{:?}>)", new_group_tag)

‎file_classification_cli/src/bin/delete_file_group.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
use file_classification_core::model::models::FileGroupDTO;
12
use file_classification_core::service::file_group::delete_file_group;
23
use file_classification_core::utils::database::establish_connection;
34
use std::io::{stdin, stdout, Write};
4-
use file_classification_core::model::models::FileGroupDTO;
55

66
fn main() {
77
let connection = &mut establish_connection();
@@ -19,7 +19,7 @@ fn main() {
1919
stdin().read_line(&mut group_id_input).unwrap();
2020
let group_id: i32 = group_id_input.trim().parse().expect("Invalid Group ID");
2121

22-
let result = delete_file_group(connection, FileGroupDTO{file_id, group_id});
22+
let result = delete_file_group(connection, FileGroupDTO { file_id, group_id });
2323
match result {
2424
Ok(deleted_file_group_num) => {
2525
if deleted_file_group_num == 0 {

‎file_classification_cli/src/bin/delete_group_tag.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
use file_classification_core::model::models::GroupTagDTO;
12
use file_classification_core::service::group_tag::delete_group_tag_by_id;
23
use file_classification_core::utils::database::establish_connection;
34
use std::io::{stdin, stdout, Write};
4-
use file_classification_core::model::models::GroupTagDTO;
55

66
fn main() {
77
let connection = &mut establish_connection();
@@ -19,7 +19,7 @@ fn main() {
1919
stdin().read_line(&mut tag_id_input).unwrap();
2020
let tag_id: i32 = tag_id_input.trim().parse().expect("Invalid Tag ID");
2121

22-
let result = delete_group_tag_by_id(connection, GroupTagDTO{group_id, tag_id});
22+
let result = delete_group_tag_by_id(connection, GroupTagDTO { group_id, tag_id });
2323
match result {
2424
Ok(deleted_group_tag_num) => {
2525
if deleted_group_tag_num == 0 {

‎file_classification_cli/src/bin/update_files_by_conditions.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ fn main() {
2525
let update_set = get_update_fields();
2626

2727
if update_set.path.is_none() &&
28-
update_set.type_.is_none() &&
29-
update_set.reference_count.is_none() &&
30-
update_set.group_id.is_none() {
28+
update_set.type_.is_none() &&
29+
update_set.reference_count.is_none() &&
30+
update_set.group_id.is_none() {
3131
println!("未设置任何要更新的字段。");
3232
if !ask_continue() {
3333
break;

‎file_classification_cli/src/bin/update_groups_by_conditions.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
use chrono;
12
use file_classification_core::model::models::{GroupCondition, UpdateGroupDTO};
3+
use file_classification_core::service::groups::update_groups_by_conditions;
24
use file_classification_core::utils::database::establish_connection;
35
use std::io::{self, Write};
4-
use chrono;
5-
use file_classification_core::service::groups::update_groups_by_conditions;
66

77
fn main() {
88
let connection = &mut establish_connection();
@@ -26,12 +26,12 @@ fn main() {
2626
let update_set = get_update_fields();
2727

2828
if update_set.name.is_none() &&
29-
update_set.reference_count.is_none() &&
30-
update_set.is_primary.is_none() &&
31-
update_set.click_count.is_none() &&
32-
update_set.share_count.is_none() &&
33-
update_set.create_time.is_none() &&
34-
update_set.modify_time.is_none() {
29+
update_set.reference_count.is_none() &&
30+
update_set.is_primary.is_none() &&
31+
update_set.click_count.is_none() &&
32+
update_set.share_count.is_none() &&
33+
update_set.create_time.is_none() &&
34+
update_set.modify_time.is_none() {
3535
println!("未设置任何要更新的字段。");
3636
if !ask_continue() {
3737
break;
@@ -507,7 +507,7 @@ fn get_update_fields() -> UpdateGroupDTO {
507507
let reference_count: Option<i32>;
508508
let is_primary: Option<bool>;
509509
let click_count: Option<i32>;
510-
let share_count: Option<i32> ;
510+
let share_count: Option<i32>;
511511
let create_time: Option<chrono::NaiveDateTime> = None;
512512
let modify_time: Option<chrono::NaiveDateTime> = Some(chrono::Local::now().naive_local());
513513

‎file_classification_cli/src/bin/update_tags_by_conditions.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use file_classification_core::model::models::{TagCondition, UpdateTagDTO};
2+
use file_classification_core::service::tags::update_tags_by_conditions;
23
use file_classification_core::utils::database::establish_connection;
34
use std::io::{self, Write};
4-
use file_classification_core::service::tags::update_tags_by_conditions;
55

66
fn main() {
77
let connection = &mut establish_connection();
@@ -25,7 +25,7 @@ fn main() {
2525
let update_set = get_update_fields();
2626

2727
if update_set.name.is_none() &&
28-
update_set.reference_count.is_none() {
28+
update_set.reference_count.is_none() {
2929
println!("未设置任何要更新的字段。");
3030
if !ask_continue() {
3131
break;

‎file_classification_core/src/internal/file_group.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
use super::models::{FileGroupDTO,FileGroupCondition};
2-
use crate::model::schema::{file_groups};
1+
use super::models::{FileGroupCondition, FileGroupDTO};
2+
use crate::model::schema::file_groups;
33
use diesel::prelude::*;
44
use std::fmt::{Debug, Formatter, Result as fmtResult};
55

66
pub fn insert_file_group(
77
conn: &mut SqliteConnection,
88
file_group_dto: &FileGroupDTO,
9-
) -> Result<usize, diesel::result::Error>{
9+
) -> Result<usize, diesel::result::Error> {
1010
diesel::insert_into(file_groups::table)
1111
.values(file_group_dto)
1212
.execute(conn)
@@ -30,11 +30,11 @@ impl Debug for FileGroupDTO {
3030
}
3131
}
3232

33-
use diesel::sqlite::Sqlite;
3433
use crate::model::models::{FileGroupOrderBy, FileGroupQueryOptions, OrderDirection};
34+
use diesel::sqlite::Sqlite;
3535

3636
// 将 FileGroupCondition 转换为 diesel 查询条件的辅助函数
37-
fn build_file_group_condition(condition: FileGroupCondition) -> Box<dyn BoxableExpression<file_groups::table, Sqlite, SqlType = diesel::sql_types::Bool>> {
37+
fn build_file_group_condition(condition: FileGroupCondition) -> Box<dyn BoxableExpression<file_groups::table, Sqlite, SqlType=diesel::sql_types::Bool>> {
3838
match condition {
3939
FileGroupCondition::FileId(id) => Box::new(file_groups::file_id.eq(id)),
4040
FileGroupCondition::GroupId(id) => Box::new(file_groups::group_id.eq(id)),
@@ -45,7 +45,7 @@ fn build_file_group_condition(condition: FileGroupCondition) -> Box<dyn BoxableE
4545
FileGroupCondition::GroupIdLessThan(value) => Box::new(file_groups::group_id.lt(value)),
4646

4747
FileGroupCondition::And(conditions) => {
48-
let mut result: Option<Box<dyn BoxableExpression<file_groups::table, Sqlite, SqlType = diesel::sql_types::Bool>>> = None;
48+
let mut result: Option<Box<dyn BoxableExpression<file_groups::table, Sqlite, SqlType=diesel::sql_types::Bool>>> = None;
4949
for cond in conditions {
5050
let expr = build_file_group_condition(cond);
5151
match result {
@@ -54,9 +54,9 @@ fn build_file_group_condition(condition: FileGroupCondition) -> Box<dyn BoxableE
5454
}
5555
}
5656
result.unwrap_or_else(|| Box::new(true.into_sql::<diesel::sql_types::Bool>()))
57-
},
57+
}
5858
FileGroupCondition::Or(conditions) => {
59-
let mut result: Option<Box<dyn BoxableExpression<file_groups::table, Sqlite, SqlType = diesel::sql_types::Bool>>> = None;
59+
let mut result: Option<Box<dyn BoxableExpression<file_groups::table, Sqlite, SqlType=diesel::sql_types::Bool>>> = None;
6060
for cond in conditions {
6161
let expr = build_file_group_condition(cond);
6262
match result {
@@ -65,7 +65,7 @@ fn build_file_group_condition(condition: FileGroupCondition) -> Box<dyn BoxableE
6565
}
6666
}
6767
result.unwrap_or_else(|| Box::new(false.into_sql::<diesel::sql_types::Bool>()))
68-
},
68+
}
6969
FileGroupCondition::Not(condition) => {
7070
let expr = build_file_group_condition(*condition);
7171
Box::new(diesel::dsl::not(expr))
@@ -87,7 +87,7 @@ pub fn select_file_groups_by_conditions(
8787
query = query.filter(boxed_condition);
8888
}
8989

90-
if let Some(limit) = limit{
90+
if let Some(limit) = limit {
9191
query = query.limit(limit)
9292
}
9393

@@ -126,13 +126,13 @@ pub fn select_file_groups_by_conditions_with_options(
126126
OrderDirection::Asc => query.order(file_groups::file_id.asc()),
127127
OrderDirection::Desc => query.order(file_groups::file_id.desc()),
128128
}
129-
},
129+
}
130130
FileGroupOrderBy::GroupId(direction) => {
131131
match direction {
132132
OrderDirection::Asc => query.order(file_groups::group_id.asc()),
133133
OrderDirection::Desc => query.order(file_groups::group_id.desc()),
134134
}
135-
},
135+
}
136136
};
137137
}
138138

‎file_classification_core/src/internal/files.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use super::{models::{UpdateFileDTO, CreateFileDTO, File, FileFilter, FileCondition}};
1+
use super::models::{CreateFileDTO, File, FileCondition, FileFilter, UpdateFileDTO};
22
use diesel::prelude::*;
33

4-
pub fn create_file(conn: &mut SqliteConnection, new_file: &CreateFileDTO) -> Result<usize, diesel::result::Error> {
4+
pub fn create_file(conn: &mut SqliteConnection, new_file: &CreateFileDTO) -> Result<usize, diesel::result::Error> {
55
diesel::insert_into(files::table)
66
.values(new_file).execute(conn)
77
}
@@ -65,12 +65,12 @@ pub fn delete_file_by_id(conn: &mut SqliteConnection, file_id: i32) -> Result<us
6565
diesel::delete(files.filter(files::id.eq(file_id))).execute(conn)
6666
}
6767

68+
use crate::model::models::{FileOrderBy, FileQueryOptions, OrderDirection};
6869
use crate::model::schema::files;
6970
use crate::model::schema::files::dsl::*;
70-
use std::fmt::{Debug, Formatter, Result as fmtResult};
7171
use diesel::sql_types::Bool;
7272
use diesel::sqlite::Sqlite;
73-
use crate::model::models::{FileOrderBy, FileQueryOptions, OrderDirection};
73+
use std::fmt::{Debug, Formatter, Result as fmtResult};
7474

7575
impl Debug for File {
7676
fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
@@ -85,7 +85,7 @@ impl Debug for File {
8585

8686
// 将 FileCondition 转换为 diesel 查询条件的辅助函数
8787
// 更新 build_condition 函数以处理新增的条件类型
88-
fn build_file_condition(condition: FileCondition) -> Box<dyn BoxableExpression<files::table, Sqlite, SqlType = diesel::sql_types::Bool>> {
88+
fn build_file_condition(condition: FileCondition) -> Box<dyn BoxableExpression<files::table, Sqlite, SqlType=diesel::sql_types::Bool>> {
8989
match condition {
9090
FileCondition::Id(_id) => Box::new(files::id.eq(_id)),
9191
FileCondition::Type(t) => Box::new(files::type_.eq(t)),
@@ -104,7 +104,7 @@ fn build_file_condition(condition: FileCondition) -> Box<dyn BoxableExpression<f
104104
FileCondition::GroupIdLessThan(value) => Box::new(files::group_id.lt(value)),
105105

106106
FileCondition::And(conditions) => {
107-
let mut result: Option<Box<dyn BoxableExpression<files::table, Sqlite, SqlType = diesel::sql_types::Bool>>> = None;
107+
let mut result: Option<Box<dyn BoxableExpression<files::table, Sqlite, SqlType=diesel::sql_types::Bool>>> = None;
108108
for cond in conditions {
109109
let expr = build_file_condition(cond);
110110
match result {
@@ -113,9 +113,9 @@ fn build_file_condition(condition: FileCondition) -> Box<dyn BoxableExpression<f
113113
}
114114
}
115115
result.unwrap_or_else(|| Box::new(true.into_sql::<Bool>()))
116-
},
116+
}
117117
FileCondition::Or(conditions) => {
118-
let mut result: Option<Box<dyn BoxableExpression<files::table, Sqlite, SqlType = diesel::sql_types::Bool>>> = None;
118+
let mut result: Option<Box<dyn BoxableExpression<files::table, Sqlite, SqlType=diesel::sql_types::Bool>>> = None;
119119
for cond in conditions {
120120
let expr = build_file_condition(cond);
121121
match result {
@@ -124,7 +124,7 @@ fn build_file_condition(condition: FileCondition) -> Box<dyn BoxableExpression<f
124124
}
125125
}
126126
result.unwrap_or_else(|| Box::new(false.into_sql::<Bool>()))
127-
},
127+
}
128128
FileCondition::Not(condition) => {
129129
let expr = build_file_condition(*condition);
130130
Box::new(diesel::dsl::not(expr))
@@ -186,31 +186,31 @@ pub fn select_files_by_conditions_with_options(
186186
OrderDirection::Asc => query.order(files::id.asc()),
187187
OrderDirection::Desc => query.order(files::id.desc()),
188188
}
189-
},
189+
}
190190
FileOrderBy::Type(direction) => {
191191
match direction {
192192
OrderDirection::Asc => query.order(files::type_.asc()),
193193
OrderDirection::Desc => query.order(files::type_.desc()),
194194
}
195-
},
195+
}
196196
FileOrderBy::Path(direction) => {
197197
match direction {
198198
OrderDirection::Asc => query.order(files::path.asc()),
199199
OrderDirection::Desc => query.order(files::path.desc()),
200200
}
201-
},
201+
}
202202
FileOrderBy::ReferenceCount(direction) => {
203203
match direction {
204204
OrderDirection::Asc => query.order(files::reference_count.asc()),
205205
OrderDirection::Desc => query.order(files::reference_count.desc()),
206206
}
207-
},
207+
}
208208
FileOrderBy::GroupId(direction) => {
209209
match direction {
210210
OrderDirection::Asc => query.order(files::group_id.asc()),
211211
OrderDirection::Desc => query.order(files::group_id.desc()),
212212
}
213-
},
213+
}
214214
};
215215
}
216216

0 commit comments

Comments
 (0)