From 0378f400d721e7b0461fecd2f548bfaa5f713689 Mon Sep 17 00:00:00 2001 From: trivernis Date: Thu, 3 Feb 2022 20:38:39 +0100 Subject: [PATCH 01/18] Update dependencies Signed-off-by: trivernis --- mediarepo-daemon/Cargo.lock | 276 +++++++++++++++--- mediarepo-daemon/Cargo.toml | 8 +- mediarepo-daemon/mediarepo-core/Cargo.toml | 10 +- .../mediarepo-core/src/fs/thumbnail_store.rs | 6 +- .../mediarepo-database/Cargo.toml | 4 +- mediarepo-daemon/mediarepo-logic/Cargo.toml | 4 +- .../mediarepo-logic/src/dao/file/update.rs | 6 +- mediarepo-daemon/mediarepo-socket/Cargo.toml | 8 +- 8 files changed, 264 insertions(+), 58 deletions(-) diff --git a/mediarepo-daemon/Cargo.lock b/mediarepo-daemon/Cargo.lock index cdedb334..c095862c 100644 --- a/mediarepo-daemon/Cargo.lock +++ b/mediarepo-daemon/Cargo.lock @@ -202,6 +202,12 @@ dependencies = [ "shlex", ] +[[package]] +name = "bit_field" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" + [[package]] name = "bitflags" version = "1.3.2" @@ -277,6 +283,12 @@ dependencies = [ "typemap_rev", ] +[[package]] +name = "bumpalo" +version = "3.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" + [[package]] name = "bytemuck" version = "1.7.3" @@ -576,12 +588,20 @@ dependencies = [ [[package]] name = "deflate" -version = "0.8.6" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" +checksum = "5f95bf05dffba6e6cce8dfbb30def788154949ccd9aed761b472119c21e01c70" +dependencies = [ + "adler32", +] + +[[package]] +name = "deflate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" dependencies = [ "adler32", - "byteorder", ] [[package]] @@ -605,6 +625,86 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "encoding" +version = "0.2.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" +dependencies = [ + "encoding-index-japanese", + "encoding-index-korean", + "encoding-index-simpchinese", + "encoding-index-singlebyte", + "encoding-index-tradchinese", +] + +[[package]] +name = "encoding-index-japanese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-korean" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-simpchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-singlebyte" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-tradchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding_index_tests" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" + +[[package]] +name = "exr" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4badb9489a465cb2c555af1f00f0bfd8cecd6fc12ac11da9d5b40c5dd5f0200" +dependencies = [ + "bit_field", + "deflate 1.0.0", + "flume", + "half", + "inflate", + "lebe", + "smallvec", + "threadpool", +] + [[package]] name = "fastrand" version = "1.7.0" @@ -654,7 +754,7 @@ dependencies = [ "cfg-if 1.0.0", "crc32fast", "libc", - "miniz_oxide 0.4.4", + "miniz_oxide", ] [[package]] @@ -665,6 +765,7 @@ checksum = "5d04dafd11240188e146b6f6476a898004cace3be31d4ec5e08e216bf4947ac0" dependencies = [ "futures-core", "futures-sink", + "nanorand", "pin-project", "spin", ] @@ -823,8 +924,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -862,6 +965,12 @@ dependencies = [ "tracing", ] +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + [[package]] name = "hashbrown" version = "0.11.2" @@ -1006,15 +1115,16 @@ dependencies = [ [[package]] name = "image" -version = "0.23.14" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" +checksum = "e94ac3d41f882c624a82d7945952032388488681f45f9d4077999a6c85688d61" dependencies = [ "bytemuck", "byteorder", "color_quant", + "exr", "gif", - "jpeg-decoder", + "jpeg-decoder 0.2.1", "num-iter", "num-rational", "num-traits 0.2.14", @@ -1033,6 +1143,15 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "inflate" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" +dependencies = [ + "adler32", +] + [[package]] name = "instant" version = "0.1.12" @@ -1077,10 +1196,25 @@ name = "jpeg-decoder" version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" + +[[package]] +name = "jpeg-decoder" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcf0244f6597be39ab8d9203f574cafb529ae8c698afa2182f7b3c3205a4a9c" dependencies = [ "rayon", ] +[[package]] +name = "js-sys" +version = "0.3.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" +dependencies = [ + "wasm-bindgen", +] + [[package]] name = "keccak" version = "0.1.0" @@ -1099,6 +1233,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" +[[package]] +name = "lebe" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efd1d698db0759e6ef11a7cd44407407399a910c774dd804c64c032da7826ff" + [[package]] name = "lexical-core" version = "0.7.6" @@ -1114,9 +1254,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.116" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74" +checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c" [[package]] name = "libloading" @@ -1141,9 +1281,9 @@ dependencies = [ [[package]] name = "libwebp-sys" -version = "0.2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e70c064738b35a28fd6f991d27c0d9680353641d167ae3702a8228dd8272ef6" +checksum = "439fd1885aa28937e7edcd68d2e793cb4a22f8733460d2519fbafd2b215672bf" dependencies = [ "cc", ] @@ -1328,15 +1468,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - [[package]] name = "miniz_oxide" version = "0.4.4" @@ -1417,6 +1548,15 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +[[package]] +name = "nanorand" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "729eb334247daa1803e0a094d0a5c55711b85571179f5ec6e53eccfdf7008958" +dependencies = [ + "getrandom", +] + [[package]] name = "native-tls" version = "0.2.8" @@ -1500,9 +1640,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" dependencies = [ "autocfg", "num-integer", @@ -1702,14 +1842,15 @@ checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" [[package]] name = "png" -version = "0.16.8" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" +checksum = "c845088517daa61e8a57eee40309347cea13f273694d1385c553e7a57127763b" dependencies = [ "bitflags", "crc32fast", - "deflate", - "miniz_oxide 0.3.7", + "deflate 0.9.1", + "encoding", + "miniz_oxide", ] [[package]] @@ -1973,9 +2114,9 @@ checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" [[package]] name = "rust_decimal" -version = "1.20.0" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0593ce4677e3800ddafb3de917e8397b1348e06e688128ade722d88fbe11ebf" +checksum = "4214023b1223d02a4aad9f0bb9828317634a56530870a2eaf7200a99c0c10f68" dependencies = [ "arrayvec 0.7.2", "num-traits 0.2.14", @@ -2523,11 +2664,20 @@ dependencies = [ "once_cell", ] +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + [[package]] name = "thumbnailer" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6017341c89a0c406e38801119f67dd0b67d045ff0e50aa2cf8fc1de4a1b48c3b" +checksum = "be2c8e83220af2d58ff05f00dd28ceeef896e831d263014fd1229099f2d954be" dependencies = [ "ffmpeg-next", "image", @@ -2539,12 +2689,12 @@ dependencies = [ [[package]] name = "tiff" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" +checksum = "0247608e998cb6ce39dfc8f4a16c50361ce71e5b52e6d24ea1227ea8ea8ee0b2" dependencies = [ - "jpeg-decoder", - "miniz_oxide 0.4.4", + "flate2", + "jpeg-decoder 0.1.22", "weezl", ] @@ -3011,11 +3161,65 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasm-bindgen" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2 1.0.36", + "quote 1.0.15", + "syn 1.0.86", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" +dependencies = [ + "quote 1.0.15", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" +dependencies = [ + "proc-macro2 1.0.36", + "quote 1.0.15", + "syn 1.0.86", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" + [[package]] name = "webp" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0041a9fcbdbf6402c3cb0ec7c2c1a1c240efd523519a0763ae07753bc95f7713" +checksum = "3f80f6a431ea17cbe9d6958628e553c17d22df62b301b39940a9dfd60f3dd7c6" dependencies = [ "image", "libwebp-sys", diff --git a/mediarepo-daemon/Cargo.toml b/mediarepo-daemon/Cargo.toml index 81cf2ac6..f97dc998 100644 --- a/mediarepo-daemon/Cargo.toml +++ b/mediarepo-daemon/Cargo.toml @@ -18,14 +18,14 @@ path = "src/main.rs" [dependencies] tracing = "^0.1.29" toml = "^0.5.8" -structopt ="^0.3.25" +structopt ="^0.3.26" glob = "^0.3.0" tracing-flame = "^0.2.0" tracing-appender = "^0.2.0" tracing-log = "^0.1.2" rolling-file = "^0.1.0" num-integer = "^0.1.44" -console-subscriber = "^0.1.0" +console-subscriber = "^0.1.1" log = "^0.4.14" [dependencies.mediarepo-core] @@ -38,11 +38,11 @@ path = "mediarepo-logic" path = "./mediarepo-socket" [dependencies.tokio] -version = "1.15.0" +version = "1.16.1" features = ["macros", "rt-multi-thread", "io-std", "io-util"] [dependencies.tracing-subscriber] -version="0.3.0" +version="0.3.7" features = ["env-filter", "ansi", "json"] [features] diff --git a/mediarepo-daemon/mediarepo-core/Cargo.toml b/mediarepo-daemon/mediarepo-core/Cargo.toml index 71c1d40e..89603100 100644 --- a/mediarepo-daemon/mediarepo-core/Cargo.toml +++ b/mediarepo-daemon/mediarepo-core/Cargo.toml @@ -12,7 +12,7 @@ multihash = "^0.15.0" multibase = "^0.9.1" base64 = "^0.13.0" toml = "^0.5.8" -serde = "^1.0.132" +serde = "^1.0.136" typemap_rev = "^0.1.5" futures = "^0.3.19" itertools = "^0.10.3" @@ -22,20 +22,20 @@ data-encoding = "^2.3.2" tokio-graceful-shutdown = "^0.4.3" [dependencies.thumbnailer] -version = "^0.2.5" +version = "^0.3" default-features = false [dependencies.sea-orm] -version = "^0.5.0-rc.1" +version = "^0.5.0" default-features = false [dependencies.sqlx] -version = "^0.5.9" +version = "^0.5.10" default-features = false features = ["migrate"] [dependencies.tokio] -version = "^1.15.0" +version = "^1.16.1" features = ["fs", "io-util", "io-std"] [dependencies.config] diff --git a/mediarepo-daemon/mediarepo-core/src/fs/thumbnail_store.rs b/mediarepo-daemon/mediarepo-core/src/fs/thumbnail_store.rs index 7b150c2f..0ac2a70b 100644 --- a/mediarepo-daemon/mediarepo-core/src/fs/thumbnail_store.rs +++ b/mediarepo-daemon/mediarepo-core/src/fs/thumbnail_store.rs @@ -27,7 +27,8 @@ impl ThumbnailStore { /// Adds a thumbnail to be stored for a parent id /// if the thumbnail already exists it will be recreated without warning - pub async fn add_thumbnail( + #[tracing::instrument(level = "debug", skip(self, data))] + pub async fn add_thumbnail( &self, parent_id: S, size: Dimensions, @@ -53,7 +54,8 @@ impl ThumbnailStore { } /// Returns all thumbnails for a parent id - pub async fn get_thumbnails( + #[tracing::instrument(level = "debug", skip(self))] + pub async fn get_thumbnails( &self, parent_id: S, ) -> Result> { diff --git a/mediarepo-daemon/mediarepo-database/Cargo.toml b/mediarepo-daemon/mediarepo-database/Cargo.toml index ac2ffd64..4a2e6700 100644 --- a/mediarepo-daemon/mediarepo-database/Cargo.toml +++ b/mediarepo-daemon/mediarepo-database/Cargo.toml @@ -14,10 +14,10 @@ tracing = "^0.1.29" path = "../mediarepo-core" [dependencies.sqlx] -version = "^0.5.9" +version = "^0.5.10" features = ["migrate"] [dependencies.sea-orm] -version = "^0.5.0-rc.1" +version = "^0.5.0" features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros", "debug-print"] default-features = false \ No newline at end of file diff --git a/mediarepo-daemon/mediarepo-logic/Cargo.toml b/mediarepo-daemon/mediarepo-logic/Cargo.toml index 75cab7b6..ca502336 100644 --- a/mediarepo-daemon/mediarepo-logic/Cargo.toml +++ b/mediarepo-daemon/mediarepo-logic/Cargo.toml @@ -9,11 +9,11 @@ workspace = ".." [dependencies] chrono = "^0.4.19" typemap_rev = "^0.1.5" -serde = "^1.0.130" +serde = "^1.0.136" mime_guess = "^2.0.3" mime = "^0.3.16" tracing = "^0.1.29" -async-trait = "^0.1.51" +async-trait = "^0.1.52" [dependencies.mediarepo-core] path = "../mediarepo-core" diff --git a/mediarepo-daemon/mediarepo-logic/src/dao/file/update.rs b/mediarepo-daemon/mediarepo-logic/src/dao/file/update.rs index c1439648..1f554fa3 100644 --- a/mediarepo-daemon/mediarepo-logic/src/dao/file/update.rs +++ b/mediarepo-daemon/mediarepo-logic/src/dao/file/update.rs @@ -9,7 +9,7 @@ use sea_orm::{ConnectionTrait, NotSet}; use mediarepo_core::error::{RepoError, RepoResult}; use mediarepo_core::fs::thumbnail_store::Dimensions; use mediarepo_core::thumbnailer; -use mediarepo_core::thumbnailer::{ThumbnailSize}; +use mediarepo_core::thumbnailer::ThumbnailSize; use mediarepo_database::entities::{content_descriptor, file, file_metadata}; use crate::dao::file::FileDao; @@ -69,7 +69,7 @@ impl FileDao { let mut dtos = Vec::new(); for thumbnail in thumbnails { - let mut buf = Vec::new(); + let mut buf = Cursor::new(Vec::new()); let size = thumbnail.size(); let size = Dimensions { height: size.1, @@ -80,7 +80,7 @@ impl FileDao { let path = self .ctx .thumbnail_storage - .add_thumbnail(file.encoded_cd(), size.clone(), &buf) + .add_thumbnail(file.encoded_cd(), size.clone(), &buf.into_inner()) .await?; dtos.push(ThumbnailDto::new( path, diff --git a/mediarepo-daemon/mediarepo-socket/Cargo.toml b/mediarepo-daemon/mediarepo-socket/Cargo.toml index c1f51eec..2c56382d 100644 --- a/mediarepo-daemon/mediarepo-socket/Cargo.toml +++ b/mediarepo-daemon/mediarepo-socket/Cargo.toml @@ -7,11 +7,11 @@ workspace = ".." # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde = "^1.0.130" +serde = "^1.0.136" tracing = "^0.1.29" compare = "^0.1.0" port_check = "^0.1.5" -rayon = "1.5.1" +rayon = "^1.5.1" [dependencies.mediarepo-core] path = "../mediarepo-core" @@ -23,7 +23,7 @@ path = "../mediarepo-database" path = "../mediarepo-logic" [dependencies.tokio] -version = "^1.15.0" +version = "^1.16.1" features = ["net"] [dependencies.chrono] @@ -31,5 +31,5 @@ version = "^0.4.19" features = ["serde"] [dependencies.tracing-futures] -version = "0.2.5" +version = "^0.2.5" features = ["tokio-executor"] \ No newline at end of file From 426203b8e5ed76545f5898125dbd4cc1150fa616 Mon Sep 17 00:00:00 2001 From: trivernis Date: Fri, 4 Feb 2022 22:09:50 +0100 Subject: [PATCH 02/18] Improve performance of sorting data fetching Signed-off-by: trivernis --- .../mediarepo-database/src/queries/tags.rs | 51 +---------------- .../src/dao/tag/cdids_with_namespaced_tags.rs | 56 +++++++++++++++++++ .../mediarepo-logic/src/dao/tag/mod.rs | 1 + .../src/namespaces/files/sorting.rs | 17 +++--- 4 files changed, 66 insertions(+), 59 deletions(-) create mode 100644 mediarepo-daemon/mediarepo-logic/src/dao/tag/cdids_with_namespaced_tags.rs diff --git a/mediarepo-daemon/mediarepo-database/src/queries/tags.rs b/mediarepo-daemon/mediarepo-database/src/queries/tags.rs index c9010310..af136fa4 100644 --- a/mediarepo-daemon/mediarepo-database/src/queries/tags.rs +++ b/mediarepo-daemon/mediarepo-database/src/queries/tags.rs @@ -1,61 +1,12 @@ use std::collections::HashMap; use std::fmt::Display; -use std::iter::FromIterator; -use sea_orm::{DatabaseConnection, Statement}; use sea_orm::DbBackend; use sea_orm::FromQueryResult; +use sea_orm::{DatabaseConnection, Statement}; use mediarepo_core::error::RepoResult; -#[derive(Debug, FromQueryResult)] -struct CIDNamespaceTag { - cd_id: i64, - namespace: String, - tag: String, -} - -#[tracing::instrument(level = "debug", skip_all)] -pub async fn get_cids_with_namespaced_tags( - db: &DatabaseConnection, - hash_ids: Vec, -) -> RepoResult>>> { - let hash_namespace_tags: Vec = - CIDNamespaceTag::find_by_statement(Statement::from_sql_and_values( - DbBackend::Sqlite, - format!( - r#"SELECT ctm.cd_id, n.name as namespace, t.name as tag - FROM cd_tag_mappings ctm - INNER JOIN tags t on ctm.tag_id = t.id - JOIN namespaces n on t.namespace_id = n.id - WHERE t.namespace_id IS NOT NULL - AND ctm.cd_id IN ({}) ORDER BY t.namespace_id;"#, - vec_to_query_list(hash_ids) - ) - .as_str(), - vec![], - )) - .all(db) - .await?; - let mut cd_id_namespaces: HashMap>> = HashMap::new(); - for hnt in hash_namespace_tags { - if let Some(entry) = cd_id_namespaces.get_mut(&hnt.cd_id) { - if let Some(nsp_entry) = entry.get_mut(&hnt.namespace) { - nsp_entry.push(hnt.tag); - } else { - entry.insert(hnt.namespace, vec![hnt.tag]); - } - } else { - cd_id_namespaces.insert( - hnt.cd_id, - HashMap::from_iter(vec![(hnt.namespace, vec![hnt.tag])].into_iter()), - ); - } - } - - Ok(cd_id_namespaces) -} - #[derive(Debug, FromQueryResult)] struct CIDTagCount { cd_id: i64, diff --git a/mediarepo-daemon/mediarepo-logic/src/dao/tag/cdids_with_namespaced_tags.rs b/mediarepo-daemon/mediarepo-logic/src/dao/tag/cdids_with_namespaced_tags.rs new file mode 100644 index 00000000..a07f325f --- /dev/null +++ b/mediarepo-daemon/mediarepo-logic/src/dao/tag/cdids_with_namespaced_tags.rs @@ -0,0 +1,56 @@ +use crate::dao::tag::TagDao; +use mediarepo_core::error::RepoResult; +use mediarepo_database::entities::{content_descriptor_tag, namespace, tag}; +use sea_orm::prelude::*; +use sea_orm::JoinType; +use sea_orm::{FromQueryResult, QuerySelect}; +use std::collections::HashMap; +use std::iter::FromIterator; + +#[derive(Debug, FromQueryResult)] +struct CDIDNamespaceTag { + cd_id: i64, + namespace: String, + tag: String, +} + +impl TagDao { + #[tracing::instrument(level = "debug", skip(self, cdids))] + pub async fn cdids_with_namespaced_tags( + &self, + cdids: Vec, + ) -> RepoResult>>> { + let cd_namespace_tags: Vec = content_descriptor_tag::Entity::find() + .select_only() + .column(content_descriptor_tag::Column::CdId) + .column_as(tag::Column::Name, "tag") + .column_as(namespace::Column::Name, "namespace") + .join( + JoinType::InnerJoin, + content_descriptor_tag::Relation::Tag.def(), + ) + .join(JoinType::Join, namespace::Relation::Tag.def().rev()) + .filter(content_descriptor_tag::Column::CdId.is_in(cdids)) + .into_model::() + .all(&self.ctx.db) + .await?; + + let mut cd_id_namespaces: HashMap>> = HashMap::new(); + for cnt in cd_namespace_tags { + if let Some(entry) = cd_id_namespaces.get_mut(&cnt.cd_id) { + if let Some(nsp_entry) = entry.get_mut(&cnt.namespace) { + nsp_entry.push(cnt.tag); + } else { + entry.insert(cnt.namespace, vec![cnt.tag]); + } + } else { + cd_id_namespaces.insert( + cnt.cd_id, + HashMap::from_iter(vec![(cnt.namespace, vec![cnt.tag])].into_iter()), + ); + } + } + + Ok(cd_id_namespaces) + } +} diff --git a/mediarepo-daemon/mediarepo-logic/src/dao/tag/mod.rs b/mediarepo-daemon/mediarepo-logic/src/dao/tag/mod.rs index 80fb2a24..7f38e23f 100644 --- a/mediarepo-daemon/mediarepo-logic/src/dao/tag/mod.rs +++ b/mediarepo-daemon/mediarepo-logic/src/dao/tag/mod.rs @@ -16,6 +16,7 @@ use crate::dto::{NamespaceDto, TagDto}; pub mod add; pub mod all_for_cds_map; pub mod by_name; +pub mod cdids_with_namespaced_tags; pub mod mappings; pub struct TagDao { diff --git a/mediarepo-daemon/mediarepo-socket/src/namespaces/files/sorting.rs b/mediarepo-daemon/mediarepo-socket/src/namespaces/files/sorting.rs index 5f56c5d6..f0526c7c 100644 --- a/mediarepo-daemon/mediarepo-socket/src/namespaces/files/sorting.rs +++ b/mediarepo-daemon/mediarepo-socket/src/namespaces/files/sorting.rs @@ -8,14 +8,11 @@ use rayon::iter::{IntoParallelRefIterator, ParallelIterator}; use mediarepo_core::error::RepoResult; use mediarepo_core::mediarepo_api::types::filtering::{SortDirection, SortKey}; -use mediarepo_database::queries::tags::{ - get_cids_with_namespaced_tags, get_content_descriptors_with_tag_count, -}; -use mediarepo_logic::dao::DaoProvider; +use mediarepo_database::queries::tags::get_content_descriptors_with_tag_count; use mediarepo_logic::dao::repo::Repo; +use mediarepo_logic::dao::DaoProvider; use mediarepo_logic::dto::{FileDto, FileMetadataDto}; - pub struct FileSortContext { name: Option, size: u64, @@ -50,12 +47,14 @@ async fn build_sort_context( repo: &Repo, files: &Vec, ) -> RepoResult> { - let hash_ids: Vec = files.par_iter().map(|f| f.cd_id()).collect(); + let cd_ids: Vec = files.par_iter().map(|f| f.cd_id()).collect(); let file_ids: Vec = files.par_iter().map(|f| f.id()).collect(); - let mut cid_nsp: HashMap>> = - get_cids_with_namespaced_tags(repo.db(), hash_ids.clone()).await?; - let mut cid_tag_counts = get_content_descriptors_with_tag_count(repo.db(), hash_ids).await?; + let mut cid_nsp: HashMap>> = repo + .tag() + .cdids_with_namespaced_tags(cd_ids.clone()) + .await?; + let mut cid_tag_counts = get_content_descriptors_with_tag_count(repo.db(), cd_ids).await?; let files_metadata = repo.file().all_metadata(file_ids).await?; From ed68b76a42a067b54cfbad5c3ffbd6069343a56b Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 10:58:51 +0100 Subject: [PATCH 03/18] Add sorting preset table definitions Signed-off-by: trivernis --- ...220205092929_add-sorting-preset-tables.sql | 20 +++++++++ .../mediarepo-database/src/entities/mod.rs | 3 ++ .../src/entities/sort_key.rs | 26 +++++++++++ .../src/entities/sorting_preset.rs | 27 ++++++++++++ .../src/entities/sorting_preset_key.rs | 44 +++++++++++++++++++ 5 files changed, 120 insertions(+) create mode 100644 mediarepo-daemon/mediarepo-database/migrations/20220205092929_add-sorting-preset-tables.sql create mode 100644 mediarepo-daemon/mediarepo-database/src/entities/sort_key.rs create mode 100644 mediarepo-daemon/mediarepo-database/src/entities/sorting_preset.rs create mode 100644 mediarepo-daemon/mediarepo-database/src/entities/sorting_preset_key.rs diff --git a/mediarepo-daemon/mediarepo-database/migrations/20220205092929_add-sorting-preset-tables.sql b/mediarepo-daemon/mediarepo-database/migrations/20220205092929_add-sorting-preset-tables.sql new file mode 100644 index 00000000..0f0faa46 --- /dev/null +++ b/mediarepo-daemon/mediarepo-database/migrations/20220205092929_add-sorting-preset-tables.sql @@ -0,0 +1,20 @@ +-- Add migration script here +CREATE TABLE sorting_presets ( + id INTEGER PRIMARY KEY AUTOINCREMENT +); + +CREATE TABLE sort_keys ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + key_type INTEGER NOT NULL DEFAULT 0, + ascending INTEGER NOT NULL CHECK (ascending IN (0, 1)), + value VARCHAR(128) +); + +CREATE TABLE sorting_preset_keys ( + preset_id INTEGER REFERENCES sorting_presets (id) ON DELETE CASCADE, + key_id INTEGER REFERENCES sort_keys (id), + key_index INTEGER NOT NULL DEFAULT 0, + PRIMARY KEY (preset_id, key_id) +); + +CREATE INDEX sorting_preset_index ON sorting_preset_keys (preset_id); \ No newline at end of file diff --git a/mediarepo-daemon/mediarepo-database/src/entities/mod.rs b/mediarepo-daemon/mediarepo-database/src/entities/mod.rs index 4b8acde1..3eee5ae3 100644 --- a/mediarepo-daemon/mediarepo-database/src/entities/mod.rs +++ b/mediarepo-daemon/mediarepo-database/src/entities/mod.rs @@ -4,5 +4,8 @@ pub mod content_descriptor_tag; pub mod file; pub mod file_metadata; pub mod namespace; +pub mod sort_key; +pub mod sorting_preset; +pub mod sorting_preset_key; pub mod source; pub mod tag; diff --git a/mediarepo-daemon/mediarepo-database/src/entities/sort_key.rs b/mediarepo-daemon/mediarepo-database/src/entities/sort_key.rs new file mode 100644 index 00000000..4ebdd1f0 --- /dev/null +++ b/mediarepo-daemon/mediarepo-database/src/entities/sort_key.rs @@ -0,0 +1,26 @@ +use sea_orm::prelude::*; + +#[derive(Clone, Debug, PartialEq, DeriveEntityModel)] +#[sea_orm(table_name = "sort_keys")] +pub struct Model { + #[sea_orm(primary_key)] + pub id: i32, + pub key_type: i32, + pub ascending: bool, + pub value: Option, +} + +#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] +pub enum Relation {} + +impl Related for Entity { + fn to() -> RelationDef { + super::sorting_preset_key::Relation::SortingPreset.def() + } + + fn via() -> Option { + Some(super::sorting_preset_key::Relation::SortingKey.def().rev()) + } +} + +impl ActiveModelBehavior for ActiveModel {} diff --git a/mediarepo-daemon/mediarepo-database/src/entities/sorting_preset.rs b/mediarepo-daemon/mediarepo-database/src/entities/sorting_preset.rs new file mode 100644 index 00000000..5bae84ba --- /dev/null +++ b/mediarepo-daemon/mediarepo-database/src/entities/sorting_preset.rs @@ -0,0 +1,27 @@ +use sea_orm::prelude::*; + +#[derive(Clone, Debug, PartialEq, DeriveEntityModel)] +#[sea_orm(table_name = "sorting_presets")] +pub struct Model { + #[sea_orm(primary_key)] + pub id: i32, +} + +#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] +pub enum Relation {} + +impl Related for Entity { + fn to() -> RelationDef { + super::sorting_preset_key::Relation::SortingKey.def() + } + + fn via() -> Option { + Some( + super::sorting_preset_key::Relation::SortingPreset + .def() + .rev(), + ) + } +} + +impl ActiveModelBehavior for ActiveModel {} diff --git a/mediarepo-daemon/mediarepo-database/src/entities/sorting_preset_key.rs b/mediarepo-daemon/mediarepo-database/src/entities/sorting_preset_key.rs new file mode 100644 index 00000000..43810319 --- /dev/null +++ b/mediarepo-daemon/mediarepo-database/src/entities/sorting_preset_key.rs @@ -0,0 +1,44 @@ +use sea_orm::entity::prelude::*; + +#[derive(Clone, Debug, PartialEq, DeriveEntityModel)] +#[sea_orm(table_name = "sorting_preset_keys")] +pub struct Model { + #[sea_orm(primary_key)] + preset_id: i32, + + #[sea_orm(primary_key)] + key_id: i32, + + key_index: i32, +} + +#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] +pub enum Relation { + #[sea_orm( + belongs_to = "super::sorting_preset::Entity" + from = "Column::PresetId", + to = "super::sorting_preset::Column::Id" + )] + SortingPreset, + + #[sea_orm( + belongs_to = "super::sort_key::Entity", + from = "Column::KeyId", + to = "super::sort_key::Column::Id" + )] + SortingKey, +} + +impl Related for Entity { + fn to() -> RelationDef { + Relation::SortingPreset.def() + } +} + +impl Related for Entity { + fn to() -> RelationDef { + Relation::SortingKey.def() + } +} + +impl ActiveModelBehavior for ActiveModel {} From 3e768d7c7c4fb8b8f7190bf4bf6c0ced494baace Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 11:24:54 +0100 Subject: [PATCH 04/18] Add sorting preset dto and function to retrieve all presets Signed-off-by: trivernis --- .../mediarepo-logic/src/dao/file/mod.rs | 16 +----- .../mediarepo-logic/src/dao/job/mod.rs | 20 ++------ .../mediarepo-logic/src/dao/mod.rs | 29 +++++++++++ .../src/dao/sorting_preset/mod.rs | 34 +++++++++++++ .../mediarepo-logic/src/dao/tag/mod.rs | 16 +----- .../mediarepo-logic/src/dto/mod.rs | 5 +- .../mediarepo-logic/src/dto/sorting_preset.rs | 49 +++++++++++++++++++ 7 files changed, 122 insertions(+), 47 deletions(-) create mode 100644 mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs create mode 100644 mediarepo-daemon/mediarepo-logic/src/dto/sorting_preset.rs diff --git a/mediarepo-daemon/mediarepo-logic/src/dao/file/mod.rs b/mediarepo-daemon/mediarepo-logic/src/dao/file/mod.rs index 210cf506..93f012cc 100644 --- a/mediarepo-daemon/mediarepo-logic/src/dao/file/mod.rs +++ b/mediarepo-daemon/mediarepo-logic/src/dao/file/mod.rs @@ -1,10 +1,10 @@ use sea_orm::prelude::*; use tokio::io::AsyncReadExt; +use crate::dao_provider; use mediarepo_core::error::RepoResult; use mediarepo_database::entities::{content_descriptor, file, file_metadata}; -use crate::dao::{DaoContext, DaoProvider}; use crate::dto::{FileDto, FileMetadataDto, ThumbnailDto}; pub mod add; @@ -12,21 +12,9 @@ pub mod delete; pub mod find; pub mod update; -pub struct FileDao { - ctx: DaoContext, -} - -impl DaoProvider for FileDao { - fn dao_ctx(&self) -> DaoContext { - self.ctx.clone() - } -} +dao_provider!(FileDao); impl FileDao { - pub fn new(ctx: DaoContext) -> Self { - Self { ctx } - } - #[tracing::instrument(level = "debug", skip(self))] pub async fn all(&self) -> RepoResult> { let files = file::Entity::find() diff --git a/mediarepo-daemon/mediarepo-logic/src/dao/job/mod.rs b/mediarepo-daemon/mediarepo-logic/src/dao/job/mod.rs index c47b28a8..16bace31 100644 --- a/mediarepo-daemon/mediarepo-logic/src/dao/job/mod.rs +++ b/mediarepo-daemon/mediarepo-logic/src/dao/job/mod.rs @@ -1,20 +1,6 @@ +use crate::dao_provider; + pub mod migrate_content_descriptors; pub mod sqlite_operations; -use crate::dao::{DaoContext, DaoProvider}; - -pub struct JobDao { - ctx: DaoContext, -} - -impl DaoProvider for JobDao { - fn dao_ctx(&self) -> DaoContext { - self.ctx.clone() - } -} - -impl JobDao { - pub fn new(ctx: DaoContext) -> JobDao { - Self { ctx } - } -} +dao_provider!(JobDao); diff --git a/mediarepo-daemon/mediarepo-logic/src/dao/mod.rs b/mediarepo-daemon/mediarepo-logic/src/dao/mod.rs index f3cf620f..84c5964e 100644 --- a/mediarepo-daemon/mediarepo-logic/src/dao/mod.rs +++ b/mediarepo-daemon/mediarepo-logic/src/dao/mod.rs @@ -5,13 +5,38 @@ use mediarepo_core::fs::thumbnail_store::ThumbnailStore; use crate::dao::file::FileDao; use crate::dao::job::JobDao; +use crate::dao::sorting_preset::SortingPresetDao; use crate::dao::tag::TagDao; pub mod file; pub mod job; pub mod repo; +pub mod sorting_preset; pub mod tag; +#[macro_export] +macro_rules! dao_provider { + ($name:ident) => { + use crate::dao::{DaoContext, DaoProvider}; + + pub struct $name { + ctx: DaoContext, + } + + impl DaoProvider for $name { + fn dao_ctx(&self) -> DaoContext { + self.ctx.clone() + } + } + + impl $name { + pub fn new(ctx: DaoContext) -> Self { + Self { ctx } + } + } + }; +} + #[derive(Clone)] pub struct DaoContext { pub db: DatabaseConnection, @@ -33,6 +58,10 @@ pub trait DaoProvider { fn job(&self) -> JobDao { JobDao::new(self.dao_ctx()) } + + fn sorting_preset(&self) -> SortingPresetDao { + SortingPresetDao::new(self.dao_ctx()) + } } fn opt_to_active_val>(opt: Option) -> ActiveValue { diff --git a/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs b/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs new file mode 100644 index 00000000..eb8f2418 --- /dev/null +++ b/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs @@ -0,0 +1,34 @@ +use crate::dao_provider; +use crate::dto::{SortKeyDto, SortingPresetDto}; +use mediarepo_core::error::RepoResult; +use mediarepo_database::entities::{sort_key, sorting_preset, sorting_preset_key}; +use sea_orm::prelude::*; +use sea_orm::{JoinType, QueryOrder, QuerySelect}; + +dao_provider!(SortingPresetDao); + +impl SortingPresetDao { + #[tracing::instrument(level = "debug", skip(self))] + pub async fn all(&self) -> RepoResult> { + let presets = sorting_preset::Entity::find() + .find_with_related(sort_key::Entity) + .join( + JoinType::InnerJoin, + sorting_preset_key::Relation::SortingKey.def(), + ) + .order_by_asc(sorting_preset_key::Column::KeyIndex) + .all(&self.ctx.db) + .await? + .into_iter() + .map(map_sorting_preset_dto) + .collect(); + + Ok(presets) + } +} + +fn map_sorting_preset_dto( + entry: (sorting_preset::Model, Vec), +) -> SortingPresetDto { + SortingPresetDto::new(entry.0, entry.1.into_iter().map(SortKeyDto::new).collect()) +} diff --git a/mediarepo-daemon/mediarepo-logic/src/dao/tag/mod.rs b/mediarepo-daemon/mediarepo-logic/src/dao/tag/mod.rs index 7f38e23f..c931f10f 100644 --- a/mediarepo-daemon/mediarepo-logic/src/dao/tag/mod.rs +++ b/mediarepo-daemon/mediarepo-logic/src/dao/tag/mod.rs @@ -10,7 +10,7 @@ use mediarepo_core::utils::parse_namespace_and_tag; use mediarepo_database::entities::{content_descriptor, content_descriptor_tag, namespace, tag}; use crate::dao::tag::by_name::TagByNameQuery; -use crate::dao::{DaoContext, DaoProvider}; +use crate::dao_provider; use crate::dto::{NamespaceDto, TagDto}; pub mod add; @@ -19,21 +19,9 @@ pub mod by_name; pub mod cdids_with_namespaced_tags; pub mod mappings; -pub struct TagDao { - ctx: DaoContext, -} - -impl DaoProvider for TagDao { - fn dao_ctx(&self) -> DaoContext { - self.ctx.clone() - } -} +dao_provider!(TagDao); impl TagDao { - pub fn new(ctx: DaoContext) -> Self { - Self { ctx } - } - #[tracing::instrument(level = "debug", skip(self))] pub async fn all(&self) -> RepoResult> { let tags = tag::Entity::find() diff --git a/mediarepo-daemon/mediarepo-logic/src/dto/mod.rs b/mediarepo-daemon/mediarepo-logic/src/dto/mod.rs index 0d7a9621..2444214d 100644 --- a/mediarepo-daemon/mediarepo-logic/src/dto/mod.rs +++ b/mediarepo-daemon/mediarepo-logic/src/dto/mod.rs @@ -1,12 +1,13 @@ pub use file::*; pub use file_metadata::*; pub use namespace::*; +pub use sorting_preset::*; pub use tag::*; pub use thumbnail::*; mod file; mod file_metadata; -mod tag; mod namespace; +mod sorting_preset; +mod tag; mod thumbnail; - diff --git a/mediarepo-daemon/mediarepo-logic/src/dto/sorting_preset.rs b/mediarepo-daemon/mediarepo-logic/src/dto/sorting_preset.rs new file mode 100644 index 00000000..462d9047 --- /dev/null +++ b/mediarepo-daemon/mediarepo-logic/src/dto/sorting_preset.rs @@ -0,0 +1,49 @@ +use mediarepo_database::entities::sort_key; +use mediarepo_database::entities::sorting_preset; + +#[derive(Clone, Debug)] +pub struct SortingPresetDto { + model: sorting_preset::Model, + keys: Vec, +} + +impl SortingPresetDto { + pub fn new(model: sorting_preset::Model, keys: Vec) -> Self { + Self { model, keys } + } + + pub fn id(&self) -> i32 { + self.model.id + } + + pub fn keys(&self) -> &Vec { + &self.keys + } +} + +#[derive(Clone, Debug)] +pub struct SortKeyDto { + model: sort_key::Model, +} + +impl SortKeyDto { + pub fn new(model: sort_key::Model) -> Self { + Self { model } + } + + pub fn id(&self) -> i32 { + self.model.id + } + + pub fn key_type(&self) -> i32 { + self.model.key_type + } + + pub fn ascending(&self) -> bool { + self.model.ascending + } + + pub fn value(&self) -> Option<&String> { + self.model.value.as_ref() + } +} From c34d9d564970370a6494d93a18ff02e4d67e3b69 Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 12:32:08 +0100 Subject: [PATCH 05/18] Add function to add sorting presets Signed-off-by: trivernis --- .../src/dao/sorting_preset/add.rs | 146 ++++++++++++++++++ .../src/dao/sorting_preset/mod.rs | 2 + .../mediarepo-logic/src/dto/sorting_preset.rs | 52 ++++++- 3 files changed, 198 insertions(+), 2 deletions(-) create mode 100644 mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/add.rs diff --git a/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/add.rs b/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/add.rs new file mode 100644 index 00000000..f8e51f69 --- /dev/null +++ b/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/add.rs @@ -0,0 +1,146 @@ +use crate::dao::sorting_preset::SortingPresetDao; +use crate::dto::{AddSortKeyDto, AddSortingPresetDto, SortKeyDto, SortingPresetDto}; +use mediarepo_core::error::RepoResult; +use mediarepo_database::entities::{sort_key, sorting_preset, sorting_preset_key}; +use sea_orm::prelude::*; +use sea_orm::ActiveValue::Set; +use sea_orm::{Condition, ConnectionTrait, DatabaseTransaction, JoinType, QuerySelect}; + +impl SortingPresetDao { + #[tracing::instrument(level = "debug", skip(self))] + pub async fn add(&self, preset: AddSortingPresetDto) -> RepoResult { + let trx = self.ctx.db.begin().await?; + let keys = add_keys(&trx, preset.keys).await?; + let key_ids = keys + .iter() + .enumerate() + .map(|(idx, key)| (idx, key.id())) + .collect::>(); + let condition = key_ids + .iter() + .cloned() + .map(create_mapping_condition) + .fold(Condition::any(), |acc, cond| acc.add(cond)); + let existing_preset: Option = sorting_preset::Entity::find() + .join( + JoinType::InnerJoin, + sorting_preset_key::Relation::SortingPreset.def().rev(), + ) + .filter(condition) + .one(&trx) + .await?; + if let Some(model) = existing_preset { + trx.commit().await?; + return Ok(SortingPresetDto::new(model, keys)); + } + let preset_model = sorting_preset::ActiveModel { + ..Default::default() + }; + let preset_model = preset_model.insert(&trx).await?; + let mapping_models = key_ids + .into_iter() + .map(|(idx, key)| sorting_preset_key::ActiveModel { + preset_id: Set(preset_model.id), + key_id: Set(key), + key_index: Set(idx as i32), + }) + .collect::>(); + sorting_preset_key::Entity::insert_many(mapping_models) + .exec(&trx) + .await?; + trx.commit().await?; + + Ok(SortingPresetDto::new(preset_model, keys)) + } +} + +async fn add_keys( + trx: &DatabaseTransaction, + mut keys: Vec, +) -> RepoResult> { + let mut key_dtos = find_sort_keys(trx, &keys).await?; + key_dtos.iter().for_each(|key| { + keys.retain(|k| { + k.ascending != key.ascending() + && Some(k.key_type) != key.key_type() + && key.value() != key.value() + }) + }); + + if !keys.is_empty() { + let active_models: Vec = keys + .iter() + .cloned() + .map(|key| sort_key::ActiveModel { + key_type: Set(key.key_type.to_number()), + ascending: Set(key.ascending), + value: Set(key.value), + ..Default::default() + }) + .collect(); + sort_key::Entity::insert_many(active_models) + .exec(trx) + .await?; + let mut new_keys = find_sort_keys(trx, &keys).await?; + key_dtos.append(&mut new_keys); + } + + let keys_original_order = keys + .into_iter() + .filter_map(|k| { + key_dtos + .iter() + .find(|key| { + k.ascending != key.ascending() + && Some(k.key_type) != key.key_type() + && key.value() != key.value() + }) + .cloned() + }) + .collect::>(); + + Ok(keys_original_order) +} + +async fn find_sort_keys( + trx: &DatabaseTransaction, + keys: &Vec, +) -> RepoResult> { + if keys.is_empty() { + return Ok(vec![]); + } + let condition = keys + .iter() + .cloned() + .map(create_sort_key_condition) + .fold(Condition::any(), |acc, cond| acc.add(cond)); + let keys = sort_key::Entity::find() + .filter(condition) + .all(trx) + .await? + .into_iter() + .map(SortKeyDto::new) + .collect(); + + Ok(keys) +} + +fn create_sort_key_condition(key: AddSortKeyDto) -> Condition { + let mut condition = Condition::all() + .add(sort_key::Column::KeyType.eq(key.key_type.to_number())) + .add(sort_key::Column::Ascending.eq(key.ascending)); + + if let Some(value) = key.value { + condition = condition.add(sort_key::Column::Value.eq(value)) + } else { + condition = condition.add(sort_key::Column::Value.is_null()) + } + + condition +} + +fn create_mapping_condition(entry: (usize, i32)) -> Condition { + Condition::all() + .add(sorting_preset_key::Column::KeyId.eq(entry.1)) + .add(sorting_preset_key::Column::KeyIndex.eq(entry.0 as i32)) +} diff --git a/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs b/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs index eb8f2418..9cfe7af7 100644 --- a/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs +++ b/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs @@ -1,3 +1,5 @@ +pub mod add; + use crate::dao_provider; use crate::dto::{SortKeyDto, SortingPresetDto}; use mediarepo_core::error::RepoResult; diff --git a/mediarepo-daemon/mediarepo-logic/src/dto/sorting_preset.rs b/mediarepo-daemon/mediarepo-logic/src/dto/sorting_preset.rs index 462d9047..df413d75 100644 --- a/mediarepo-daemon/mediarepo-logic/src/dto/sorting_preset.rs +++ b/mediarepo-daemon/mediarepo-logic/src/dto/sorting_preset.rs @@ -1,3 +1,7 @@ +use crate::dto::KeyType::{ + FileChangeTime, FileCreatedTime, FileImportedTime, FileName, FileSize, FileType, Namespace, + NumTags, +}; use mediarepo_database::entities::sort_key; use mediarepo_database::entities::sorting_preset; @@ -35,8 +39,8 @@ impl SortKeyDto { self.model.id } - pub fn key_type(&self) -> i32 { - self.model.key_type + pub fn key_type(&self) -> Option { + KeyType::from_number(self.model.key_type) } pub fn ascending(&self) -> bool { @@ -47,3 +51,47 @@ impl SortKeyDto { self.model.value.as_ref() } } + +#[derive(Clone, Copy, Debug, PartialOrd, PartialEq)] +pub enum KeyType { + Namespace = 0, + FileName = 1, + FileSize = 2, + FileImportedTime = 3, + FileCreatedTime = 4, + FileChangeTime = 5, + FileType = 6, + NumTags = 7, +} + +impl KeyType { + pub fn from_number(number: i32) -> Option { + match number { + 0 => Some(Namespace), + 1 => Some(FileName), + 2 => Some(FileSize), + 3 => Some(FileImportedTime), + 4 => Some(FileCreatedTime), + 5 => Some(FileChangeTime), + 6 => Some(FileType), + 7 => Some(NumTags), + _ => None, + } + } + + pub fn to_number(&self) -> i32 { + self.clone() as i32 + } +} + +#[derive(Clone, Debug)] +pub struct AddSortingPresetDto { + pub keys: Vec, +} + +#[derive(Clone, Debug)] +pub struct AddSortKeyDto { + pub key_type: KeyType, + pub ascending: bool, + pub value: Option, +} From 78a5780ff1aec2eb51a5ac5d16f6ba0f75081772 Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 12:39:39 +0100 Subject: [PATCH 06/18] Add function to delete sorting presets Signed-off-by: trivernis --- .../mediarepo-logic/src/dao/sorting_preset/mod.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs b/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs index 9cfe7af7..a265aa51 100644 --- a/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs +++ b/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs @@ -27,6 +27,16 @@ impl SortingPresetDao { Ok(presets) } + + #[tracing::instrument(level = "debug", skip(self))] + pub async fn delete(&self, id: i32) -> RepoResult<()> { + sorting_preset::Entity::delete_many() + .filter(sorting_preset::Column::Id.eq(id)) + .exec(&self.ctx.db) + .await?; + + Ok(()) + } } fn map_sorting_preset_dto( From d22c7499f782aff57880f18fd77daae4ab7ca26f Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 14:17:11 +0100 Subject: [PATCH 07/18] Add api to manage sorting presets Signed-off-by: trivernis --- mediarepo-api/Cargo.toml | 38 ++++++------- mediarepo-api/src/client_api/mod.rs | 5 ++ mediarepo-api/src/client_api/preset.rs | 54 +++++++++++++++++++ .../src/tauri_plugin/commands/mod.rs | 2 + .../src/tauri_plugin/commands/preset.rs | 27 ++++++++++ mediarepo-api/src/tauri_plugin/mod.rs | 5 +- mediarepo-api/src/types/filtering.rs | 6 +++ 7 files changed, 117 insertions(+), 20 deletions(-) create mode 100644 mediarepo-api/src/client_api/preset.rs create mode 100644 mediarepo-api/src/tauri_plugin/commands/preset.rs diff --git a/mediarepo-api/Cargo.toml b/mediarepo-api/Cargo.toml index 5a8a80e6..522a42f5 100644 --- a/mediarepo-api/Cargo.toml +++ b/mediarepo-api/Cargo.toml @@ -1,52 +1,52 @@ [package] name = "mediarepo-api" -version = "0.28.0" +version = "0.28.1" edition = "2018" license = "gpl-3" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tracing = "^0.1.29" -thiserror = "^1.0.30" -async-trait = {version = "^0.1.52", optional=true} -parking_lot = {version="^0.11.2", optional=true} -serde_json = {version="^1.0.73", optional=true} -directories = {version="^4.0.1", optional=true} -mime_guess = {version = "^2.0.3", optional=true} -serde_piecewise_default = "^0.2.0" -futures = {version = "^0.3.19", optional=true} -url = {version = "^2.2.2", optional=true } -pathsearch = {version="^0.2.0", optional=true} +tracing = "0.1.30" +thiserror = "1.0.30" +async-trait = { version = "0.1.52", optional = true } +parking_lot = { version = "0.12.0", optional = true } +serde_json = { version = "1.0.78", optional = true } +directories = { version = "4.0.1", optional = true } +mime_guess = { version = "2.0.3", optional = true } +serde_piecewise_default = "0.2.0" +futures = { version = "0.3.19", optional = true } +url = { version = "2.2.2", optional = true } +pathsearch = { version = "0.2.0", optional = true } [dependencies.bromine] -version = "^0.17.1" +version = "0.17.1" optional = true features = ["serialize_bincode"] [dependencies.serde] -version = "^1.0.132" +version = "1.0.136" features = ["serde_derive"] [dependencies.chrono] -version = "^0.4.19" +version = "0.4.19" features = ["serde"] [dependencies.tauri] -version = "^1.0.0-beta.8" +version = "1.0.0-beta.8" optional=true default-features = false features = [] [dependencies.tokio] -version = "^1.15.0" +version = "1.16.1" optional = true features = ["sync", "fs", "net", "io-util", "io-std", "time", "rt", "process"] [dependencies.toml] -version = "^0.5.8" +version = "0.5.8" optional = true [features] tauri-plugin = ["client-api","tauri", "parking_lot", "serde_json", "tokio", "toml", "directories", "mime_guess", "futures", "url"] -client-api = ["bromine", "async-trait", "tokio", "pathsearch"] \ No newline at end of file +client-api = ["bromine", "async-trait", "tokio", "pathsearch"] diff --git a/mediarepo-api/src/client_api/mod.rs b/mediarepo-api/src/client_api/mod.rs index c3fbf2f4..3dfbcab7 100644 --- a/mediarepo-api/src/client_api/mod.rs +++ b/mediarepo-api/src/client_api/mod.rs @@ -4,6 +4,7 @@ pub mod job; pub mod protocol; pub mod repo; pub mod tag; +pub mod preset; use crate::client_api::error::{ApiError, ApiResult}; use crate::client_api::file::FileApi; @@ -15,6 +16,7 @@ use async_trait::async_trait; use bromine::ipc::stream_emitter::EmitMetadata; use bromine::prelude::*; use tokio::time::Duration; +use crate::client_api::preset::PresetApi; #[async_trait] pub trait IPCApi { @@ -48,6 +50,7 @@ pub struct ApiClient { pub tag: TagApi, pub repo: RepoApi, pub job: JobApi, + pub preset: PresetApi, } impl Clone for ApiClient { @@ -58,6 +61,7 @@ impl Clone for ApiClient { tag: self.tag.clone(), repo: self.repo.clone(), job: self.job.clone(), + preset: self.preset.clone(), } } } @@ -70,6 +74,7 @@ impl ApiClient { tag: TagApi::new(ctx.clone()), repo: RepoApi::new(ctx.clone()), job: JobApi::new(ctx.clone()), + preset: PresetApi::new(ctx.clone()), ctx, } } diff --git a/mediarepo-api/src/client_api/preset.rs b/mediarepo-api/src/client_api/preset.rs new file mode 100644 index 00000000..f62e0fc9 --- /dev/null +++ b/mediarepo-api/src/client_api/preset.rs @@ -0,0 +1,54 @@ +use std::time::Duration; +use bromine::prelude::*; +use crate::client_api::error::ApiResult; +use crate::types::filtering::{SortingPreset, SortKey}; +use super::IPCApi; + +#[derive(Clone)] +pub struct PresetApi { + ctx: PooledContext, +} + +impl IPCApi for PresetApi { + fn namespace() -> &'static str { + "presets" + } + + fn ctx(&self) -> PoolGuard { + self.ctx.acquire() + } +} + +impl PresetApi { + pub fn new(ctx: PooledContext) -> Self { + Self { ctx } + } + + /// Returns all sorting presets of the repository + #[tracing::instrument(level = "debug", skip(self))] + pub async fn all_sorting_presets(&self) -> ApiResult> { + self.emit_and_get( + "sorting_presets", + (), + Some(Duration::from_secs(1)) + ) + .await + } + + /// Adds a new sorting preset with the given keys + #[tracing::instrument(level = "debug", skip(self))] + pub async fn add_sorting_preset(&self, keys: Vec) -> ApiResult { + self.emit_and_get( + "add_sorting_preset", + keys, + Some(Duration::from_secs(1)) + ) + .await + } + + /// Deletes a given sorting preset by id + #[tracing::instrument(level = "debug", skip(self))] + pub async fn delete_sorting_preset(&self, id: i32) -> ApiResult<()> { + self.emit_and_get("delete_sorting_preset", id, Some(Duration::from_secs(1))).await + } +} diff --git a/mediarepo-api/src/tauri_plugin/commands/mod.rs b/mediarepo-api/src/tauri_plugin/commands/mod.rs index bd6a2597..c06b7c88 100644 --- a/mediarepo-api/src/tauri_plugin/commands/mod.rs +++ b/mediarepo-api/src/tauri_plugin/commands/mod.rs @@ -5,6 +5,7 @@ pub use file::*; pub use job::*; pub use repo::*; pub use tag::*; +pub use preset::*; use crate::tauri_plugin::state::{ApiState, AppState, BufferState}; @@ -13,6 +14,7 @@ pub mod file; pub mod job; pub mod repo; pub mod tag; +pub mod preset; pub type ApiAccess<'a> = State<'a, ApiState>; pub type AppAccess<'a> = State<'a, AppState>; diff --git a/mediarepo-api/src/tauri_plugin/commands/preset.rs b/mediarepo-api/src/tauri_plugin/commands/preset.rs new file mode 100644 index 00000000..8bdb206f --- /dev/null +++ b/mediarepo-api/src/tauri_plugin/commands/preset.rs @@ -0,0 +1,27 @@ +use crate::tauri_plugin::commands::ApiAccess; +use crate::tauri_plugin::error::PluginResult; +use crate::types::filtering::{SortingPreset, SortKey}; + +#[tauri::command] +pub async fn all_sorting_presets(api_state: ApiAccess<'_>) -> PluginResult> { + let api = api_state.api().await?; + let presets = api.preset.all_sorting_presets().await?; + + Ok(presets) +} + +#[tauri::command] +pub async fn add_sorting_preset(api_state: ApiAccess<'_>, sort_keys: Vec) -> PluginResult { + let api = api_state.api().await?; + let preset = api.preset.add_sorting_preset(sort_keys).await?; + + Ok(preset) +} + +#[tauri::command] +pub async fn delete_sorting_preset(api_state: ApiAccess<'_>, id: i32) -> PluginResult<()> { + let api = api_state.api().await?; + api.preset.delete_sorting_preset(id).await?; + + Ok(()) +} \ No newline at end of file diff --git a/mediarepo-api/src/tauri_plugin/mod.rs b/mediarepo-api/src/tauri_plugin/mod.rs index 37e11c67..7a570a7a 100644 --- a/mediarepo-api/src/tauri_plugin/mod.rs +++ b/mediarepo-api/src/tauri_plugin/mod.rs @@ -70,7 +70,10 @@ impl MediarepoPlugin { run_job, update_file_status, delete_file, - get_file_tag_map + get_file_tag_map, + all_sorting_presets, + add_sorting_preset, + delete_sorting_preset ]), } } diff --git a/mediarepo-api/src/types/filtering.rs b/mediarepo-api/src/types/filtering.rs index 916db73f..3ffca1e4 100644 --- a/mediarepo-api/src/types/filtering.rs +++ b/mediarepo-api/src/types/filtering.rs @@ -71,3 +71,9 @@ pub enum SortDirection { } impl Eq for SortDirection {} + +#[derive(Clone, Debug, Serialize, Deserialize)] +pub struct SortingPreset { + pub id: i32, + pub keys: Vec, +} \ No newline at end of file From 5aadd9c24569230f2991b04a10de0804808bbe64 Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 14:50:37 +0100 Subject: [PATCH 08/18] Add api implementation for sorting presets Signed-off-by: trivernis --- mediarepo-daemon/Cargo.lock | 157 ++++++++++++------ mediarepo-daemon/Cargo.toml | 26 +-- mediarepo-daemon/mediarepo-core/Cargo.toml | 38 ++--- .../mediarepo-database/Cargo.toml | 10 +- mediarepo-daemon/mediarepo-logic/Cargo.toml | 20 +-- .../mediarepo-logic/src/dto/sorting_preset.rs | 4 + mediarepo-daemon/mediarepo-socket/Cargo.toml | 18 +- .../mediarepo-socket/src/from_model.rs | 45 ++++- .../mediarepo-socket/src/namespaces/mod.rs | 2 + .../src/namespaces/presets.rs | 116 +++++++++++++ 10 files changed, 324 insertions(+), 112 deletions(-) create mode 100644 mediarepo-daemon/mediarepo-socket/src/namespaces/presets.rs diff --git a/mediarepo-daemon/Cargo.lock b/mediarepo-daemon/Cargo.lock index c095862c..b4dee040 100644 --- a/mediarepo-daemon/Cargo.lock +++ b/mediarepo-daemon/Cargo.lock @@ -216,23 +216,23 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blake2b_simd" -version = "0.5.11" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec 0.7.2", "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "0.5.11" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" +checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec 0.7.2", "constant_time_eq", ] @@ -255,15 +255,17 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", "generic-array", ] [[package]] -name = "block-padding" -version = "0.2.1" +name = "block-buffer" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +checksum = "03588e54c62ae6d763e2a80090d50353b785795361b4ff5b3bf0a5097fc31c0b" +dependencies = [ + "generic-array", +] [[package]] name = "bromine" @@ -407,9 +409,9 @@ dependencies = [ [[package]] name = "console-api" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f67643a7d716307ad10b3e3aef02826382acbe349a3e7605ac57556148bc87" +checksum = "cc347c19eb5b940f396ac155822caee6662f850d97306890ac3773ed76c90c5a" dependencies = [ "prost", "prost-types", @@ -462,6 +464,15 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +[[package]] +name = "core2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] + [[package]] name = "cpufeatures" version = "0.2.1" @@ -502,7 +513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.6", + "crossbeam-utils 0.8.7", ] [[package]] @@ -513,17 +524,17 @@ checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", - "crossbeam-utils 0.8.6", + "crossbeam-utils 0.8.7", ] [[package]] name = "crossbeam-epoch" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762" +checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.6", + "crossbeam-utils 0.8.7", "lazy_static", "memoffset", "scopeguard", @@ -531,12 +542,12 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b979d76c9fcb84dffc80a73f7290da0f83e4c95773494674cb44b76d13a7a110" +checksum = "4dd435b205a4842da59efd07628f921c096bc1cc0a156835b4fa0bcb9a19bcce" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.6", + "crossbeam-utils 0.8.7", ] [[package]] @@ -552,14 +563,23 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" +checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6" dependencies = [ "cfg-if 1.0.0", "lazy_static", ] +[[package]] +name = "crypto-common" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" +dependencies = [ + "generic-array", +] + [[package]] name = "data-encoding" version = "2.3.2" @@ -613,6 +633,17 @@ dependencies = [ "generic-array", ] +[[package]] +name = "digest" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" +dependencies = [ + "block-buffer 0.10.1", + "crypto-common", + "generic-array", +] + [[package]] name = "dotenv" version = "0.15.0" @@ -1329,7 +1360,7 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "mediarepo-api" -version = "0.28.0" +version = "0.28.1" dependencies = [ "bromine", "chrono", @@ -1513,26 +1544,26 @@ dependencies = [ [[package]] name = "multihash" -version = "0.15.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e540106213dc639fe2b632a7d9e3525169ef081378a7c2da4457b84fec44c0" +checksum = "7392bffd88bc0c4f8297e36a777ab9f80b7127409c4a1acb8fee99c9f27addcd" dependencies = [ "blake2b_simd", "blake2s_simd", "blake3", - "digest", - "generic-array", + "core2", + "digest 0.10.1", "multihash-derive", - "sha2", + "sha2 0.10.1", "sha3", "unsigned-varint", ] [[package]] name = "multihash-derive" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" +checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ "proc-macro-crate", "proc-macro-error", @@ -2048,7 +2079,7 @@ checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ "crossbeam-channel", "crossbeam-deque", - "crossbeam-utils 0.8.6", + "crossbeam-utils 0.8.7", "lazy_static", "num_cpus", ] @@ -2251,9 +2282,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fed7948b6c68acbb6e20c334f55ad635dc0f75506963de4464289fbd3b051ac" +checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" dependencies = [ "bitflags", "core-foundation", @@ -2264,9 +2295,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57321bf8bc2362081b2599912d2961fe899c0efadf1b4b2f8d48b3e253bb96c" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" dependencies = [ "core-foundation-sys", "libc", @@ -2350,23 +2381,32 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] +[[package]] +name = "sha2" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.1", +] + [[package]] name = "sha3" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" +checksum = "31f935e31cf406e8c0e96c2815a5516181b7004ae8c5f296293221e9b1e356bd" dependencies = [ - "block-buffer", - "digest", + "digest 0.10.1", "keccak", - "opaque-debug", ] [[package]] @@ -2460,7 +2500,7 @@ dependencies = [ "crc", "crossbeam-channel", "crossbeam-queue", - "crossbeam-utils 0.8.6", + "crossbeam-utils 0.8.7", "either", "flume", "futures-channel", @@ -2483,7 +2523,7 @@ dependencies = [ "rust_decimal", "serde 1.0.136", "serde_json", - "sha2", + "sha2 0.9.9", "smallvec", "sqlformat", "sqlx-rt", @@ -2507,7 +2547,7 @@ dependencies = [ "proc-macro2 1.0.36", "quote 1.0.15", "serde_json", - "sha2", + "sha2 0.9.9", "sqlx-core", "sqlx-rt", "syn 1.0.86", @@ -2921,9 +2961,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "2d8d93354fe2a8e50d5953f5ae2e47a3fc2ef03292e7ea46e3cc38f549525fb9" dependencies = [ "cfg-if 1.0.0", "log", @@ -2945,9 +2985,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716" dependencies = [ "proc-macro2 1.0.36", "quote 1.0.15", @@ -2956,11 +2996,12 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" dependencies = [ "lazy_static", + "valuable", ] [[package]] @@ -2998,9 +3039,9 @@ dependencies = [ [[package]] name = "tracing-serde" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" dependencies = [ "serde 1.0.136", "tracing-core", @@ -3008,9 +3049,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5312f325fe3588e277415f5a6cca1f4ccad0f248c4cd5a4bd33032d7286abc22" +checksum = "74786ce43333fcf51efe947aed9718fbe46d5c7328ec3f1029e818083966d9aa" dependencies = [ "ansi_term", "lazy_static", @@ -3127,6 +3168,12 @@ dependencies = [ "serde 1.0.136", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" diff --git a/mediarepo-daemon/Cargo.toml b/mediarepo-daemon/Cargo.toml index f97dc998..b4fce69e 100644 --- a/mediarepo-daemon/Cargo.toml +++ b/mediarepo-daemon/Cargo.toml @@ -16,17 +16,17 @@ name = "mediarepo-daemon" path = "src/main.rs" [dependencies] -tracing = "^0.1.29" -toml = "^0.5.8" -structopt ="^0.3.26" -glob = "^0.3.0" -tracing-flame = "^0.2.0" -tracing-appender = "^0.2.0" -tracing-log = "^0.1.2" -rolling-file = "^0.1.0" -num-integer = "^0.1.44" -console-subscriber = "^0.1.1" -log = "^0.4.14" +tracing = "0.1.30" +toml = "0.5.8" +structopt = "0.3.26" +glob = "0.3.0" +tracing-flame = "0.2.0" +tracing-appender = "0.2.0" +tracing-log = "0.1.2" +rolling-file = "0.1.0" +num-integer = "0.1.44" +console-subscriber = "0.1.1" +log = "0.4.14" [dependencies.mediarepo-core] path = "./mediarepo-core" @@ -42,9 +42,9 @@ version = "1.16.1" features = ["macros", "rt-multi-thread", "io-std", "io-util"] [dependencies.tracing-subscriber] -version="0.3.7" +version= "0.3.8" features = ["env-filter", "ansi", "json"] [features] default = ["ffmpeg"] -ffmpeg = ["mediarepo-core/ffmpeg", "mediarepo-logic/ffmpeg"] \ No newline at end of file +ffmpeg = ["mediarepo-core/ffmpeg", "mediarepo-logic/ffmpeg"] diff --git a/mediarepo-daemon/mediarepo-core/Cargo.toml b/mediarepo-daemon/mediarepo-core/Cargo.toml index 89603100..75034c60 100644 --- a/mediarepo-daemon/mediarepo-core/Cargo.toml +++ b/mediarepo-daemon/mediarepo-core/Cargo.toml @@ -7,39 +7,39 @@ workspace = ".." # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -thiserror = "^1.0.30" -multihash = "^0.15.0" -multibase = "^0.9.1" -base64 = "^0.13.0" -toml = "^0.5.8" -serde = "^1.0.136" -typemap_rev = "^0.1.5" -futures = "^0.3.19" -itertools = "^0.10.3" -glob = "^0.3.0" -tracing = "^0.1.29" -data-encoding = "^2.3.2" -tokio-graceful-shutdown = "^0.4.3" +thiserror = "1.0.30" +multihash = "0.16.1" +multibase = "0.9.1" +base64 = "0.13.0" +toml = "0.5.8" +serde = "1.0.136" +typemap_rev = "0.1.5" +futures = "0.3.19" +itertools = "0.10.3" +glob = "0.3.0" +tracing = "0.1.30" +data-encoding = "2.3.2" +tokio-graceful-shutdown = "0.4.3" [dependencies.thumbnailer] -version = "^0.3" +version = "0.3.0" default-features = false [dependencies.sea-orm] -version = "^0.5.0" +version = "0.5.0" default-features = false [dependencies.sqlx] -version = "^0.5.10" +version = "0.5.10" default-features = false features = ["migrate"] [dependencies.tokio] -version = "^1.16.1" +version = "1.16.1" features = ["fs", "io-util", "io-std"] [dependencies.config] -version = "^0.11.0" +version = "0.11.0" features = ["toml"] [dependencies.mediarepo-api] @@ -48,4 +48,4 @@ features = ["bromine"] [features] default = [] -ffmpeg = ["thumbnailer/ffmpeg"] \ No newline at end of file +ffmpeg = ["thumbnailer/ffmpeg"] diff --git a/mediarepo-daemon/mediarepo-database/Cargo.toml b/mediarepo-daemon/mediarepo-database/Cargo.toml index 4a2e6700..1e79ee4c 100644 --- a/mediarepo-daemon/mediarepo-database/Cargo.toml +++ b/mediarepo-daemon/mediarepo-database/Cargo.toml @@ -7,17 +7,17 @@ workspace = ".." # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -chrono = "^0.4.19" -tracing = "^0.1.29" +chrono = "0.4.19" +tracing = "0.1.30" [dependencies.mediarepo-core] path = "../mediarepo-core" [dependencies.sqlx] -version = "^0.5.10" +version = "0.5.10" features = ["migrate"] [dependencies.sea-orm] -version = "^0.5.0" +version = "0.5.0" features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros", "debug-print"] -default-features = false \ No newline at end of file +default-features = false diff --git a/mediarepo-daemon/mediarepo-logic/Cargo.toml b/mediarepo-daemon/mediarepo-logic/Cargo.toml index ca502336..08a02e6d 100644 --- a/mediarepo-daemon/mediarepo-logic/Cargo.toml +++ b/mediarepo-daemon/mediarepo-logic/Cargo.toml @@ -7,13 +7,13 @@ workspace = ".." # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -chrono = "^0.4.19" -typemap_rev = "^0.1.5" -serde = "^1.0.136" -mime_guess = "^2.0.3" -mime = "^0.3.16" -tracing = "^0.1.29" -async-trait = "^0.1.52" +chrono = "0.4.19" +typemap_rev = "0.1.5" +serde = "1.0.136" +mime_guess = "2.0.3" +mime = "0.3.16" +tracing = "0.1.30" +async-trait = "0.1.52" [dependencies.mediarepo-core] path = "../mediarepo-core" @@ -22,14 +22,14 @@ path = "../mediarepo-core" path = "../mediarepo-database" [dependencies.sea-orm] -version = "^0.5.0-rc.1" +version = "0.5.0" features = ["runtime-tokio-native-tls", "macros"] default-features = false [dependencies.tokio] -version = "^1.15.0" +version = "1.16.1" features = ["fs", "io-std", "io-util"] [features] -ffmpeg = ["mediarepo-core/ffmpeg"] \ No newline at end of file +ffmpeg = ["mediarepo-core/ffmpeg"] diff --git a/mediarepo-daemon/mediarepo-logic/src/dto/sorting_preset.rs b/mediarepo-daemon/mediarepo-logic/src/dto/sorting_preset.rs index df413d75..f83eef42 100644 --- a/mediarepo-daemon/mediarepo-logic/src/dto/sorting_preset.rs +++ b/mediarepo-daemon/mediarepo-logic/src/dto/sorting_preset.rs @@ -23,6 +23,10 @@ impl SortingPresetDto { pub fn keys(&self) -> &Vec { &self.keys } + + pub fn into_keys(self) -> Vec { + self.keys + } } #[derive(Clone, Debug)] diff --git a/mediarepo-daemon/mediarepo-socket/Cargo.toml b/mediarepo-daemon/mediarepo-socket/Cargo.toml index 2c56382d..9f380304 100644 --- a/mediarepo-daemon/mediarepo-socket/Cargo.toml +++ b/mediarepo-daemon/mediarepo-socket/Cargo.toml @@ -7,11 +7,11 @@ workspace = ".." # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde = "^1.0.136" -tracing = "^0.1.29" -compare = "^0.1.0" -port_check = "^0.1.5" -rayon = "^1.5.1" +serde = "1.0.136" +tracing = "0.1.30" +compare = "0.1.0" +port_check = "0.1.5" +rayon = "1.5.1" [dependencies.mediarepo-core] path = "../mediarepo-core" @@ -23,13 +23,13 @@ path = "../mediarepo-database" path = "../mediarepo-logic" [dependencies.tokio] -version = "^1.16.1" +version = "1.16.1" features = ["net"] [dependencies.chrono] -version = "^0.4.19" +version = "0.4.19" features = ["serde"] [dependencies.tracing-futures] -version = "^0.2.5" -features = ["tokio-executor"] \ No newline at end of file +version = "0.2.5" +features = ["tokio-executor"] diff --git a/mediarepo-daemon/mediarepo-socket/src/from_model.rs b/mediarepo-daemon/mediarepo-socket/src/from_model.rs index eeffd64e..bf101e90 100644 --- a/mediarepo-daemon/mediarepo-socket/src/from_model.rs +++ b/mediarepo-daemon/mediarepo-socket/src/from_model.rs @@ -1,9 +1,13 @@ use mediarepo_core::mediarepo_api::types::files::{ FileBasicDataResponse, FileMetadataResponse, FileStatus, ThumbnailMetadataResponse, }; +use mediarepo_core::mediarepo_api::types::filtering::{ + SortDirection, SortKey, SortNamespace, SortingPreset, +}; use mediarepo_core::mediarepo_api::types::tags::{NamespaceResponse, TagResponse}; use mediarepo_logic::dto::{ - FileDto, FileMetadataDto, FileStatus as FileStatusModel, NamespaceDto, TagDto, ThumbnailDto, + FileDto, FileMetadataDto, FileStatus as FileStatusModel, KeyType, NamespaceDto, SortKeyDto, + SortingPresetDto, TagDto, ThumbnailDto, }; pub trait FromModel { @@ -73,3 +77,42 @@ impl FromModel for NamespaceResponse { } } } + +impl FromModel for SortingPreset { + fn from_model(model: SortingPresetDto) -> Self { + SortingPreset { + id: model.id(), + keys: model + .into_keys() + .into_iter() + .filter_map(map_sort_dto_to_key) + .collect(), + } + } +} + +fn map_sort_dto_to_key(dto: SortKeyDto) -> Option { + let direction = map_direction(dto.ascending()); + + match dto.key_type()? { + KeyType::Namespace => Some(SortKey::Namespace(SortNamespace { + name: dto.value()?.to_owned(), + direction, + })), + KeyType::FileName => Some(SortKey::FileName(direction)), + KeyType::FileSize => Some(SortKey::FileSize(direction)), + KeyType::FileImportedTime => Some(SortKey::FileImportedTime(direction)), + KeyType::FileCreatedTime => Some(SortKey::FileCreatedTime(direction)), + KeyType::FileChangeTime => Some(SortKey::FileChangeTime(direction)), + KeyType::FileType => Some(SortKey::FileType(direction)), + KeyType::NumTags => Some(SortKey::NumTags(direction)), + } +} + +fn map_direction(ascending: bool) -> SortDirection { + if ascending { + SortDirection::Ascending + } else { + SortDirection::Descending + } +} diff --git a/mediarepo-daemon/mediarepo-socket/src/namespaces/mod.rs b/mediarepo-daemon/mediarepo-socket/src/namespaces/mod.rs index 38179720..164ad5f5 100644 --- a/mediarepo-daemon/mediarepo-socket/src/namespaces/mod.rs +++ b/mediarepo-daemon/mediarepo-socket/src/namespaces/mod.rs @@ -3,6 +3,7 @@ use mediarepo_core::bromine::{namespace, namespace::Namespace, IPCBuilder}; pub mod files; pub mod jobs; +pub mod presets; pub mod repo; pub mod tags; @@ -12,4 +13,5 @@ pub fn build_namespaces(builder: IPCBuilder) .add_namespace(namespace!(tags::TagsNamespace)) .add_namespace(namespace!(repo::RepoNamespace)) .add_namespace(namespace!(jobs::JobsNamespace)) + .add_namespace(namespace!(presets::PresetsNamespace)) } diff --git a/mediarepo-daemon/mediarepo-socket/src/namespaces/presets.rs b/mediarepo-daemon/mediarepo-socket/src/namespaces/presets.rs new file mode 100644 index 00000000..1e2ad3ce --- /dev/null +++ b/mediarepo-daemon/mediarepo-socket/src/namespaces/presets.rs @@ -0,0 +1,116 @@ +use crate::from_model::FromModel; +use crate::utils::get_repo_from_context; +use mediarepo_core::bromine::prelude::*; +use mediarepo_core::mediarepo_api::types::filtering::{SortDirection, SortKey, SortingPreset}; +use mediarepo_logic::dao::DaoProvider; +use mediarepo_logic::dto::{AddSortKeyDto, AddSortingPresetDto, KeyType}; + +pub struct PresetsNamespace; + +impl NamespaceProvider for PresetsNamespace { + fn name() -> &'static str { + "presets" + } + + fn register(handler: &mut EventHandler) { + events!(handler, + "all_sorting_presets" => Self::all_sorting_presets, + "add_sorting_preset" => Self::add_sorting_preset, + "delete_sorting_preset" => Self::delete_sorting_preset + ); + } +} + +impl PresetsNamespace { + #[tracing::instrument(skip_all)] + pub async fn all_sorting_presets(ctx: &Context, _: Event) -> IPCResult<()> { + let repo = get_repo_from_context(ctx).await; + let sorting_presets: Vec = repo + .sorting_preset() + .all() + .await? + .into_iter() + .map(SortingPreset::from_model) + .collect(); + ctx.emit_to(Self::name(), "all_sorting_presets", sorting_presets) + .await?; + + Ok(()) + } + + #[tracing::instrument(skip_all)] + pub async fn add_sorting_preset(ctx: &Context, event: Event) -> IPCResult<()> { + let keys = event + .payload::>()? + .into_iter() + .map(sort_key_to_add_dto) + .collect(); + let repo = get_repo_from_context(ctx).await; + let preset = repo + .sorting_preset() + .add(AddSortingPresetDto { keys }) + .await?; + ctx.emit_to( + Self::name(), + "add_sorting_preset", + SortingPreset::from_model(preset), + ) + .await?; + + Ok(()) + } + + #[tracing::instrument(skip_all)] + pub async fn delete_sorting_preset(ctx: &Context, event: Event) -> IPCResult<()> { + let id = event.payload::()?; + let repo = get_repo_from_context(ctx).await; + repo.sorting_preset().delete(id).await?; + + Ok(()) + } +} + +fn sort_key_to_add_dto(key: SortKey) -> AddSortKeyDto { + match key { + SortKey::Namespace(namespace) => AddSortKeyDto { + ascending: namespace.direction == SortDirection::Ascending, + key_type: KeyType::Namespace, + value: Some(namespace.name), + }, + SortKey::FileName(dir) => AddSortKeyDto { + ascending: dir == SortDirection::Ascending, + key_type: KeyType::FileName, + value: None, + }, + SortKey::FileSize(dir) => AddSortKeyDto { + ascending: dir == SortDirection::Ascending, + key_type: KeyType::FileSize, + value: None, + }, + SortKey::FileImportedTime(dir) => AddSortKeyDto { + ascending: dir == SortDirection::Ascending, + key_type: KeyType::FileImportedTime, + value: None, + }, + SortKey::FileCreatedTime(dir) => AddSortKeyDto { + ascending: dir == SortDirection::Ascending, + key_type: KeyType::FileCreatedTime, + value: None, + }, + SortKey::FileChangeTime(dir) => AddSortKeyDto { + ascending: dir == SortDirection::Ascending, + key_type: KeyType::FileChangeTime, + value: None, + }, + SortKey::FileType(dir) => AddSortKeyDto { + ascending: dir == SortDirection::Ascending, + key_type: KeyType::FileType, + value: None, + }, + SortKey::NumTags(dir) => AddSortKeyDto { + ascending: dir == SortDirection::Ascending, + key_type: KeyType::NumTags, + value: None, + }, + } +} From c0dca663b0c5c4a8df3a7353d0bc05b9109018fd Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 15:37:17 +0100 Subject: [PATCH 09/18] Refactor SortKey to store backend representation internally Signed-off-by: trivernis --- mediarepo-ui/src-tauri/Cargo.lock | 141 +++++++++++++----- mediarepo-ui/src-tauri/Cargo.toml | 14 +- mediarepo-ui/src/api/Api.ts | 15 ++ mediarepo-ui/src/api/api-types/files.ts | 2 +- mediarepo-ui/src/api/api-types/functions.ts | 4 + mediarepo-ui/src/api/api-types/presets.ts | 6 + mediarepo-ui/src/api/api-types/requests.ts | 14 +- mediarepo-ui/src/api/models/SortKey.ts | 106 +++++++++++++ mediarepo-ui/src/api/models/SortingPreset.ts | 20 +++ .../file-search/file-search.component.ts | 8 +- .../sort-dialog/sort-dialog.component.ts | 5 +- mediarepo-ui/src/app/models/SortKey.ts | 35 ----- mediarepo-ui/src/app/models/TabState.ts | 16 +- .../src/app/services/file/file.service.ts | 4 +- .../services/preset/preset.service.spec.ts | 16 ++ .../src/app/services/preset/preset.service.ts | 17 +++ 16 files changed, 323 insertions(+), 100 deletions(-) create mode 100644 mediarepo-ui/src/api/api-types/presets.ts create mode 100644 mediarepo-ui/src/api/models/SortKey.ts create mode 100644 mediarepo-ui/src/api/models/SortingPreset.ts delete mode 100644 mediarepo-ui/src/app/models/SortKey.ts create mode 100644 mediarepo-ui/src/app/services/preset/preset.service.spec.ts create mode 100644 mediarepo-ui/src/app/services/preset/preset.service.ts diff --git a/mediarepo-ui/src-tauri/Cargo.lock b/mediarepo-ui/src-tauri/Cargo.lock index 9b93484a..b5081b6f 100644 --- a/mediarepo-ui/src-tauri/Cargo.lock +++ b/mediarepo-ui/src-tauri/Cargo.lock @@ -161,9 +161,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "block-buffer" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +checksum = "03588e54c62ae6d763e2a80090d50353b785795361b4ff5b3bf0a5097fc31c0b" dependencies = [ "generic-array", ] @@ -506,9 +506,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762" +checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -519,9 +519,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" +checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6" dependencies = [ "cfg-if 1.0.0", "lazy_static", @@ -799,9 +799,9 @@ dependencies = [ [[package]] name = "futf" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" dependencies = [ "mac", "new_debug_unreachable", @@ -1416,9 +1416,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.116" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74" +checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c" [[package]] name = "lock_api" @@ -1499,7 +1499,7 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "mediarepo-api" -version = "0.28.0" +version = "0.28.1" dependencies = [ "async-trait", "bromine", @@ -1507,7 +1507,7 @@ dependencies = [ "directories", "futures", "mime_guess", - "parking_lot", + "parking_lot 0.12.0", "pathsearch", "serde", "serde_json", @@ -1865,7 +1865,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.5", +] + +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.0", ] [[package]] @@ -1882,6 +1892,19 @@ dependencies = [ "winapi", ] +[[package]] +name = "parking_lot_core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2f4f894f3865f6c0e02810fc597300f34dc2510f66400da262d8ae10e75767d" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + [[package]] name = "pathdiff" version = "0.2.1" @@ -2377,7 +2400,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.4", + "semver 1.0.5", ] [[package]] @@ -2425,9 +2448,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "security-framework" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fed7948b6c68acbb6e20c334f55ad635dc0f75506963de4464289fbd3b051ac" +checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" dependencies = [ "bitflags", "core-foundation 0.9.2", @@ -2438,9 +2461,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57321bf8bc2362081b2599912d2961fe899c0efadf1b4b2f8d48b3e253bb96c" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" dependencies = [ "core-foundation-sys 0.8.3", "libc", @@ -2477,9 +2500,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" +checksum = "0486718e92ec9a68fbed73bb5ef687d71103b142595b406835649bebd33f72c7" [[package]] name = "semver-parser" @@ -2654,14 +2677,14 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6" +checksum = "33994d0838dc2d152d17a62adf608a869b5e846b65b389af7f3dbc1de45c5b26" dependencies = [ "lazy_static", "new_debug_unreachable", - "parking_lot", - "phf_shared 0.8.0", + "parking_lot 0.11.2", + "phf_shared 0.10.0", "precomputed-hash", "serde", ] @@ -2811,7 +2834,7 @@ dependencies = [ "ndk-glue", "ndk-sys", "objc", - "parking_lot", + "parking_lot 0.11.2", "raw-window-handle 0.3.4", "scopeguard", "serde", @@ -2857,7 +2880,7 @@ dependencies = [ "rand 0.8.4", "raw-window-handle 0.3.4", "rfd", - "semver 1.0.4", + "semver 1.0.5", "serde", "serde_json", "serde_repr", @@ -3088,9 +3111,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "2d8d93354fe2a8e50d5953f5ae2e47a3fc2ef03292e7ea46e3cc38f549525fb9" dependencies = [ "cfg-if 1.0.0", "pin-project-lite", @@ -3100,9 +3123,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716" dependencies = [ "proc-macro2 1.0.36", "quote 1.0.15", @@ -3111,11 +3134,12 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" dependencies = [ "lazy_static", + "valuable", ] [[package]] @@ -3131,9 +3155,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5312f325fe3588e277415f5a6cca1f4ccad0f248c4cd5a4bd33032d7286abc22" +checksum = "74786ce43333fcf51efe947aed9718fbe46d5c7328ec3f1029e818083966d9aa" dependencies = [ "ansi_term", "lazy_static", @@ -3235,6 +3259,12 @@ dependencies = [ "getrandom 0.2.4", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" @@ -3476,6 +3506,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceb069ac8b2117d36924190469735767f0990833935ab430155e71a44bafe148" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b" + +[[package]] +name = "windows_i686_gnu" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8793f59f7b8e8b01eda1a652b2697d87b93097198ae85f823b969ca5b89bba58" + +[[package]] +name = "windows_i686_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d615f419543e0bd7d2b3323af0d86ff19cbc4f816e6453f36a2c2ce889c354" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561" + [[package]] name = "winres" version = "0.1.12" diff --git a/mediarepo-ui/src-tauri/Cargo.toml b/mediarepo-ui/src-tauri/Cargo.toml index 28ad054d..ee837a00 100644 --- a/mediarepo-ui/src-tauri/Cargo.toml +++ b/mediarepo-ui/src-tauri/Cargo.toml @@ -10,20 +10,20 @@ edition = "2018" build = "src/build.rs" [build-dependencies] -tauri-build = { version = "^1.0.0-beta.4" } +tauri-build = "1.0.0-beta.4" [dependencies] -serde_json = "^1.0" -serde = { version = "^1.0", features = ["derive"] } -thiserror = "^1.0.30" -typemap_rev = "^0.1.5" +serde_json = "1.0.78" +serde = { version = "1.0.136", features = ["derive"] } +thiserror = "1.0.30" +typemap_rev = "0.1.5" [dependencies.tauri] -version = "^1.0.0-beta.8" +version = "1.0.0-beta.8" features = ["dialog-all", "path-all", "shell-all"] [dependencies.tracing-subscriber] -version = "^0.3.0" +version = "0.3.8" features = ["env-filter"] [dependencies.mediarepo-api] diff --git a/mediarepo-ui/src/api/Api.ts b/mediarepo-ui/src/api/Api.ts index 292cd8f1..27e1d585 100644 --- a/mediarepo-ui/src/api/Api.ts +++ b/mediarepo-ui/src/api/Api.ts @@ -4,12 +4,14 @@ import {ApiFunction} from "./api-types/functions"; import { AddLocalFileREquest, AddRepositoryRequest, + AddSortingPresetRequest, ChangeFileTagsRequest, CheckDaemonRunningRequest, CheckLocalRepositoryExistsRequest, CreateTagsRequest, DeleteFileRequest, DeleteRepositoryRequest, + DeleteSortingPresetRequest, DeleteThumbnailsRequest, FindFilesRequest, GetFileMetadataRequest, @@ -31,6 +33,7 @@ import { import {RepositoryData, RepositoryMetadata, SizeMetadata} from "./api-types/repo"; import {CdTagMappings, NamespaceData, TagData} from "./api-types/tags"; import {ShortCache} from "./ShortCache"; +import {SortingPresetData} from "./api-types/presets"; export class MediarepoApi { @@ -184,6 +187,18 @@ export class MediarepoApi { return this.invokePlugin(ApiFunction.RunJob, request); } + public static async getAllSortingPresets(): Promise { + return ShortCache.cached("sorting-presets", () => this.invokePlugin(ApiFunction.GetAllSortingPresets), 1000); + } + + public static async addSortingPreset(request: AddSortingPresetRequest): Promise { + return this.invokePlugin(ApiFunction.AddSortingPreset, request); + } + + public static async deleteSortingPreset(request: DeleteSortingPresetRequest): Promise { + return this.invokePlugin(ApiFunction.DeleteSortingPreset, request); + } + private static async invokePlugin(fn: ApiFunction, args?: any): Promise { return invoke(`plugin:mediarepo|${fn}`, args); } diff --git a/mediarepo-ui/src/api/api-types/files.ts b/mediarepo-ui/src/api/api-types/files.ts index 004917ee..cf6387da 100644 --- a/mediarepo-ui/src/api/api-types/files.ts +++ b/mediarepo-ui/src/api/api-types/files.ts @@ -41,7 +41,7 @@ export type ValueComparator = | { Greater: T } | { Between: T[] } -export type SortKey = { Namespace: SortNamespace } +export type SortKeyData = { Namespace: SortNamespace } | { FileName: SortDirection } | { FileSize: SortDirection } | { FileImportedTime: SortDirection } diff --git a/mediarepo-ui/src/api/api-types/functions.ts b/mediarepo-ui/src/api/api-types/functions.ts index 5f61ed01..44f80415 100644 --- a/mediarepo-ui/src/api/api-types/functions.ts +++ b/mediarepo-ui/src/api/api-types/functions.ts @@ -40,4 +40,8 @@ export enum ApiFunction { SetFrontendState = "set_frontend_state", // jobs RunJob = "run_job", + // presets + GetAllSortingPresets = "all_sorting_presets", + AddSortingPreset = "add_sorting_preset", + DeleteSortingPreset = "delete_sorting_preset", } diff --git a/mediarepo-ui/src/api/api-types/presets.ts b/mediarepo-ui/src/api/api-types/presets.ts new file mode 100644 index 00000000..01eb00f9 --- /dev/null +++ b/mediarepo-ui/src/api/api-types/presets.ts @@ -0,0 +1,6 @@ +import {SortKeyData} from "./files"; + +export type SortingPresetData = { + id: number, + keys: SortKeyData[], +} diff --git a/mediarepo-ui/src/api/api-types/requests.ts b/mediarepo-ui/src/api/api-types/requests.ts index c6c0d246..e58e50c8 100644 --- a/mediarepo-ui/src/api/api-types/requests.ts +++ b/mediarepo-ui/src/api/api-types/requests.ts @@ -1,4 +1,4 @@ -import {FileOsMetadata, FileStatus, FilterExpression, SortKey} from "./files"; +import {FileOsMetadata, FileStatus, FilterExpression, SortKeyData} from "./files"; import {RepositoryData, SizeType} from "./repo"; import {JobType} from "./job"; @@ -40,7 +40,7 @@ export type GetSizeRequest = { export type FindFilesRequest = { filters: FilterExpression[], - sortBy: SortKey[] + sortBy: SortKeyData[] }; export type UpdateFileNameRequest = { @@ -107,4 +107,12 @@ export type SetFrontendStateRequest = { export type RunJobRequest = { jobType: JobType, -} +}; + +export type AddSortingPresetRequest = { + sort_keys: SortKeyData[] +}; + +export type DeleteSortingPresetRequest = { + id: number +}; diff --git a/mediarepo-ui/src/api/models/SortKey.ts b/mediarepo-ui/src/api/models/SortKey.ts new file mode 100644 index 00000000..674237e3 --- /dev/null +++ b/mediarepo-ui/src/api/models/SortKey.ts @@ -0,0 +1,106 @@ +import {SortDirection, SortKeyData} from "../api-types/files"; + +export type SortType = + "Namespace" + | "FileName" + | "FileSize" + | "FileImportedTime" + | "FileCreatedTime" + | "FileChangeTime" + | "FileType" + | "NumTags"; + +export class SortKey { + + constructor(private data: SortKeyData) { + this.data = data; + } + + public get sortType(): SortType { + return Reflect.ownKeys(this.data)[0] as SortType; + } + + public set sortType(value: SortType) { + if (value == "Namespace") { + this.data = { + Namespace: { + direction: this.sortDirection, + name: "" + } + }; + } else { + this.data = { + [value]: { + direction: this.sortDirection + } + } as SortKeyData; + } + } + + public get sortDirection(): SortDirection { + if ("Namespace" in this.data) { + return this.data.Namespace.direction; + } else { + // @ts-ignore + return this.data[this.sortType]; + } + } + + public set sortDirection(value: SortDirection) { + const sortType = this.sortType; + if ("Namespace" in this.data) { + this.data.Namespace.direction = value; + } else { + // @ts-ignore + this.data[this.sortType] = value; + } + } + + public get namespaceName(): string | undefined { + if ("Namespace" in this.data) { + return this.data.Namespace.name; + } + return undefined; + } + + public set namespaceName(value: string | undefined) { + if (value && "Namespace" in this.data) { + this.data.Namespace.name = value; + } + } + + public static fromValues( + sortType: SortType, + sortDirection: SortDirection, + namespaceName: string | undefined + ) { + let data; + + if (sortType === "Namespace") { + data = { + Namespace: { + name: namespaceName!, + direction: sortDirection + } + }; + } else { + data = { + [sortType]: sortDirection + } as SortKeyData; + } + + return new SortKey(data); + } + + public toString(): string { + if (this.sortType == "Namespace") { + return `${this.sortType} '${this.namespaceName}' ${this.sortDirection}`; + } else { + return `${this.sortType} ${this.sortDirection}`; + } + } + + public rawData(): SortKeyData { + return this.data; + } +} diff --git a/mediarepo-ui/src/api/models/SortingPreset.ts b/mediarepo-ui/src/api/models/SortingPreset.ts new file mode 100644 index 00000000..9eb258a3 --- /dev/null +++ b/mediarepo-ui/src/api/models/SortingPreset.ts @@ -0,0 +1,20 @@ +import {SortKey} from "./SortKey"; +import {SortingPresetData} from "../api-types/presets"; + +export class SortingPreset { + private readonly _id: number; + private keys: SortKey[]; + + constructor(presetData: SortingPresetData) { + this._id = presetData.id; + this.keys = presetData.keys.map(SortKey.fromRawData); + } + + public get id(): number { + return this._id; + } + + public get sortKeys(): SortKey[] { + return this.sortKeys; + } +} diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts index 065c974e..9737c2d6 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts @@ -9,7 +9,7 @@ import { Output, ViewChild } from "@angular/core"; -import {SortKey} from "../../../../models/SortKey"; +import {SortKey} from "../../../../../api/models/SortKey"; import {MatDialog} from "@angular/material/dialog"; import {SortDialogComponent} from "./sort-dialog/sort-dialog.component"; import {LoggingService} from "../../../../services/logging/logging.service"; @@ -128,10 +128,8 @@ export class FileSearchComponent implements AfterViewChecked, OnInit { public openSortDialog() { const sortEntries = this.sortExpression.map( - key => JSON.parse(JSON.stringify(key))).map( - key => new SortKey(key.sortType, key.sortDirection, - key.namespaceName - )); + key => JSON.parse(JSON.stringify(key.rawData()))).map( + data => new SortKey(data)); const openedDialog = this.dialog.open(SortDialogComponent, { minWidth: "40vw", data: { diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts index 13b6c442..4bd7271f 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts @@ -1,6 +1,6 @@ import {ChangeDetectionStrategy, Component, Inject} from "@angular/core"; import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; -import {SortKey} from "../../../../../models/SortKey"; +import {SortKey} from "../../../../../../api/models/SortKey"; import {CdkDragDrop, moveItemInArray} from "@angular/cdk/drag-drop"; import {Namespace} from "../../../../../../api/models/Namespace"; import {TagService} from "../../../../../services/tag/tag.service"; @@ -22,12 +22,13 @@ export class SortDialogComponent { constructor(public tagService: TagService, public dialogRef: MatDialogRef, @Inject( MAT_DIALOG_DATA) data: any) { this.sortEntries = data.sortEntries; + console.debug(this.sortEntries); tagService.namespaces.subscribe( namespaces => this.namespaces = namespaces); } addNewSortKey() { - const sortKey = new SortKey("FileName", "Ascending", undefined); + const sortKey = SortKey.fromValues("FileName", "Ascending", undefined); this.sortEntries.push(sortKey); } diff --git a/mediarepo-ui/src/app/models/SortKey.ts b/mediarepo-ui/src/app/models/SortKey.ts deleted file mode 100644 index 7738b308..00000000 --- a/mediarepo-ui/src/app/models/SortKey.ts +++ /dev/null @@ -1,35 +0,0 @@ -export class SortKey { - - - constructor( - public sortType: "Namespace" | "FileName" | "FileSize" | "FileImportedTime" | "FileCreatedTime" | "FileChangeTime" | "FileType" | "NumTags", - public sortDirection: "Ascending" | "Descending", - public namespaceName: string | undefined - ) { - } - - public toString(): string { - if (this.sortType == "Namespace") { - return `${this.sortType} '${this.namespaceName}' ${this.sortDirection}`; - } else { - return `${this.sortType} ${this.sortDirection}`; - } - } - - public toBackendType(): any { - - if (this.sortType == "Namespace") { - return { - "Namespace": { - direction: this.sortDirection, - name: this.namespaceName - } - }; - } else { - let returnObj: any = {}; - returnObj[this.sortType] = this.sortDirection; - - return returnObj; - } - } -} diff --git a/mediarepo-ui/src/app/models/TabState.ts b/mediarepo-ui/src/app/models/TabState.ts index df9c6a3a..2798640f 100644 --- a/mediarepo-ui/src/app/models/TabState.ts +++ b/mediarepo-ui/src/app/models/TabState.ts @@ -2,10 +2,11 @@ import {BehaviorSubject} from "rxjs"; import {TabCategory} from "./TabCategory"; import {FileService} from "../services/file/file.service"; import {File} from "../../api/models/File"; -import {SortKey} from "./SortKey"; +import {SortKey} from "../../api/models/SortKey"; import {debounceTime} from "rxjs/operators"; import {mapNew} from "../../api/models/adaptors"; import {SearchFilters} from "../../api/models/SearchFilters"; +import {SortKeyData} from "../../api/api-types/files"; export class TabState { public uuid: number; @@ -17,7 +18,7 @@ export class TabState { public files = new BehaviorSubject([]); public filters = new BehaviorSubject(new SearchFilters([])); public sortKeys = new BehaviorSubject( - [new SortKey( + [SortKey.fromValues( "FileImportedTime", "Ascending", undefined @@ -50,14 +51,7 @@ export class TabState { dto.category, fileService ); - const sortKeys = dto.sortKeys.map( - (s: { sortType: any, sortDirection: any, namespaceName: any }) => - new SortKey( - s.sortType, - s.sortDirection, - s.namespaceName - ) - ); + const sortKeys = dto.sortKeys.map((data: SortKeyData) => new SortKey(data)); state.filters.next(new SearchFilters(dto.filters ?? [])); state.sortKeys.next(sortKeys); state.mode.next(dto.mode ?? "grid"); @@ -90,7 +84,7 @@ export class TabState { uuid: this.uuid, category: this.category, filters: this.filters.value.getFilters(), - sortKeys: this.sortKeys.value, + sortKeys: this.sortKeys.value.map(key => key.rawData()), mode: this.mode.value, selectedFileHash: this.selectedCD.value, files: this.category === TabCategory.Import ? this.files.value.map( diff --git a/mediarepo-ui/src/app/services/file/file.service.ts b/mediarepo-ui/src/app/services/file/file.service.ts index 6d49a8d3..4f2e549a 100644 --- a/mediarepo-ui/src/app/services/file/file.service.ts +++ b/mediarepo-ui/src/app/services/file/file.service.ts @@ -1,7 +1,7 @@ import {Inject, Injectable} from "@angular/core"; import {File} from "../../../api/models/File"; import {DomSanitizer, SafeResourceUrl} from "@angular/platform-browser"; -import {SortKey} from "../../models/SortKey"; +import {SortKey} from "../../../api/models/SortKey"; import {MediarepoApi} from "../../../api/Api"; import {mapMany, mapNew} from "../../../api/models/adaptors"; import {FileMetadata, FileStatus} from "../../../api/api-types/files"; @@ -26,7 +26,7 @@ export class FileService { return MediarepoApi.findFiles( { filters: filters.getFilters(), - sortBy: sortBy.map(k => k.toBackendType()) + sortBy: sortBy.map(k => k.rawData()) }) .then(mapMany(mapNew(File))); } diff --git a/mediarepo-ui/src/app/services/preset/preset.service.spec.ts b/mediarepo-ui/src/app/services/preset/preset.service.spec.ts new file mode 100644 index 00000000..0e4a6b35 --- /dev/null +++ b/mediarepo-ui/src/app/services/preset/preset.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { PresetService } from './preset.service'; + +describe('PresetService', () => { + let service: PresetService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(PresetService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/mediarepo-ui/src/app/services/preset/preset.service.ts b/mediarepo-ui/src/app/services/preset/preset.service.ts new file mode 100644 index 00000000..32fb28b0 --- /dev/null +++ b/mediarepo-ui/src/app/services/preset/preset.service.ts @@ -0,0 +1,17 @@ +import {Injectable} from "@angular/core"; +import {SortingPreset} from "../../../api/models/SortingPreset"; +import {MediarepoApi} from "../../../api/Api"; +import {mapMany, mapNew} from "../../../api/models/adaptors"; + +@Injectable({ + providedIn: "root" +}) +export class PresetService { + + constructor() { + } + + public async getAllSortingPresets(): Promise { + return MediarepoApi.getAllSortingPresets().then(mapMany(mapNew(SortingPreset))); + } +} From ece096fb866c18984301c7fef6420e34bf9eb6d8 Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 16:03:04 +0100 Subject: [PATCH 10/18] Replace sortingExpression with sortingPreset in all files Signed-off-by: trivernis --- mediarepo-ui/src/api/models/SortKey.ts | 10 +++---- mediarepo-ui/src/api/models/SortingPreset.ts | 25 +++++++++++++++-- .../file-search/file-search.component.html | 3 +- .../file-search/file-search.component.ts | 20 ++++++------- .../sort-dialog/sort-dialog.component.html | 20 +++++++------ .../sort-dialog/sort-dialog.component.ts | 28 +++++++++++++------ mediarepo-ui/src/app/models/TabState.ts | 22 ++++++++------- .../src/app/services/file/file.service.ts | 2 +- .../src/app/services/state/state.service.ts | 22 +++++++-------- 9 files changed, 94 insertions(+), 58 deletions(-) diff --git a/mediarepo-ui/src/api/models/SortKey.ts b/mediarepo-ui/src/api/models/SortKey.ts index 674237e3..6ed1d57a 100644 --- a/mediarepo-ui/src/api/models/SortKey.ts +++ b/mediarepo-ui/src/api/models/SortKey.ts @@ -69,13 +69,17 @@ export class SortKey { } } + public get rawData(): SortKeyData { + return this.data; + } + public static fromValues( sortType: SortType, sortDirection: SortDirection, namespaceName: string | undefined ) { let data; - + if (sortType === "Namespace") { data = { Namespace: { @@ -99,8 +103,4 @@ export class SortKey { return `${this.sortType} ${this.sortDirection}`; } } - - public rawData(): SortKeyData { - return this.data; - } } diff --git a/mediarepo-ui/src/api/models/SortingPreset.ts b/mediarepo-ui/src/api/models/SortingPreset.ts index 9eb258a3..43bc7f30 100644 --- a/mediarepo-ui/src/api/models/SortingPreset.ts +++ b/mediarepo-ui/src/api/models/SortingPreset.ts @@ -1,20 +1,39 @@ import {SortKey} from "./SortKey"; import {SortingPresetData} from "../api-types/presets"; +import {mapNew} from "./adaptors"; export class SortingPreset { - private readonly _id: number; private keys: SortKey[]; constructor(presetData: SortingPresetData) { this._id = presetData.id; - this.keys = presetData.keys.map(SortKey.fromRawData); + this.keys = presetData.keys.map(mapNew(SortKey)); } + private _id: number; + public get id(): number { return this._id; } + public set id(value: number) { + this._id = value; + } + public get sortKeys(): SortKey[] { - return this.sortKeys; + return this.keys; + } + + public get rawData(): SortingPresetData { + return { + id: this._id, + keys: this.keys.map(k => k.rawData), + }; + } + + public static fromValues(id: number, keys: SortKey[]) { + let preset = new SortingPreset({ id, keys: [] }); + preset.keys = keys; + return preset; } } diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.html index e4de89f9..f9e7f617 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.html +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.html @@ -35,7 +35,8 @@ - + diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts index 9737c2d6..7c6f149a 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts @@ -9,7 +9,6 @@ import { Output, ViewChild } from "@angular/core"; -import {SortKey} from "../../../../../api/models/SortKey"; import {MatDialog} from "@angular/material/dialog"; import {SortDialogComponent} from "./sort-dialog/sort-dialog.component"; import {LoggingService} from "../../../../services/logging/logging.service"; @@ -23,6 +22,7 @@ import {FileStatus, FilterExpression,} from "../../../../../api/api-types/files" import {filterExpressionToString} from "../../../../utils/filter-utils"; import {MatCheckboxChange} from "@angular/material/checkbox"; import * as deepEqual from "fast-deep-equal"; +import {SortingPreset} from "../../../../../api/models/SortingPreset"; @Component({ @@ -32,7 +32,7 @@ import * as deepEqual from "fast-deep-equal"; changeDetection: ChangeDetectionStrategy.OnPush }) export class FileSearchComponent implements AfterViewChecked, OnInit { - public sortExpression: SortKey[] = []; + public sortingPreset: SortingPreset = new SortingPreset({ id: -1, keys: [] }); public filters: SearchFilters = new SearchFilters([]); @Input() availableTags: Tag[] = []; @@ -68,7 +68,7 @@ export class FileSearchComponent implements AfterViewChecked, OnInit { this.filters = f; this.assignDisplayedFilters(); }); - this.state.sortKeys.subscribe(s => this.sortExpression = s); + this.state.sortingPreset.subscribe(s => this.sortingPreset = s); this.applyStatusFromFilters(); this.needsScroll = true; this.assignDisplayedFilters(); @@ -127,20 +127,18 @@ export class FileSearchComponent implements AfterViewChecked, OnInit { } public openSortDialog() { - const sortEntries = this.sortExpression.map( - key => JSON.parse(JSON.stringify(key.rawData()))).map( - data => new SortKey(data)); + const sortingPreset = new SortingPreset(JSON.parse(JSON.stringify(this.sortingPreset.rawData))); const openedDialog = this.dialog.open(SortDialogComponent, { minWidth: "40vw", data: { - sortEntries, + sortingPreset, }, disableClose: true, }); - openedDialog.afterClosed().subscribe(async (sortExpression) => { - if (sortExpression) { - this.sortExpression = sortExpression; - this.state.setSortKeys(this.sortExpression); + openedDialog.afterClosed().subscribe(async (sortingPreset) => { + if (sortingPreset) { + this.sortingPreset = sortingPreset; + this.state.setSortingPreset(this.sortingPreset); } }); } diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.html index c6fc1056..a3502745 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.html +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.html @@ -1,7 +1,7 @@

Sort Entries

-
+
@@ -21,14 +21,16 @@

Sort Entries

Namespace Name - - + {{namespace.name}} @@ -37,16 +39,18 @@

Sort Entries

Direction - + Ascending Descending - - diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts index 4bd7271f..76b65d7b 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts @@ -5,6 +5,7 @@ import {CdkDragDrop, moveItemInArray} from "@angular/cdk/drag-drop"; import {Namespace} from "../../../../../../api/models/Namespace"; import {TagService} from "../../../../../services/tag/tag.service"; import {compareSearchResults} from "../../../../../utils/compare-utils"; +import {SortingPreset} from "../../../../../../api/models/SortingPreset"; @Component({ selector: "app-sort-dialog", @@ -14,31 +15,34 @@ import {compareSearchResults} from "../../../../../utils/compare-utils"; }) export class SortDialogComponent { - public sortEntries: SortKey[] = []; + public sortingPreset: SortingPreset = SortingPreset.fromValues(-1, []); public suggestedNamespaces: Namespace[] = []; + private previousId: number = -1; private namespaces: Namespace[] = []; constructor(public tagService: TagService, public dialogRef: MatDialogRef, @Inject( MAT_DIALOG_DATA) data: any) { - this.sortEntries = data.sortEntries; - console.debug(this.sortEntries); + this.sortingPreset = data.sortingPreset; + console.debug(this.sortingPreset); tagService.namespaces.subscribe( namespaces => this.namespaces = namespaces); } addNewSortKey() { const sortKey = SortKey.fromValues("FileName", "Ascending", undefined); - this.sortEntries.push(sortKey); + this.handlePresetChange(); + this.sortingPreset.sortKeys.push(sortKey); } public removeSortKey(sortKey: SortKey): void { - const index = this.sortEntries.indexOf(sortKey); - this.sortEntries.splice(index, 1); + const index = this.sortingPreset.sortKeys.indexOf(sortKey); + this.handlePresetChange(); + this.sortingPreset.sortKeys.splice(index, 1); } public confirmSort(): void { - this.dialogRef.close(this.sortEntries); + this.dialogRef.close(this.sortingPreset); } public cancelSort(): void { @@ -46,7 +50,8 @@ export class SortDialogComponent { } public onSortEntryDrop(event: CdkDragDrop): void { - moveItemInArray(this.sortEntries, event.previousIndex, + this.handlePresetChange(); + moveItemInArray(this.sortingPreset.sortKeys, event.previousIndex, event.currentIndex ); } @@ -56,4 +61,11 @@ export class SortDialogComponent { (a, b) => compareSearchResults(value, a.name, b.name)) .slice(0, 50); } + + public handlePresetChange() { + if (this.sortingPreset.id >= 0) { + this.previousId = this.sortingPreset.id; + this.sortingPreset.id = -1; + } + } } diff --git a/mediarepo-ui/src/app/models/TabState.ts b/mediarepo-ui/src/app/models/TabState.ts index 2798640f..fc75b1b4 100644 --- a/mediarepo-ui/src/app/models/TabState.ts +++ b/mediarepo-ui/src/app/models/TabState.ts @@ -6,7 +6,7 @@ import {SortKey} from "../../api/models/SortKey"; import {debounceTime} from "rxjs/operators"; import {mapNew} from "../../api/models/adaptors"; import {SearchFilters} from "../../api/models/SearchFilters"; -import {SortKeyData} from "../../api/api-types/files"; +import {SortingPreset} from "../../api/models/SortingPreset"; export class TabState { public uuid: number; @@ -17,12 +17,14 @@ export class TabState { public files = new BehaviorSubject([]); public filters = new BehaviorSubject(new SearchFilters([])); - public sortKeys = new BehaviorSubject( + public sortingPreset = new BehaviorSubject(SortingPreset.fromValues( + -1, [SortKey.fromValues( "FileImportedTime", "Ascending", undefined - )]); + )] + )); private fileService: FileService; @@ -37,7 +39,7 @@ export class TabState { if (this.category === TabCategory.Files) { this.filters.pipe(debounceTime(500)) .subscribe(async () => await this.findFiles()); - this.sortKeys.pipe(debounceTime(100)) + this.sortingPreset.pipe(debounceTime(100)) .subscribe(async () => await this.findFiles()); } } @@ -51,9 +53,9 @@ export class TabState { dto.category, fileService ); - const sortKeys = dto.sortKeys.map((data: SortKeyData) => new SortKey(data)); + state.filters.next(new SearchFilters(dto.filters ?? [])); - state.sortKeys.next(sortKeys); + state.sortingPreset.next(new SortingPreset(dto.sortingPreset)); state.mode.next(dto.mode ?? "grid"); state.selectedCD.next(dto.selectedFileHash); state.files.next((dto.files ?? []).map(mapNew(File))); @@ -65,7 +67,7 @@ export class TabState { this.loading.next(true); const files = await this.fileService.findFiles( this.filters.value, - this.sortKeys.value + this.sortingPreset.value.sortKeys ); this.files.next(files); this.loading.next(false); @@ -75,8 +77,8 @@ export class TabState { this.filters.next(filters); } - public setSortKeys(keys: SortKey[]) { - this.sortKeys.next(keys); + public setSortingPreset(preset: SortingPreset) { + this.sortingPreset.next(preset); } public getDTO(): any { @@ -84,7 +86,7 @@ export class TabState { uuid: this.uuid, category: this.category, filters: this.filters.value.getFilters(), - sortKeys: this.sortKeys.value.map(key => key.rawData()), + sortingPreset: this.sortingPreset.value.rawData, mode: this.mode.value, selectedFileHash: this.selectedCD.value, files: this.category === TabCategory.Import ? this.files.value.map( diff --git a/mediarepo-ui/src/app/services/file/file.service.ts b/mediarepo-ui/src/app/services/file/file.service.ts index 4f2e549a..ab783a92 100644 --- a/mediarepo-ui/src/app/services/file/file.service.ts +++ b/mediarepo-ui/src/app/services/file/file.service.ts @@ -26,7 +26,7 @@ export class FileService { return MediarepoApi.findFiles( { filters: filters.getFilters(), - sortBy: sortBy.map(k => k.rawData()) + sortBy: sortBy.map(k => k.rawData) }) .then(mapMany(mapNew(File))); } diff --git a/mediarepo-ui/src/app/services/state/state.service.ts b/mediarepo-ui/src/app/services/state/state.service.ts index 00a47389..3d2a0f75 100644 --- a/mediarepo-ui/src/app/services/state/state.service.ts +++ b/mediarepo-ui/src/app/services/state/state.service.ts @@ -59,6 +59,16 @@ export class StateService { this.state.next(state); } + /** + * Sets the state of the frontend + * @returns {Promise} + */ + public async saveState(): Promise { + if (this.repoService.selectedRepository.value) { + await MediarepoApi.setFrontendState({ state: this.state.value.serializeJson() }); + } + } + private subscribeToState(state: AppState) { state.tabs.subscribe(async tabs => { this.tabSubscriptions.forEach(s => s.unsubscribe()); @@ -70,7 +80,7 @@ export class StateService { private subscribeToTab(tab: TabState) { this.tabSubscriptions.push(tab.filters .subscribe(() => this.stateChange.next())); - this.tabSubscriptions.push(tab.sortKeys + this.tabSubscriptions.push(tab.sortingPreset .subscribe(() => this.stateChange.next())); this.tabSubscriptions.push( tab.selectedCD.subscribe(() => this.stateChange.next())); @@ -78,14 +88,4 @@ export class StateService { tab.mode.subscribe(() => this.stateChange.next())); this.tabSubscriptions.push(tab.files.subscribe(() => this.stateChange.next())); } - - /** - * Sets the state of the frontend - * @returns {Promise} - */ - public async saveState(): Promise { - if (this.repoService.selectedRepository.value) { - await MediarepoApi.setFrontendState({state: this.state.value.serializeJson()}); - } - } } From e431450a436721c2d43100245d52b31163450f78 Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 16:33:30 +0100 Subject: [PATCH 11/18] Improve sort preset display Signed-off-by: trivernis --- mediarepo-ui/src/api/models/SortingPreset.ts | 4 +++ .../file-search/file-search.component.html | 5 ++-- .../sort-button/sort-button.component.html | 14 ++++++++++ .../sort-button/sort-button.component.scss | 27 +++++++++++++++++++ .../sort-button/sort-button.component.spec.ts | 25 +++++++++++++++++ .../sort-button/sort-button.component.ts | 17 ++++++++++++ .../shared/sidebar/sidebar.module.ts | 12 +++++++-- mediarepo-ui/src/colors.scss | 3 +++ 8 files changed, 103 insertions(+), 4 deletions(-) create mode 100644 mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.html create mode 100644 mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.scss create mode 100644 mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.spec.ts create mode 100644 mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.ts diff --git a/mediarepo-ui/src/api/models/SortingPreset.ts b/mediarepo-ui/src/api/models/SortingPreset.ts index 43bc7f30..5fe3d284 100644 --- a/mediarepo-ui/src/api/models/SortingPreset.ts +++ b/mediarepo-ui/src/api/models/SortingPreset.ts @@ -36,4 +36,8 @@ export class SortingPreset { preset.keys = keys; return preset; } + + public toString(): string { + return this.sortKeys.join(", "); + } } diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.html index f9e7f617..4161489d 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.html +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.html @@ -35,8 +35,9 @@ - +
diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.html new file mode 100644 index 00000000..5bfa0a45 --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.html @@ -0,0 +1,14 @@ + diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.scss new file mode 100644 index 00000000..1fad7f87 --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.scss @@ -0,0 +1,27 @@ +@import "src/colors"; + +.sort-button { + width: 100%; + align-items: center; + background-color: $background-lighter-10; + text-overflow: ellipsis; + overflow: hidden; +} + +.sort-key-direction { + font-size: 1.5em; + vertical-align: bottom; + margin-bottom: 0.6em; +} + +.sort-key-type { + color: $primary-lighter-50 +} + +.sort-key-namespace { + color: $accent-lighter-10; +} + +.sort-key:last-child .key-divider { + display: none; +} diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.spec.ts new file mode 100644 index 00000000..04601bd0 --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SortButtonComponent } from './sort-button.component'; + +describe('SortButtonComponent', () => { + let component: SortButtonComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ SortButtonComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(SortButtonComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.ts new file mode 100644 index 00000000..c76e9853 --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.ts @@ -0,0 +1,17 @@ +import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from "@angular/core"; +import {SortingPreset} from "../../../../../../api/models/SortingPreset"; + +@Component({ + selector: "app-sort-button", + templateUrl: "./sort-button.component.html", + styleUrls: ["./sort-button.component.scss"], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class SortButtonComponent { + + @Input() selectedPreset!: SortingPreset; + @Output() appClick = new EventEmitter(); + + constructor() { + } +} diff --git a/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts b/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts index a3671f11..57b8de16 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts @@ -7,9 +7,11 @@ import { MatAddCircle, MatChangeCircle, MatDeleteSweep, + MatExpandLess, + MatExpandMore, MatFilterAlt, MatRemove, - MatRemoveCircle + MatRemoveCircle, } from "@ng-icons/material-icons"; import {MatRippleModule} from "@angular/material/core"; import {MatButtonModule} from "@angular/material/button"; @@ -48,6 +50,8 @@ import { } from "./file-search/filter-dialog/filter-expression-list-item/filter-expression-list-item.component"; import {GetTagQueryPipe} from "./file-search/filter-pipes/get-tag-query.pipe"; import {GetPropertyQueryPipe} from "./file-search/filter-pipes/get-property-query.pipe"; +import {SortButtonComponent} from "./file-search/sort-button/sort-button.component"; +import {MatTooltipModule} from "@angular/material/tooltip"; @NgModule({ @@ -66,6 +70,7 @@ import {GetPropertyQueryPipe} from "./file-search/filter-pipes/get-property-quer FilterExpressionListItemComponent, GetTagQueryPipe, GetPropertyQueryPipe, + SortButtonComponent, ], exports: [ TagEditComponent, @@ -81,7 +86,9 @@ import {GetPropertyQueryPipe} from "./file-search/filter-pipes/get-property-quer MatAddCircle, MatRemoveCircle, MatDeleteSweep, - MatFilterAlt + MatFilterAlt, + MatExpandMore, + MatExpandLess, }), MatRippleModule, MatButtonModule, @@ -102,6 +109,7 @@ import {GetPropertyQueryPipe} from "./file-search/filter-pipes/get-property-quer MatMenuModule, ReactiveFormsModule, MatAutocompleteModule, + MatTooltipModule, ] }) export class SidebarModule { diff --git a/mediarepo-ui/src/colors.scss b/mediarepo-ui/src/colors.scss index 08316df1..e8403cc8 100644 --- a/mediarepo-ui/src/colors.scss +++ b/mediarepo-ui/src/colors.scss @@ -6,6 +6,7 @@ $primary-lighter-10: lighten($primary, 10%); $primary-lighter-20: lighten($primary, 20%); $primary-lighter-30: lighten($primary, 30%); $primary-lighter-40: lighten($primary, 40%); +$primary-lighter-50: lighten($primary, 50%); $primary-darker-10: darken($primary, 10%); $primary-darker-20: darken($primary, 20%); $primary-darker-30: darken($primary, 30%); @@ -21,6 +22,8 @@ $text: #FFF; $text-darker-10: darken($text, 10%); $background: #424242; +$background-lighter-05: lighten($background, 4%); +$background-lighter-10: lighten($background, 10%); // specifics $tag-namespace: $accent-lighter-10; From 12d85b50cc0cce5dbe33bc3a88fffb229516ca6b Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 18:28:55 +0100 Subject: [PATCH 12/18] Fix preset creation Signed-off-by: trivernis --- ..._fix-uniqueness-of-sorting-preset-keys.sql | 17 +++++ .../src/entities/sorting_preset_key.rs | 1 + .../src/dao/sorting_preset/add.rs | 62 +++++++++++++------ .../src/dao/sorting_preset/mod.rs | 6 +- .../src/namespaces/files/mod.rs | 6 +- .../src/namespaces/presets.rs | 2 + 6 files changed, 67 insertions(+), 27 deletions(-) create mode 100644 mediarepo-daemon/mediarepo-database/migrations/20220205165133_fix-uniqueness-of-sorting-preset-keys.sql diff --git a/mediarepo-daemon/mediarepo-database/migrations/20220205165133_fix-uniqueness-of-sorting-preset-keys.sql b/mediarepo-daemon/mediarepo-database/migrations/20220205165133_fix-uniqueness-of-sorting-preset-keys.sql new file mode 100644 index 00000000..e2b3c717 --- /dev/null +++ b/mediarepo-daemon/mediarepo-database/migrations/20220205165133_fix-uniqueness-of-sorting-preset-keys.sql @@ -0,0 +1,17 @@ +PRAGMA foreign_keys= off; +ALTER TABLE sorting_preset_keys + RENAME TO _sorting_preset_keys_old; + +CREATE TABLE sorting_preset_keys +( + preset_id INTEGER REFERENCES sorting_presets (id) ON DELETE CASCADE, + key_id INTEGER REFERENCES sort_keys (id), + key_index INTEGER NOT NULL DEFAULT 0, + PRIMARY KEY (preset_id, key_id, key_index) +); + +INSERT INTO sorting_preset_keys SELECT * FROM _sorting_preset_keys_old; + +DROP TABLE _sorting_preset_keys_old; + +PRAGMA foreign_keys= on; diff --git a/mediarepo-daemon/mediarepo-database/src/entities/sorting_preset_key.rs b/mediarepo-daemon/mediarepo-database/src/entities/sorting_preset_key.rs index 43810319..6d882db5 100644 --- a/mediarepo-daemon/mediarepo-database/src/entities/sorting_preset_key.rs +++ b/mediarepo-daemon/mediarepo-database/src/entities/sorting_preset_key.rs @@ -9,6 +9,7 @@ pub struct Model { #[sea_orm(primary_key)] key_id: i32, + #[sea_orm(primary_key)] key_index: i32, } diff --git a/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/add.rs b/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/add.rs index f8e51f69..81c8aeb5 100644 --- a/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/add.rs +++ b/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/add.rs @@ -4,7 +4,13 @@ use mediarepo_core::error::RepoResult; use mediarepo_database::entities::{sort_key, sorting_preset, sorting_preset_key}; use sea_orm::prelude::*; use sea_orm::ActiveValue::Set; -use sea_orm::{Condition, ConnectionTrait, DatabaseTransaction, JoinType, QuerySelect}; +use sea_orm::{ + Condition, ConnectionTrait, DatabaseTransaction, DbBackend, FromQueryResult, JoinType, + QuerySelect, Statement, +}; + +#[allow(unused_imports)] +use sea_orm::TryGetableMany; // otherwise intellijrust hates on me impl SortingPresetDao { #[tracing::instrument(level = "debug", skip(self))] @@ -33,10 +39,17 @@ impl SortingPresetDao { trx.commit().await?; return Ok(SortingPresetDto::new(model, keys)); } - let preset_model = sorting_preset::ActiveModel { - ..Default::default() - }; - let preset_model = preset_model.insert(&trx).await?; + + // sea_orm currently doesn't support all-default-value inserts. + // TODOD: Replace after the change for default inserts has been merged + let preset_model = sorting_preset::Model::find_by_statement(Statement::from_string( + DbBackend::Sqlite, + "INSERT INTO sorting_presets DEFAULT VALUES RETURNING *;".to_string(), + )) + .one(&trx) + .await? + .expect("failed to insert new sorting preset"); + let mapping_models = key_ids .into_iter() .map(|(idx, key)| sorting_preset_key::ActiveModel { @@ -45,9 +58,12 @@ impl SortingPresetDao { key_index: Set(idx as i32), }) .collect::>(); - sorting_preset_key::Entity::insert_many(mapping_models) - .exec(&trx) - .await?; + + if !mapping_models.is_empty() { + sorting_preset_key::Entity::insert_many(mapping_models) + .exec(&trx) + .await?; + } trx.commit().await?; Ok(SortingPresetDto::new(preset_model, keys)) @@ -56,19 +72,21 @@ impl SortingPresetDao { async fn add_keys( trx: &DatabaseTransaction, - mut keys: Vec, + keys: Vec, ) -> RepoResult> { let mut key_dtos = find_sort_keys(trx, &keys).await?; + let mut insert_keys = keys.clone(); + key_dtos.iter().for_each(|key| { - keys.retain(|k| { + insert_keys.retain(|k| { k.ascending != key.ascending() - && Some(k.key_type) != key.key_type() - && key.value() != key.value() + || k.key_type != key.key_type().unwrap() + || !compare_opts_eq(key.value(), k.value.as_ref()) }) }); - if !keys.is_empty() { - let active_models: Vec = keys + if !insert_keys.is_empty() { + let active_models: Vec = insert_keys .iter() .cloned() .map(|key| sort_key::ActiveModel { @@ -81,7 +99,7 @@ async fn add_keys( sort_key::Entity::insert_many(active_models) .exec(trx) .await?; - let mut new_keys = find_sort_keys(trx, &keys).await?; + let mut new_keys = find_sort_keys(trx, &insert_keys).await?; key_dtos.append(&mut new_keys); } @@ -91,9 +109,9 @@ async fn add_keys( key_dtos .iter() .find(|key| { - k.ascending != key.ascending() - && Some(k.key_type) != key.key_type() - && key.value() != key.value() + k.ascending == key.ascending() + && k.key_type == key.key_type().unwrap() + && compare_opts_eq(key.value(), k.value.as_ref()) }) .cloned() }) @@ -144,3 +162,11 @@ fn create_mapping_condition(entry: (usize, i32)) -> Condition { .add(sorting_preset_key::Column::KeyId.eq(entry.1)) .add(sorting_preset_key::Column::KeyIndex.eq(entry.0 as i32)) } + +fn compare_opts_eq(opt1: Option, opt2: Option) -> bool { + if let (Some(opt1), Some(opt2)) = (&opt1, &opt2) { + opt1 == opt2 + } else { + opt1.is_none() && opt2.is_none() + } +} diff --git a/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs b/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs index a265aa51..06fbf1c8 100644 --- a/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs +++ b/mediarepo-daemon/mediarepo-logic/src/dao/sorting_preset/mod.rs @@ -5,7 +5,7 @@ use crate::dto::{SortKeyDto, SortingPresetDto}; use mediarepo_core::error::RepoResult; use mediarepo_database::entities::{sort_key, sorting_preset, sorting_preset_key}; use sea_orm::prelude::*; -use sea_orm::{JoinType, QueryOrder, QuerySelect}; +use sea_orm::QueryOrder; dao_provider!(SortingPresetDao); @@ -14,10 +14,6 @@ impl SortingPresetDao { pub async fn all(&self) -> RepoResult> { let presets = sorting_preset::Entity::find() .find_with_related(sort_key::Entity) - .join( - JoinType::InnerJoin, - sorting_preset_key::Relation::SortingKey.def(), - ) .order_by_asc(sorting_preset_key::Column::KeyIndex) .all(&self.ctx.db) .await? diff --git a/mediarepo-daemon/mediarepo-socket/src/namespaces/files/mod.rs b/mediarepo-daemon/mediarepo-socket/src/namespaces/files/mod.rs index 644a6f09..339b6bd9 100644 --- a/mediarepo-daemon/mediarepo-socket/src/namespaces/files/mod.rs +++ b/mediarepo-daemon/mediarepo-socket/src/namespaces/files/mod.rs @@ -291,10 +291,8 @@ impl FilesNamespace { let found_thumbnail = thumbnails.into_iter().find(|thumb| { let Dimensions { height, width } = thumb.size(); - *height >= min_size.0 - && *height <= max_size.0 - && *width >= min_size.1 - && *width <= max_size.1 + (*height <= max_size.0 && *width <= max_size.1) + && (*width >= min_size.1 || *height >= min_size.0) }); let thumbnail = if let Some(thumbnail) = found_thumbnail { diff --git a/mediarepo-daemon/mediarepo-socket/src/namespaces/presets.rs b/mediarepo-daemon/mediarepo-socket/src/namespaces/presets.rs index 1e2ad3ce..fbcd50ce 100644 --- a/mediarepo-daemon/mediarepo-socket/src/namespaces/presets.rs +++ b/mediarepo-daemon/mediarepo-socket/src/namespaces/presets.rs @@ -65,6 +65,8 @@ impl PresetsNamespace { let id = event.payload::()?; let repo = get_repo_from_context(ctx).await; repo.sorting_preset().delete(id).await?; + ctx.emit_to(Self::name(), "delete_sorting_preset", ()) + .await?; Ok(()) } From 91531bc94070061e860f54b3b28ccc85046b8306 Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 18:29:13 +0100 Subject: [PATCH 13/18] Add sorting preset selection in sort dialog Signed-off-by: trivernis --- mediarepo-ui/src/api/api-types/requests.ts | 2 +- mediarepo-ui/src/api/models/SortKey.ts | 8 ++- mediarepo-ui/src/api/models/SortingPreset.ts | 5 ++ .../sort-button/sort-button.component.html | 8 +-- .../sort-button/sort-button.component.scss | 18 ----- .../sort-dialog/sort-dialog.component.html | 34 +++++++++- .../sort-dialog/sort-dialog.component.scss | 15 ++++- .../sort-dialog/sort-dialog.component.ts | 65 +++++++++++++++++-- .../sort-preset-item.component.html | 7 ++ .../sort-preset-item.component.scss | 20 ++++++ .../sort-preset-item.component.spec.ts | 25 +++++++ .../sort-preset-item.component.ts | 16 +++++ .../shared/sidebar/sidebar.module.ts | 2 + .../src/app/services/preset/preset.service.ts | 9 +++ 14 files changed, 197 insertions(+), 37 deletions(-) create mode 100644 mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.html create mode 100644 mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.scss create mode 100644 mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.spec.ts create mode 100644 mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.ts diff --git a/mediarepo-ui/src/api/api-types/requests.ts b/mediarepo-ui/src/api/api-types/requests.ts index e58e50c8..f0bec621 100644 --- a/mediarepo-ui/src/api/api-types/requests.ts +++ b/mediarepo-ui/src/api/api-types/requests.ts @@ -110,7 +110,7 @@ export type RunJobRequest = { }; export type AddSortingPresetRequest = { - sort_keys: SortKeyData[] + sortKeys: SortKeyData[] }; export type DeleteSortingPresetRequest = { diff --git a/mediarepo-ui/src/api/models/SortKey.ts b/mediarepo-ui/src/api/models/SortKey.ts index 6ed1d57a..bf85cb49 100644 --- a/mediarepo-ui/src/api/models/SortKey.ts +++ b/mediarepo-ui/src/api/models/SortKey.ts @@ -98,9 +98,13 @@ export class SortKey { public toString(): string { if (this.sortType == "Namespace") { - return `${this.sortType} '${this.namespaceName}' ${this.sortDirection}`; + return `${this.sortType} '${this.namespaceName}' ${this.getDirectionString()}`; } else { - return `${this.sortType} ${this.sortDirection}`; + return `${this.sortType} ${this.getDirectionString()}`; } } + + private getDirectionString(): string { + return this.sortDirection === "Ascending" ? "â–²" : "â–¼"; + } } diff --git a/mediarepo-ui/src/api/models/SortingPreset.ts b/mediarepo-ui/src/api/models/SortingPreset.ts index 5fe3d284..1b0dc9b5 100644 --- a/mediarepo-ui/src/api/models/SortingPreset.ts +++ b/mediarepo-ui/src/api/models/SortingPreset.ts @@ -37,6 +37,11 @@ export class SortingPreset { return preset; } + public setData(data: SortingPresetData) { + this._id = data.id; + this.keys = data.keys.map(mapNew(SortKey)); + } + public toString(): string { return this.sortKeys.join(", "); } diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.html index 5bfa0a45..74c859c5 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.html +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.html @@ -4,11 +4,5 @@ class="sort-button" mat-flat-button> Sort: - - {{key.sortType}} - {{key.namespaceName}} - - - | - + diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.scss index 1fad7f87..4448aea9 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.scss +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.scss @@ -7,21 +7,3 @@ text-overflow: ellipsis; overflow: hidden; } - -.sort-key-direction { - font-size: 1.5em; - vertical-align: bottom; - margin-bottom: 0.6em; -} - -.sort-key-type { - color: $primary-lighter-50 -} - -.sort-key-namespace { - color: $accent-lighter-10; -} - -.sort-key:last-child .key-divider { - display: none; -} diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.html index a3502745..9d0c74b1 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.html +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.html @@ -1,5 +1,19 @@ -

Sort Entries

+

+ Sort Entries +

+ + Preset + + + + {{preset.toString()}} + + +
@@ -58,6 +72,22 @@

Sort Entries

- + + + + +
diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.scss index 03a35405..81d185df 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.scss +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.scss @@ -18,12 +18,17 @@ mat-form-field, .filler, .drag-handle { } .dialog-actions { - display: flex; - flex-direction: row-reverse; width: 100%; + display: block; button { margin-left: 1em; + float: right; + } + + button.button-left { + float: left; + margin-right: 1em; } } @@ -57,3 +62,9 @@ mat-form-field, .filler, .drag-handle { background-color: darken(dimgrey, 20); border-radius: 1em; } + +.preset-selection { + width: calc(100% - 2em); + display: block; + font-size: 1em; +} diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts index 76b65d7b..fb9fdfc3 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, Component, Inject} from "@angular/core"; +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, OnInit} from "@angular/core"; import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; import {SortKey} from "../../../../../../api/models/SortKey"; import {CdkDragDrop, moveItemInArray} from "@angular/cdk/drag-drop"; @@ -6,6 +6,8 @@ import {Namespace} from "../../../../../../api/models/Namespace"; import {TagService} from "../../../../../services/tag/tag.service"; import {compareSearchResults} from "../../../../../utils/compare-utils"; import {SortingPreset} from "../../../../../../api/models/SortingPreset"; +import {PresetService} from "../../../../../services/preset/preset.service"; +import {LoggingService} from "../../../../../services/logging/logging.service"; @Component({ selector: "app-sort-dialog", @@ -13,22 +15,36 @@ import {SortingPreset} from "../../../../../../api/models/SortingPreset"; styleUrls: ["./sort-dialog.component.scss"], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class SortDialogComponent { +export class SortDialogComponent implements OnInit { public sortingPreset: SortingPreset = SortingPreset.fromValues(-1, []); + public availablePresets: SortingPreset[] = []; public suggestedNamespaces: Namespace[] = []; + public emptyPreset = SortingPreset.fromValues(-1, []); - private previousId: number = -1; + public previousId: number = -1; private namespaces: Namespace[] = []; - constructor(public tagService: TagService, public dialogRef: MatDialogRef, @Inject( - MAT_DIALOG_DATA) data: any) { + constructor( + public logger: LoggingService, + public tagService: TagService, + public presetService: PresetService, + public changeDetector: ChangeDetectorRef, + public dialogRef: MatDialogRef, + @Inject( + MAT_DIALOG_DATA) data: any + ) { this.sortingPreset = data.sortingPreset; + this.previousId = this.sortingPreset.id; console.debug(this.sortingPreset); tagService.namespaces.subscribe( namespaces => this.namespaces = namespaces); } + public async ngOnInit() { + this.availablePresets = await this.presetService.getAllSortingPresets(); + } + addNewSortKey() { const sortKey = SortKey.fromValues("FileName", "Ascending", undefined); this.handlePresetChange(); @@ -68,4 +84,43 @@ export class SortDialogComponent { this.sortingPreset.id = -1; } } + + public async savePreset() { + await this.deletePreset(); + await this.saveNewPreset(); + } + + public async saveNewPreset() { + let newPreset = await this.logger.try(() => this.presetService.addSortingPreset(this.sortingPreset.sortKeys)); + if (newPreset) { + this.sortingPreset.setData(newPreset.rawData); + this.previousId = this.sortingPreset.id; + this.availablePresets.push(new SortingPreset(JSON.parse(JSON.stringify(newPreset.rawData)))); + this.changeDetector.detectChanges(); + } + } + + public async deletePreset() { + if (this.previousId >= 0) { + const index = this.availablePresets.findIndex(p => p.id == this.previousId); + if (index >= 0) { + this.availablePresets.splice(index, 1); + this.changeDetector.detectChanges(); + } + try { + await this.presetService.deleteSortingPreset(this.previousId); + } catch (err: any) { + this.logger.warn(`Could not delete previous preset: ${err.message}`); + } + } + } + + public selectPreset(presetId: number): void { + const preset = this.availablePresets.find(p => p.id == presetId); + + if (preset) { + this.sortingPreset.setData(JSON.parse(JSON.stringify(preset.rawData))); + this.previousId = preset.id; + } + } } diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.html new file mode 100644 index 00000000..7300b4ec --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.html @@ -0,0 +1,7 @@ + + {{key.sortType}} + {{key.namespaceName}} + + + | + diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.scss new file mode 100644 index 00000000..667f8eaa --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.scss @@ -0,0 +1,20 @@ +@import "src/colors"; + + +.sort-key-direction { + font-size: 1.5em; + vertical-align: bottom; + margin-bottom: 0.6em; +} + +.sort-key-type { + color: $primary-lighter-50 +} + +.sort-key-namespace { + color: $accent-lighter-10; +} + +.sort-key:last-child .key-divider { + display: none; +} diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.spec.ts new file mode 100644 index 00000000..1756cd3d --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SortPresetItemComponent } from './sort-preset-item.component'; + +describe('SortPresetItemComponent', () => { + let component: SortPresetItemComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ SortPresetItemComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(SortPresetItemComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.ts new file mode 100644 index 00000000..7e18532a --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.ts @@ -0,0 +1,16 @@ +import {ChangeDetectionStrategy, Component, Input} from "@angular/core"; +import {SortingPreset} from "../../../../../../api/models/SortingPreset"; + +@Component({ + selector: "app-sort-preset-item", + templateUrl: "./sort-preset-item.component.html", + styleUrls: ["./sort-preset-item.component.scss"], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class SortPresetItemComponent { + + @Input() preset!: SortingPreset; + + constructor() { + } +} diff --git a/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts b/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts index 57b8de16..211fb912 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts @@ -52,6 +52,7 @@ import {GetTagQueryPipe} from "./file-search/filter-pipes/get-tag-query.pipe"; import {GetPropertyQueryPipe} from "./file-search/filter-pipes/get-property-query.pipe"; import {SortButtonComponent} from "./file-search/sort-button/sort-button.component"; import {MatTooltipModule} from "@angular/material/tooltip"; +import { SortPresetItemComponent } from './file-search/sort-preset-item/sort-preset-item.component'; @NgModule({ @@ -71,6 +72,7 @@ import {MatTooltipModule} from "@angular/material/tooltip"; GetTagQueryPipe, GetPropertyQueryPipe, SortButtonComponent, + SortPresetItemComponent, ], exports: [ TagEditComponent, diff --git a/mediarepo-ui/src/app/services/preset/preset.service.ts b/mediarepo-ui/src/app/services/preset/preset.service.ts index 32fb28b0..1b416882 100644 --- a/mediarepo-ui/src/app/services/preset/preset.service.ts +++ b/mediarepo-ui/src/app/services/preset/preset.service.ts @@ -2,6 +2,7 @@ import {Injectable} from "@angular/core"; import {SortingPreset} from "../../../api/models/SortingPreset"; import {MediarepoApi} from "../../../api/Api"; import {mapMany, mapNew} from "../../../api/models/adaptors"; +import {SortKey} from "../../../api/models/SortKey"; @Injectable({ providedIn: "root" @@ -14,4 +15,12 @@ export class PresetService { public async getAllSortingPresets(): Promise { return MediarepoApi.getAllSortingPresets().then(mapMany(mapNew(SortingPreset))); } + + public async addSortingPreset(keys: SortKey[]): Promise { + return MediarepoApi.addSortingPreset({ sortKeys: keys.map(k => k.rawData) }).then(mapNew(SortingPreset)); + } + + public async deleteSortingPreset(id: number): Promise { + return MediarepoApi.deleteSortingPreset({ id }); + } } From a5a0134c56f2863882c275dc35561e11638bf649 Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 19:16:32 +0100 Subject: [PATCH 14/18] Fix api call name Signed-off-by: trivernis --- mediarepo-api/src/client_api/preset.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediarepo-api/src/client_api/preset.rs b/mediarepo-api/src/client_api/preset.rs index f62e0fc9..31beaa6b 100644 --- a/mediarepo-api/src/client_api/preset.rs +++ b/mediarepo-api/src/client_api/preset.rs @@ -28,7 +28,7 @@ impl PresetApi { #[tracing::instrument(level = "debug", skip(self))] pub async fn all_sorting_presets(&self) -> ApiResult> { self.emit_and_get( - "sorting_presets", + "all_sorting_presets", (), Some(Duration::from_secs(1)) ) From 341c1a35d610dc195b8f2dd7b95b91ef0942231f Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 19:21:02 +0100 Subject: [PATCH 15/18] Fix handling of the empty preset option Signed-off-by: trivernis --- .../file-search/sort-dialog/sort-dialog.component.html | 2 +- .../sidebar/file-search/sort-dialog/sort-dialog.component.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.html index 9d0c74b1..1a53b2f0 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.html +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.html @@ -5,7 +5,7 @@

Preset - + p.id == presetId); - + const preset = this.availablePresets.find(p => p.id == presetId) ?? this.emptyPreset; + if (preset) { this.sortingPreset.setData(JSON.parse(JSON.stringify(preset.rawData))); this.previousId = preset.id; From 6d6a17bac5937ea07a14e7a6ca81adcdbfee1103 Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 20:44:46 +0100 Subject: [PATCH 16/18] Add default value to empty sort preset Signed-off-by: trivernis --- mediarepo-ui/src/api/models/SortKey.ts | 4 +--- .../sidebar/file-search/sort-dialog/sort-dialog.component.ts | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mediarepo-ui/src/api/models/SortKey.ts b/mediarepo-ui/src/api/models/SortKey.ts index bf85cb49..4bd651c0 100644 --- a/mediarepo-ui/src/api/models/SortKey.ts +++ b/mediarepo-ui/src/api/models/SortKey.ts @@ -30,9 +30,7 @@ export class SortKey { }; } else { this.data = { - [value]: { - direction: this.sortDirection - } + [value]: this.sortDirection } as SortKeyData; } } diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts index 128cc38e..d9ed4339 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts @@ -20,7 +20,9 @@ export class SortDialogComponent implements OnInit { public sortingPreset: SortingPreset = SortingPreset.fromValues(-1, []); public availablePresets: SortingPreset[] = []; public suggestedNamespaces: Namespace[] = []; - public emptyPreset = SortingPreset.fromValues(-1, []); + public emptyPreset = SortingPreset.fromValues(-1, [ + SortKey.fromValues("FileImportedTime", "Ascending", undefined) + ]); public previousId: number = -1; private namespaces: Namespace[] = []; From 6507809bcccc8fe0bdd8478365270a14465bd66b Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 21:02:47 +0100 Subject: [PATCH 17/18] Fix style issues Signed-off-by: trivernis --- mediarepo-ui/src/api/models/File.ts | 8 +- mediarepo-ui/src/api/models/Repository.ts | 2 +- .../app/components/core/core.component.scss | 1 + .../src/app/components/core/core.module.ts | 22 +-- .../files-tab-sidebar.component.html | 7 +- .../files-tab-sidebar.component.ts | 23 +-- .../core/files-tab/files-tab.component.html | 3 +- .../import-tab-sidebar.component.html | 7 +- .../core/import-tab/import-tab.component.html | 13 +- .../core/import-tab/import-tab.component.ts | 2 +- .../download-daemon-dialog.component.html | 3 +- .../download-daemon-dialog.component.spec.ts | 6 +- .../download-daemon-dialog.component.ts | 8 +- .../repositories-tab.component.html | 7 +- .../repository-card.component.ts | 68 ++++----- .../repository-details-view.component.html | 22 +-- .../repository-details-view.component.spec.ts | 6 +- .../repository-details-view.component.ts | 20 +-- .../input-receiver.directive.ts | 15 +- .../metadata-entry.component.spec.ts | 2 +- .../image-viewer/image-viewer.component.ts | 12 +- .../native-file-select.component.ts | 10 +- .../add-repository-dialog.component.html | 20 ++- .../edit-repository-dialog.component.html | 7 +- .../edit-repository-dialog.component.spec.ts | 6 +- .../repository-form.component.spec.ts | 2 +- .../repository-form.component.ts | 18 +-- .../repository/repository.module.ts | 14 +- .../file-import/file-import.component.spec.ts | 2 +- .../editable-metadata-entry.component.html | 6 +- .../editable-metadata-entry.component.spec.ts | 6 +- .../editable-metadata-entry.component.ts | 10 +- .../file-metadata.component.scss | 3 + .../file-metadata.component.spec.ts | 2 +- .../sort-button/sort-button.component.spec.ts | 38 ++--- .../sort-preset-item.component.spec.ts | 38 ++--- .../shared/sidebar/sidebar.module.ts | 2 +- .../src/app/services/file/file.helper.ts | 2 +- .../src/app/services/import/import.service.ts | 4 +- .../src/app/services/job/job.service.ts | 2 +- .../services/preset/preset.service.spec.ts | 22 +-- mediarepo-ui/src/assets/icon.svg | 134 +++++++++--------- mediarepo-ui/src/index.html | 10 +- mediarepo-ui/src/test.ts | 15 +- 44 files changed, 279 insertions(+), 351 deletions(-) diff --git a/mediarepo-ui/src/api/models/File.ts b/mediarepo-ui/src/api/models/File.ts index 84c5a8ff..67f3bd81 100644 --- a/mediarepo-ui/src/api/models/File.ts +++ b/mediarepo-ui/src/api/models/File.ts @@ -22,11 +22,11 @@ export class File { return this.basicData.status; } - public get mimeType(): string { - return this.basicData.mime_type; - } - public set status(value: FileStatus) { this.basicData.status = value; } + + public get mimeType(): string { + return this.basicData.mime_type; + } } diff --git a/mediarepo-ui/src/api/models/Repository.ts b/mediarepo-ui/src/api/models/Repository.ts index 9eb5ed6f..cbc8efa3 100644 --- a/mediarepo-ui/src/api/models/Repository.ts +++ b/mediarepo-ui/src/api/models/Repository.ts @@ -22,7 +22,7 @@ export class Repository { return this.repoData.local; } - public update(data: {name?: string, address?: string, path?: string, local?: boolean}) { + public update(data: { name?: string, address?: string, path?: string, local?: boolean }) { this.repoData = Object.assign(this.repoData, data); } } diff --git a/mediarepo-ui/src/app/components/core/core.component.scss b/mediarepo-ui/src/app/components/core/core.component.scss index e4f50ca4..a805f596 100644 --- a/mediarepo-ui/src/app/components/core/core.component.scss +++ b/mediarepo-ui/src/app/components/core/core.component.scss @@ -36,6 +36,7 @@ mat-tab-group { right: 0; top: 0; height: 100%; + ng-icon { font-size: 1.5em; margin-top: calc(-50%); diff --git a/mediarepo-ui/src/app/components/core/core.module.ts b/mediarepo-ui/src/app/components/core/core.module.ts index d3ffbc92..dbd097f1 100644 --- a/mediarepo-ui/src/app/components/core/core.module.ts +++ b/mediarepo-ui/src/app/components/core/core.module.ts @@ -1,17 +1,11 @@ import {NgModule} from "@angular/core"; import {CommonModule} from "@angular/common"; import {CoreComponent} from "./core.component"; -import { - RepositoriesTabComponent -} from "./repositories-tab/repositories-tab.component"; +import {RepositoriesTabComponent} from "./repositories-tab/repositories-tab.component"; import {FilesTabComponent} from "./files-tab/files-tab.component"; -import { - FilesTabSidebarComponent -} from "./files-tab/files-tab-sidebar/files-tab-sidebar.component"; +import {FilesTabSidebarComponent} from "./files-tab/files-tab-sidebar/files-tab-sidebar.component"; import {ImportTabComponent} from "./import-tab/import-tab.component"; -import { - ImportTabSidebarComponent -} from "./import-tab/import-tab-sidebar/import-tab-sidebar.component"; +import {ImportTabSidebarComponent} from "./import-tab/import-tab-sidebar/import-tab-sidebar.component"; import {MatButtonModule} from "@angular/material/button"; import {MatSidenavModule} from "@angular/material/sidenav"; import {MatProgressBarModule} from "@angular/material/progress-bar"; @@ -30,9 +24,7 @@ import {SidebarModule} from "../shared/sidebar/sidebar.module"; import {FileModule} from "../shared/file/file.module"; import {AppCommonModule} from "../shared/app-common/app-common.module"; import {ReactiveFormsModule} from "@angular/forms"; -import { - RepositoryCardComponent -} from "./repositories-tab/repository-card/repository-card.component"; +import {RepositoryCardComponent} from "./repositories-tab/repository-card/repository-card.component"; import {MatCardModule} from "@angular/material/card"; import {MatListModule} from "@angular/material/list"; import {MatDialogModule} from "@angular/material/dialog"; @@ -42,9 +34,7 @@ import {TagModule} from "../shared/tag/tag.module"; import { DownloadDaemonDialogComponent } from "./repositories-tab/download-daemon-dialog/download-daemon-dialog.component"; -import { - RepositoryModule -} from "../shared/repository/repository/repository.module"; +import {RepositoryModule} from "../shared/repository/repository/repository.module"; import {MatToolbarModule} from "@angular/material/toolbar"; import { RepositoryDetailsViewComponent @@ -76,7 +66,7 @@ import { MatProgressBarModule, MatCheckboxModule, ScrollingModule, - NgIconsModule.withIcons({...materialIcons}), + NgIconsModule.withIcons({ ...materialIcons }), FlexModule, MatButtonModule, MatMenuModule, diff --git a/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.html b/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.html index 6c677c9d..9a297594 100644 --- a/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.html +++ b/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.html @@ -1,9 +1,12 @@
- + [availableTags]="this.allTags" + [contextTags]="this.tags" + [state]="this.state" + [tagsLoading]="this.tagsLoading"> diff --git a/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts b/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts index d052a884..311bce82 100644 --- a/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts +++ b/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts @@ -1,25 +1,10 @@ -import { - Component, - EventEmitter, - Input, - OnChanges, - OnInit, - Output, - SimpleChanges, - ViewChild -} from "@angular/core"; +import {Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild} from "@angular/core"; import {Tag} from "../../../../../api/models/Tag"; import {TagService} from "../../../../services/tag/tag.service"; import {File} from "../../../../../api/models/File"; -import { - FileSearchComponent -} from "../../../shared/sidebar/file-search/file-search.component"; -import { - RepositoryService -} from "../../../../services/repository/repository.service"; -import { - TagEditComponent -} from "../../../shared/sidebar/tag-edit/tag-edit.component"; +import {FileSearchComponent} from "../../../shared/sidebar/file-search/file-search.component"; +import {RepositoryService} from "../../../../services/repository/repository.service"; +import {TagEditComponent} from "../../../shared/sidebar/tag-edit/tag-edit.component"; import {TabState} from "../../../../models/TabState"; @Component({ diff --git a/mediarepo-ui/src/app/components/core/files-tab/files-tab.component.html b/mediarepo-ui/src/app/components/core/files-tab/files-tab.component.html index eb500d95..c871514b 100644 --- a/mediarepo-ui/src/app/components/core/files-tab/files-tab.component.html +++ b/mediarepo-ui/src/app/components/core/files-tab/files-tab.component.html @@ -1,6 +1,7 @@ - diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.html b/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.html index 3e558d0a..8d5025a7 100644 --- a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.html +++ b/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.html @@ -1,12 +1,13 @@
- + - + - + diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.html b/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.html index 5349bc82..7b29bbf4 100644 --- a/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.html +++ b/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.html @@ -1,11 +1,14 @@ - + - + diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.ts b/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.ts index 1cee62d1..c89512a9 100644 --- a/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.ts +++ b/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.ts @@ -20,7 +20,7 @@ export class ImportTabComponent implements OnInit { } public ngOnInit(): void { - this.state.files.subscribe(files => files? this.files = files : undefined); + this.state.files.subscribe(files => files ? this.files = files : undefined); } /** diff --git a/mediarepo-ui/src/app/components/core/repositories-tab/download-daemon-dialog/download-daemon-dialog.component.html b/mediarepo-ui/src/app/components/core/repositories-tab/download-daemon-dialog/download-daemon-dialog.component.html index d0538f6b..c822a25f 100644 --- a/mediarepo-ui/src/app/components/core/repositories-tab/download-daemon-dialog/download-daemon-dialog.component.html +++ b/mediarepo-ui/src/app/components/core/repositories-tab/download-daemon-dialog/download-daemon-dialog.component.html @@ -4,7 +4,8 @@

No daemon could be found on the system. Please download and install a daemon executable.
- +
diff --git a/mediarepo-ui/src/app/components/core/repositories-tab/download-daemon-dialog/download-daemon-dialog.component.spec.ts b/mediarepo-ui/src/app/components/core/repositories-tab/download-daemon-dialog/download-daemon-dialog.component.spec.ts index cdf6db55..6719af16 100644 --- a/mediarepo-ui/src/app/components/core/repositories-tab/download-daemon-dialog/download-daemon-dialog.component.spec.ts +++ b/mediarepo-ui/src/app/components/core/repositories-tab/download-daemon-dialog/download-daemon-dialog.component.spec.ts @@ -1,8 +1,6 @@ import {ComponentFixture, TestBed} from "@angular/core/testing"; -import { - DownloadDaemonDialogComponent -} from "./download-daemon-dialog.component"; +import {DownloadDaemonDialogComponent} from "./download-daemon-dialog.component"; describe("DownloadDaemonDialogComponent", () => { let component: DownloadDaemonDialogComponent; @@ -10,7 +8,7 @@ describe("DownloadDaemonDialogComponent", () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ DownloadDaemonDialogComponent ] + declarations: [DownloadDaemonDialogComponent] }) .compileComponents(); }); diff --git a/mediarepo-ui/src/app/components/core/repositories-tab/download-daemon-dialog/download-daemon-dialog.component.ts b/mediarepo-ui/src/app/components/core/repositories-tab/download-daemon-dialog/download-daemon-dialog.component.ts index a66d319f..caf1336d 100644 --- a/mediarepo-ui/src/app/components/core/repositories-tab/download-daemon-dialog/download-daemon-dialog.component.ts +++ b/mediarepo-ui/src/app/components/core/repositories-tab/download-daemon-dialog/download-daemon-dialog.component.ts @@ -9,9 +9,11 @@ import {shell} from "@tauri-apps/api"; }) export class DownloadDaemonDialogComponent { - constructor(public dialogRef: MatDialogRef, - @Inject( - MAT_DIALOG_DATA) data: any) { + constructor( + public dialogRef: MatDialogRef, + @Inject( + MAT_DIALOG_DATA) data: any + ) { } diff --git a/mediarepo-ui/src/app/components/core/repositories-tab/repositories-tab.component.html b/mediarepo-ui/src/app/components/core/repositories-tab/repositories-tab.component.html index 46d3d76f..90c40cdd 100644 --- a/mediarepo-ui/src/app/components/core/repositories-tab/repositories-tab.component.html +++ b/mediarepo-ui/src/app/components/core/repositories-tab/repositories-tab.component.html @@ -1,13 +1,14 @@ -
+
- +
-
+
diff --git a/mediarepo-ui/src/app/components/core/repositories-tab/repository-card/repository-card.component.ts b/mediarepo-ui/src/app/components/core/repositories-tab/repository-card/repository-card.component.ts index bf5acd87..9b4f23f4 100644 --- a/mediarepo-ui/src/app/components/core/repositories-tab/repository-card/repository-card.component.ts +++ b/mediarepo-ui/src/app/components/core/repositories-tab/repository-card/repository-card.component.ts @@ -1,22 +1,9 @@ -import { - Component, EventEmitter, - Input, - OnDestroy, - OnInit, - Output, - ViewChild -} from "@angular/core"; +import {Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild} from "@angular/core"; import {Repository} from "../../../../../api/models/Repository"; -import { - RepositoryService -} from "../../../../services/repository/repository.service"; +import {RepositoryService} from "../../../../services/repository/repository.service"; import {MatDialog} from "@angular/material/dialog"; -import { - ConfirmDialogComponent -} from "../../../shared/app-common/confirm-dialog/confirm-dialog.component"; -import { - BusyIndicatorComponent -} from "../../../shared/app-common/busy-indicator/busy-indicator.component"; +import {ConfirmDialogComponent} from "../../../shared/app-common/confirm-dialog/confirm-dialog.component"; +import {BusyIndicatorComponent} from "../../../shared/app-common/busy-indicator/busy-indicator.component"; import { EditRepositoryDialogComponent } from "../../../shared/repository/repository/edit-repository-dialog/edit-repository-dialog.component"; @@ -39,7 +26,8 @@ export class RepositoryCardComponent implements OnInit, OnDestroy { constructor( public repoService: RepositoryService, - public dialog: MatDialog) { + public dialog: MatDialog + ) { } public async ngOnInit() { @@ -81,28 +69,6 @@ export class RepositoryCardComponent implements OnInit, OnDestroy { } } - private async promtDeleteRepository() { - if (this.repository.local) { - const deleteContents = await this.dialog.open( - ConfirmDialogComponent, { - data: { - title: "Delete repository content", - message: "Do you want to remove the contents of the repository as well?", - confirmAction: "Delete", - confirmColor: "warn", - denyAction: "No", - } - }).afterClosed().toPromise(); - if (deleteContents) { - await this.repoService.deleteRepository(this.repository.name); - } else { - await this.repoService.removeRepository(this.repository.name); - } - } else { - await this.repoService.removeRepository(this.repository.name); - } - } - public getDaemonStatusText(): string { if (this.repository.local) { return "Local"; @@ -138,4 +104,26 @@ export class RepositoryCardComponent implements OnInit, OnDestroy { } }); } + + private async promtDeleteRepository() { + if (this.repository.local) { + const deleteContents = await this.dialog.open( + ConfirmDialogComponent, { + data: { + title: "Delete repository content", + message: "Do you want to remove the contents of the repository as well?", + confirmAction: "Delete", + confirmColor: "warn", + denyAction: "No", + } + }).afterClosed().toPromise(); + if (deleteContents) { + await this.repoService.deleteRepository(this.repository.name); + } else { + await this.repoService.removeRepository(this.repository.name); + } + } else { + await this.repoService.removeRepository(this.repository.name); + } + } } diff --git a/mediarepo-ui/src/app/components/core/repositories-tab/repository-details-view/repository-details-view.component.html b/mediarepo-ui/src/app/components/core/repositories-tab/repository-details-view/repository-details-view.component.html index 6ab3bf0b..23712373 100644 --- a/mediarepo-ui/src/app/components/core/repositories-tab/repository-details-view/repository-details-view.component.html +++ b/mediarepo-ui/src/app/components/core/repositories-tab/repository-details-view/repository-details-view.component.html @@ -1,43 +1,47 @@ {{repository.name}} -

Stats

{{repository.path}} - {{repository.address}} + {{repository.address}} - {{metadata? metadata!.file_count.toString() : ''}} + {{metadata ? metadata!.file_count.toString() : ''}} - {{metadata? metadata!.tag_count.toString() : ''}} + {{metadata ? metadata!.tag_count.toString() : ''}} - {{metadata? metadata!.namespace_count.toString() : ''}} + {{metadata ? metadata!.namespace_count.toString() : ''}} - {{metadata? metadata!.mapping_count.toString() : ''}} + {{metadata ? metadata!.mapping_count.toString() : ''}} {{this.totalSize | async}} - + {{this.fileFolderSize | async}} - + {{this.thumbFolderSize | async}} - + {{this.databaseFileSize | async}}
diff --git a/mediarepo-ui/src/app/components/core/repositories-tab/repository-details-view/repository-details-view.component.spec.ts b/mediarepo-ui/src/app/components/core/repositories-tab/repository-details-view/repository-details-view.component.spec.ts index 7791c6fa..cb864f9a 100644 --- a/mediarepo-ui/src/app/components/core/repositories-tab/repository-details-view/repository-details-view.component.spec.ts +++ b/mediarepo-ui/src/app/components/core/repositories-tab/repository-details-view/repository-details-view.component.spec.ts @@ -1,8 +1,6 @@ import {ComponentFixture, TestBed} from "@angular/core/testing"; -import { - RepositoryDetailsViewComponent -} from "./repository-details-view.component"; +import {RepositoryDetailsViewComponent} from "./repository-details-view.component"; describe("RepositoryDetailsViewComponent", () => { let component: RepositoryDetailsViewComponent; @@ -10,7 +8,7 @@ describe("RepositoryDetailsViewComponent", () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ RepositoryDetailsViewComponent ] + declarations: [RepositoryDetailsViewComponent] }) .compileComponents(); }); diff --git a/mediarepo-ui/src/app/components/core/repositories-tab/repository-details-view/repository-details-view.component.ts b/mediarepo-ui/src/app/components/core/repositories-tab/repository-details-view/repository-details-view.component.ts index cff59cde..ad45bf0c 100644 --- a/mediarepo-ui/src/app/components/core/repositories-tab/repository-details-view/repository-details-view.component.ts +++ b/mediarepo-ui/src/app/components/core/repositories-tab/repository-details-view/repository-details-view.component.ts @@ -1,21 +1,10 @@ -import { - Component, - Input, - OnChanges, - OnDestroy, - OnInit, - SimpleChanges -} from "@angular/core"; +import {Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges} from "@angular/core"; import {Repository} from "../../../../../api/models/Repository"; -import { - RepositoryService -} from "../../../../services/repository/repository.service"; +import {RepositoryService} from "../../../../services/repository/repository.service"; import {RepositoryMetadata} from "../../../../models/RepositoryMetadata"; import {BehaviorSubject} from "rxjs"; import {MatDialog} from "@angular/material/dialog"; -import { - BusyDialogComponent -} from "../../../shared/app-common/busy-dialog/busy-dialog.component"; +import {BusyDialogComponent} from "../../../shared/app-common/busy-dialog/busy-dialog.component"; @Component({ selector: "app-repository-details-view", @@ -26,12 +15,11 @@ export class RepositoryDetailsViewComponent implements OnInit, OnChanges, OnDest @Input() repository!: Repository; public metadata?: RepositoryMetadata; - private refreshMetadataInterval?: number; - public totalSize = new BehaviorSubject(undefined); public fileFolderSize = new BehaviorSubject(undefined); public thumbFolderSize = new BehaviorSubject(undefined); public databaseFileSize = new BehaviorSubject(undefined); + private refreshMetadataInterval?: number; constructor(private repoService: RepositoryService, public dialog: MatDialog) { } diff --git a/mediarepo-ui/src/app/components/shared/app-common/input-receiver/input-receiver.directive.ts b/mediarepo-ui/src/app/components/shared/app-common/input-receiver/input-receiver.directive.ts index 718296af..9b5a2a4b 100644 --- a/mediarepo-ui/src/app/components/shared/app-common/input-receiver/input-receiver.directive.ts +++ b/mediarepo-ui/src/app/components/shared/app-common/input-receiver/input-receiver.directive.ts @@ -1,24 +1,17 @@ -import { - Directive, - EventEmitter, - HostBinding, - HostListener, - Output -} from "@angular/core"; +import {Directive, EventEmitter, HostBinding, HostListener, Output} from "@angular/core"; @Directive({ selector: "[appInputReceiver]" }) export class InputReceiverDirective { - constructor() { - } - @Output() keyDownEvent = new EventEmitter(); @Output() keyUpEvent = new EventEmitter(); - @HostBinding("tabindex") tabIndex = 1; + constructor() { + } + @HostListener("keydown", ["$event"]) onKeyDown(event: KeyboardEvent) { this.keyDownEvent.emit(event); diff --git a/mediarepo-ui/src/app/components/shared/app-common/metadata-entry/metadata-entry.component.spec.ts b/mediarepo-ui/src/app/components/shared/app-common/metadata-entry/metadata-entry.component.spec.ts index d494874d..19661c4d 100644 --- a/mediarepo-ui/src/app/components/shared/app-common/metadata-entry/metadata-entry.component.spec.ts +++ b/mediarepo-ui/src/app/components/shared/app-common/metadata-entry/metadata-entry.component.spec.ts @@ -8,7 +8,7 @@ describe("MetadataEntryComponent", () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ MetadataEntryComponent ] + declarations: [MetadataEntryComponent] }) .compileComponents(); }); diff --git a/mediarepo-ui/src/app/components/shared/file/content-viewer/image-viewer/image-viewer.component.ts b/mediarepo-ui/src/app/components/shared/file/content-viewer/image-viewer/image-viewer.component.ts index 539b8a40..b15a4f60 100644 --- a/mediarepo-ui/src/app/components/shared/file/content-viewer/image-viewer/image-viewer.component.ts +++ b/mediarepo-ui/src/app/components/shared/file/content-viewer/image-viewer/image-viewer.component.ts @@ -1,10 +1,4 @@ -import { - Component, - HostListener, - Input, - OnChanges, - SimpleChanges -} from "@angular/core"; +import {Component, HostListener, Input, OnChanges, SimpleChanges} from "@angular/core"; import {CdkDragMove} from "@angular/cdk/drag-drop"; import {SafeResourceUrl} from "@angular/platform-browser"; @@ -16,7 +10,7 @@ import {SafeResourceUrl} from "@angular/platform-browser"; export class ImageViewerComponent implements OnChanges { @Input() imageUrl!: SafeResourceUrl | string; public imageZoom = 1; - public imagePosition = {x: 0, y: 0}; + public imagePosition = { x: 0, y: 0 }; public mouseInImageView = false; constructor() { @@ -31,7 +25,7 @@ export class ImageViewerComponent implements OnChanges { public resetImage() { this.imageZoom = 1; - this.imagePosition = {x: 0, y: 0}; + this.imagePosition = { x: 0, y: 0 }; } public onDragMoved($event: CdkDragMove): void { diff --git a/mediarepo-ui/src/app/components/shared/input/native-file-select/native-file-select.component.ts b/mediarepo-ui/src/app/components/shared/input/native-file-select/native-file-select.component.ts index 122c0d8c..14b2b60a 100644 --- a/mediarepo-ui/src/app/components/shared/input/native-file-select/native-file-select.component.ts +++ b/mediarepo-ui/src/app/components/shared/input/native-file-select/native-file-select.component.ts @@ -1,12 +1,4 @@ -import { - Component, - EventEmitter, - Input, - OnChanges, - OnInit, - Output, - SimpleChanges -} from "@angular/core"; +import {Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges} from "@angular/core"; import {FormControl} from "@angular/forms"; import {dialog} from "@tauri-apps/api"; import {DialogFilter} from "@tauri-apps/api/dialog"; diff --git a/mediarepo-ui/src/app/components/shared/repository/repository/add-repository-dialog/add-repository-dialog.component.html b/mediarepo-ui/src/app/components/shared/repository/repository/add-repository-dialog/add-repository-dialog.component.html index 3458e516..05df8e6d 100644 --- a/mediarepo-ui/src/app/components/shared/repository/repository/add-repository-dialog/add-repository-dialog.component.html +++ b/mediarepo-ui/src/app/components/shared/repository/repository/add-repository-dialog/add-repository-dialog.component.html @@ -4,16 +4,24 @@

Add a Repository

- - -
diff --git a/mediarepo-ui/src/app/components/shared/repository/repository/edit-repository-dialog/edit-repository-dialog.component.html b/mediarepo-ui/src/app/components/shared/repository/repository/edit-repository-dialog/edit-repository-dialog.component.html index af566615..21d719b0 100644 --- a/mediarepo-ui/src/app/components/shared/repository/repository/edit-repository-dialog/edit-repository-dialog.component.html +++ b/mediarepo-ui/src/app/components/shared/repository/repository/edit-repository-dialog/edit-repository-dialog.component.html @@ -1,8 +1,11 @@

Edit {{this.selectedRepository.name}}

- + [validateNameDuplicate]="false">
diff --git a/mediarepo-ui/src/app/components/shared/repository/repository/edit-repository-dialog/edit-repository-dialog.component.spec.ts b/mediarepo-ui/src/app/components/shared/repository/repository/edit-repository-dialog/edit-repository-dialog.component.spec.ts index 5b4541ee..1fb04c47 100644 --- a/mediarepo-ui/src/app/components/shared/repository/repository/edit-repository-dialog/edit-repository-dialog.component.spec.ts +++ b/mediarepo-ui/src/app/components/shared/repository/repository/edit-repository-dialog/edit-repository-dialog.component.spec.ts @@ -1,8 +1,6 @@ import {ComponentFixture, TestBed} from "@angular/core/testing"; -import { - EditRepositoryDialogComponent -} from "./edit-repository-dialog.component"; +import {EditRepositoryDialogComponent} from "./edit-repository-dialog.component"; describe("EditRepositoryDialogComponent", () => { let component: EditRepositoryDialogComponent; @@ -10,7 +8,7 @@ describe("EditRepositoryDialogComponent", () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ EditRepositoryDialogComponent ] + declarations: [EditRepositoryDialogComponent] }) .compileComponents(); }); diff --git a/mediarepo-ui/src/app/components/shared/repository/repository/repository-form/repository-form.component.spec.ts b/mediarepo-ui/src/app/components/shared/repository/repository/repository-form/repository-form.component.spec.ts index 4bb29c5c..cf3b69d4 100644 --- a/mediarepo-ui/src/app/components/shared/repository/repository/repository-form/repository-form.component.spec.ts +++ b/mediarepo-ui/src/app/components/shared/repository/repository/repository-form/repository-form.component.spec.ts @@ -8,7 +8,7 @@ describe("RepositoryFormComponent", () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ RepositoryFormComponent ] + declarations: [RepositoryFormComponent] }) .compileComponents(); }); diff --git a/mediarepo-ui/src/app/components/shared/repository/repository/repository-form/repository-form.component.ts b/mediarepo-ui/src/app/components/shared/repository/repository/repository-form/repository-form.component.ts index 161a73f3..863f304b 100644 --- a/mediarepo-ui/src/app/components/shared/repository/repository/repository-form/repository-form.component.ts +++ b/mediarepo-ui/src/app/components/shared/repository/repository/repository-form/repository-form.component.ts @@ -1,15 +1,7 @@ import {Component, Input, OnInit, Output} from "@angular/core"; -import { - AbstractControl, - FormControl, - FormGroup, - ValidationErrors, - Validators -} from "@angular/forms"; +import {AbstractControl, FormControl, FormGroup, ValidationErrors, Validators} from "@angular/forms"; import {Repository} from "../../../../../../api/models/Repository"; -import { - RepositoryService -} from "../../../../../services/repository/repository.service"; +import {RepositoryService} from "../../../../../services/repository/repository.service"; import {dialog} from "@tauri-apps/api"; import {MatDialog} from "@angular/material/dialog"; @@ -101,7 +93,7 @@ export class RepositoryFormComponent implements OnInit { const value = control?.value; if (this.validateNameDuplicate && this.repositories.find(r => r.name === value)) { - control?.setErrors({nameAlreadyExists: value}); + control?.setErrors({ nameAlreadyExists: value }); } } @@ -110,7 +102,7 @@ export class RepositoryFormComponent implements OnInit { "repositoryType")?.value ?? "local"; if (repositoryType === "local") { - return control.value.length > 0 ? null : {valueRequired: control.value}; + return control.value.length > 0 ? null : { valueRequired: control.value }; } return null; } @@ -121,7 +113,7 @@ export class RepositoryFormComponent implements OnInit { if (repositoryType === "remote") { const match = /(\d+\.){3}\d+:\d+|\S+:\d+/.test(control.value); - return match ? null : {invalidAddress: control.value}; + return match ? null : { invalidAddress: control.value }; } return null; diff --git a/mediarepo-ui/src/app/components/shared/repository/repository/repository.module.ts b/mediarepo-ui/src/app/components/shared/repository/repository/repository.module.ts index dc537730..df359b8f 100644 --- a/mediarepo-ui/src/app/components/shared/repository/repository/repository.module.ts +++ b/mediarepo-ui/src/app/components/shared/repository/repository/repository.module.ts @@ -1,14 +1,8 @@ import {NgModule} from "@angular/core"; import {CommonModule} from "@angular/common"; -import { - AddRepositoryDialogComponent -} from "./add-repository-dialog/add-repository-dialog.component"; -import { - RepositoryFormComponent -} from "./repository-form/repository-form.component"; -import { - EditRepositoryDialogComponent -} from "./edit-repository-dialog/edit-repository-dialog.component"; +import {AddRepositoryDialogComponent} from "./add-repository-dialog/add-repository-dialog.component"; +import {RepositoryFormComponent} from "./repository-form/repository-form.component"; +import {EditRepositoryDialogComponent} from "./edit-repository-dialog/edit-repository-dialog.component"; import {MatDialogModule} from "@angular/material/dialog"; import {MatButtonModule} from "@angular/material/button"; import {MatTooltipModule} from "@angular/material/tooltip"; @@ -37,7 +31,7 @@ import {MatFolder} from "@ng-icons/material-icons"; MatSelectModule, MatInputModule, ReactiveFormsModule, - NgIconsModule.withIcons({MatFolder}) + NgIconsModule.withIcons({ MatFolder }) ] }) export class RepositoryModule { diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.spec.ts index bdee95d1..fa220db6 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.spec.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.spec.ts @@ -8,7 +8,7 @@ describe("FileImportComponent", () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ FileImportComponent ] + declarations: [FileImportComponent] }) .compileComponents(); }); diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/editable-metadata-entry/editable-metadata-entry.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/editable-metadata-entry/editable-metadata-entry.component.html index 32ad6962..e4e3a5ed 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/editable-metadata-entry/editable-metadata-entry.component.html +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/editable-metadata-entry/editable-metadata-entry.component.html @@ -2,12 +2,12 @@ {{value}} {{attributeName}} - + - -
diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/editable-metadata-entry/editable-metadata-entry.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/editable-metadata-entry/editable-metadata-entry.component.spec.ts index f7b617c6..4899456e 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/editable-metadata-entry/editable-metadata-entry.component.spec.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/editable-metadata-entry/editable-metadata-entry.component.spec.ts @@ -1,8 +1,6 @@ import {ComponentFixture, TestBed} from "@angular/core/testing"; -import { - EditableMetadataEntryComponent -} from "./editable-metadata-entry.component"; +import {EditableMetadataEntryComponent} from "./editable-metadata-entry.component"; describe("EditableMetadataEntryComponent", () => { let component: EditableMetadataEntryComponent; @@ -10,7 +8,7 @@ describe("EditableMetadataEntryComponent", () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ EditableMetadataEntryComponent ] + declarations: [EditableMetadataEntryComponent] }) .compileComponents(); }); diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/editable-metadata-entry/editable-metadata-entry.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/editable-metadata-entry/editable-metadata-entry.component.ts index 678bafd1..7517db4a 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/editable-metadata-entry/editable-metadata-entry.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/editable-metadata-entry/editable-metadata-entry.component.ts @@ -1,12 +1,4 @@ -import { - Component, - EventEmitter, - Input, - OnChanges, - OnInit, - Output, - SimpleChanges -} from "@angular/core"; +import {Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges} from "@angular/core"; import {FormControl} from "@angular/forms"; @Component({ diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/file-metadata.component.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/file-metadata.component.scss index 44fadc41..7da88f6f 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/file-metadata.component.scss +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/file-metadata.component.scss @@ -20,9 +20,11 @@ width: 100%; display: block; } + :first-child { margin-top: 0; } + :last-child { margin-bottom: 0; } @@ -32,6 +34,7 @@ text-align: center; height: 100px; width: 100%; + h1 { margin-top: 20px; } diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/file-metadata.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/file-metadata.component.spec.ts index 9f93d567..cec73dc4 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/file-metadata.component.spec.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-metadata/file-metadata.component.spec.ts @@ -8,7 +8,7 @@ describe("FileMetadataComponent", () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ FileMetadataComponent ] + declarations: [FileMetadataComponent] }) .compileComponents(); }); diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.spec.ts index 04601bd0..e0e3954a 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.spec.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-button/sort-button.component.spec.ts @@ -1,25 +1,25 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from "@angular/core/testing"; -import { SortButtonComponent } from './sort-button.component'; +import {SortButtonComponent} from "./sort-button.component"; -describe('SortButtonComponent', () => { - let component: SortButtonComponent; - let fixture: ComponentFixture; +describe("SortButtonComponent", () => { + let component: SortButtonComponent; + let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ SortButtonComponent ] - }) - .compileComponents(); - }); + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [SortButtonComponent] + }) + .compileComponents(); + }); - beforeEach(() => { - fixture = TestBed.createComponent(SortButtonComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(SortButtonComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it("should create", () => { + expect(component).toBeTruthy(); + }); }); diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.spec.ts index 1756cd3d..016808ae 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.spec.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-preset-item/sort-preset-item.component.spec.ts @@ -1,25 +1,25 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from "@angular/core/testing"; -import { SortPresetItemComponent } from './sort-preset-item.component'; +import {SortPresetItemComponent} from "./sort-preset-item.component"; -describe('SortPresetItemComponent', () => { - let component: SortPresetItemComponent; - let fixture: ComponentFixture; +describe("SortPresetItemComponent", () => { + let component: SortPresetItemComponent; + let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ SortPresetItemComponent ] - }) - .compileComponents(); - }); + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [SortPresetItemComponent] + }) + .compileComponents(); + }); - beforeEach(() => { - fixture = TestBed.createComponent(SortPresetItemComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(SortPresetItemComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it("should create", () => { + expect(component).toBeTruthy(); + }); }); diff --git a/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts b/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts index 211fb912..33b387a8 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts @@ -52,7 +52,7 @@ import {GetTagQueryPipe} from "./file-search/filter-pipes/get-tag-query.pipe"; import {GetPropertyQueryPipe} from "./file-search/filter-pipes/get-property-query.pipe"; import {SortButtonComponent} from "./file-search/sort-button/sort-button.component"; import {MatTooltipModule} from "@angular/material/tooltip"; -import { SortPresetItemComponent } from './file-search/sort-preset-item/sort-preset-item.component'; +import {SortPresetItemComponent} from "./file-search/sort-preset-item/sort-preset-item.component"; @NgModule({ diff --git a/mediarepo-ui/src/app/services/file/file.helper.ts b/mediarepo-ui/src/app/services/file/file.helper.ts index 02af25ce..c81076b5 100644 --- a/mediarepo-ui/src/app/services/file/file.helper.ts +++ b/mediarepo-ui/src/app/services/file/file.helper.ts @@ -19,7 +19,7 @@ export class FileHelper { filters: [{ name: file.mimeType, extensions: [extension ?? "*"] - }, {name: "All", extensions: ["*"]}] + }, { name: "All", extensions: ["*"] }] }); } diff --git a/mediarepo-ui/src/app/services/import/import.service.ts b/mediarepo-ui/src/app/services/import/import.service.ts index c106ebe9..1b69fa4f 100644 --- a/mediarepo-ui/src/app/services/import/import.service.ts +++ b/mediarepo-ui/src/app/services/import/import.service.ts @@ -19,7 +19,7 @@ export class ImportService { * @returns {Promise} */ public async resolvePathsToFiles(paths: string[]): Promise { - return MediarepoApi.resolvePathsToFiles({paths}); + return MediarepoApi.resolvePathsToFiles({ paths }); } /** @@ -29,6 +29,6 @@ export class ImportService { * @returns {Promise} */ public async addLocalFile(metadata: FileOsMetadata, options: AddFileOptions): Promise { - return MediarepoApi.addLocalFile({metadata, options}).then(mapNew(File)); + return MediarepoApi.addLocalFile({ metadata, options }).then(mapNew(File)); } } diff --git a/mediarepo-ui/src/app/services/job/job.service.ts b/mediarepo-ui/src/app/services/job/job.service.ts index 9642eb36..404fc08a 100644 --- a/mediarepo-ui/src/app/services/job/job.service.ts +++ b/mediarepo-ui/src/app/services/job/job.service.ts @@ -11,6 +11,6 @@ export class JobService { } public async runJob(jobType: JobType): Promise { - return MediarepoApi.runJob({jobType}); + return MediarepoApi.runJob({ jobType }); } } diff --git a/mediarepo-ui/src/app/services/preset/preset.service.spec.ts b/mediarepo-ui/src/app/services/preset/preset.service.spec.ts index 0e4a6b35..a72e4697 100644 --- a/mediarepo-ui/src/app/services/preset/preset.service.spec.ts +++ b/mediarepo-ui/src/app/services/preset/preset.service.spec.ts @@ -1,16 +1,16 @@ -import { TestBed } from '@angular/core/testing'; +import {TestBed} from "@angular/core/testing"; -import { PresetService } from './preset.service'; +import {PresetService} from "./preset.service"; -describe('PresetService', () => { - let service: PresetService; +describe("PresetService", () => { + let service: PresetService; - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PresetService); - }); + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(PresetService); + }); - it('should be created', () => { - expect(service).toBeTruthy(); - }); + it("should be created", () => { + expect(service).toBeTruthy(); + }); }); diff --git a/mediarepo-ui/src/assets/icon.svg b/mediarepo-ui/src/assets/icon.svg index 2496c1da..6a00b1cd 100644 --- a/mediarepo-ui/src/assets/icon.svg +++ b/mediarepo-ui/src/assets/icon.svg @@ -2,81 +2,81 @@ - - - - - - + + + + + - + id="layer1" + inkscape:groupmode="layer" + inkscape:label="Layer 1" + style="display:inline"> + + + - diff --git a/mediarepo-ui/src/index.html b/mediarepo-ui/src/index.html index 2e347f19..923362d4 100644 --- a/mediarepo-ui/src/index.html +++ b/mediarepo-ui/src/index.html @@ -1,11 +1,11 @@ - - MediarepoUi - - - + + MediarepoUi + + + diff --git a/mediarepo-ui/src/test.ts b/mediarepo-ui/src/test.ts index f17d41f1..a273a8ea 100644 --- a/mediarepo-ui/src/test.ts +++ b/mediarepo-ui/src/test.ts @@ -2,23 +2,20 @@ import "zone.js/testing"; import {getTestBed} from "@angular/core/testing"; -import { - BrowserDynamicTestingModule, - platformBrowserDynamicTesting -} from "@angular/platform-browser-dynamic/testing"; +import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from "@angular/platform-browser-dynamic/testing"; declare const require: { - context(path: string, deep?: boolean, filter?: RegExp): { - keys(): string[]; - (id: string): T; - }; + context(path: string, deep?: boolean, filter?: RegExp): { + keys(): string[]; + (id: string): T; + }; }; // First, initialize the Angular testing environment. getTestBed().initTestEnvironment( BrowserDynamicTestingModule, platformBrowserDynamicTesting(), - {teardown: {destroyAfterEach: true}}, + { teardown: { destroyAfterEach: true } }, ); // Then we find all the tests. From 01f781b9f354e6f748a9cc0e635bdc49e797333a Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 5 Feb 2022 21:20:18 +0100 Subject: [PATCH 18/18] Increment version to 0.13.4 Signed-off-by: trivernis --- mediarepo-daemon/Cargo.lock | 2 +- mediarepo-daemon/Cargo.toml | 2 +- mediarepo-ui/package.json | 2 +- mediarepo-ui/src-tauri/Cargo.lock | 2 +- mediarepo-ui/src-tauri/Cargo.toml | 2 +- mediarepo-ui/src-tauri/tauri.conf.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mediarepo-daemon/Cargo.lock b/mediarepo-daemon/Cargo.lock index b4dee040..a36a12ba 100644 --- a/mediarepo-daemon/Cargo.lock +++ b/mediarepo-daemon/Cargo.lock @@ -1397,7 +1397,7 @@ dependencies = [ [[package]] name = "mediarepo-daemon" -version = "0.13.3" +version = "0.13.4" dependencies = [ "console-subscriber", "glob", diff --git a/mediarepo-daemon/Cargo.toml b/mediarepo-daemon/Cargo.toml index b4fce69e..54623a3d 100644 --- a/mediarepo-daemon/Cargo.toml +++ b/mediarepo-daemon/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["mediarepo-core", "mediarepo-database", "mediarepo-logic", "m [package] name = "mediarepo-daemon" -version = "0.13.3" +version = "0.13.4" edition = "2018" license = "gpl-3" repository = "https://github.com/Trivernis/mediarepo-daemon" diff --git a/mediarepo-ui/package.json b/mediarepo-ui/package.json index 1a0c8825..15e81d76 100644 --- a/mediarepo-ui/package.json +++ b/mediarepo-ui/package.json @@ -1,6 +1,6 @@ { "name": "mediarepo-ui", - "version": "0.13.3", + "version": "0.13.4", "scripts": { "ng": "ng", "start": "ng serve", diff --git a/mediarepo-ui/src-tauri/Cargo.lock b/mediarepo-ui/src-tauri/Cargo.lock index b5081b6f..88c9b741 100644 --- a/mediarepo-ui/src-tauri/Cargo.lock +++ b/mediarepo-ui/src-tauri/Cargo.lock @@ -40,7 +40,7 @@ checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" [[package]] name = "app" -version = "0.13.3" +version = "0.13.4" dependencies = [ "mediarepo-api", "serde", diff --git a/mediarepo-ui/src-tauri/Cargo.toml b/mediarepo-ui/src-tauri/Cargo.toml index ee837a00..4447a46f 100644 --- a/mediarepo-ui/src-tauri/Cargo.toml +++ b/mediarepo-ui/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "app" -version = "0.13.3" +version = "0.13.4" description = "The UI for the mediarepo media management tool" authors = ["you"] license = "" diff --git a/mediarepo-ui/src-tauri/tauri.conf.json b/mediarepo-ui/src-tauri/tauri.conf.json index 58f96212..55ea445b 100644 --- a/mediarepo-ui/src-tauri/tauri.conf.json +++ b/mediarepo-ui/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "package": { "productName": "mediarepo-ui", - "version": "0.13.3" + "version": "0.13.4" }, "build": { "distDir": "../dist/mediarepo-ui",