Fix warnings, and general code cleanup
This commit is contained in:
14
src/files.rs
14
src/files.rs
@@ -184,13 +184,8 @@ impl FileSystemAccess for RealFileSystem {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::database::connect;
|
||||
use crate::tags::SqliteTagDao;
|
||||
use actix_web::web::Data;
|
||||
use diesel::{Connection, SqliteConnection};
|
||||
use std::collections::HashMap;
|
||||
use std::env;
|
||||
use std::ffi::OsStr;
|
||||
use std::fs::File;
|
||||
|
||||
use super::*;
|
||||
@@ -342,7 +337,7 @@ mod tests {
|
||||
let mut tag_dao = SqliteTagDao::new(in_memory_db_connection());
|
||||
|
||||
let tag1 = tag_dao.create_tag("tag1").unwrap();
|
||||
let tag2 = tag_dao.create_tag("tag2").unwrap();
|
||||
let _tag2 = tag_dao.create_tag("tag2").unwrap();
|
||||
let tag3 = tag_dao.create_tag("tag3").unwrap();
|
||||
|
||||
let _ = &tag_dao.tag_file("test.jpg", tag1.id).unwrap();
|
||||
@@ -409,8 +404,11 @@ mod tests {
|
||||
],
|
||||
);
|
||||
|
||||
let request: Query<FilesRequest> =
|
||||
Query::from_query("path=&tag_ids=1,3&tag_filter_mode=All").unwrap();
|
||||
let request: Query<FilesRequest> = Query::from_query(&*format!(
|
||||
"path=&tag_ids={},{}&tag_filter_mode=All",
|
||||
tag1.id, tag3.id
|
||||
))
|
||||
.unwrap();
|
||||
|
||||
let response: HttpResponse = list_photos(
|
||||
claims,
|
||||
|
||||
Reference in New Issue
Block a user